1
This commit is contained in:
parent
52898224fc
commit
e236317f2a
@ -73,7 +73,7 @@ class BattleController extends BaseAuthedController {
|
|||||||
if ($data) {
|
if ($data) {
|
||||||
$teamList = $data['team_list'];
|
$teamList = $data['team_list'];
|
||||||
}
|
}
|
||||||
error_log(json_encode($teamList));
|
// error_log(json_encode($teamList));
|
||||||
$battleDataService = new services\BattleDataService();
|
$battleDataService = new services\BattleDataService();
|
||||||
$battleDataService->teamList = $teamList;
|
$battleDataService->teamList = $teamList;
|
||||||
$battleDataService->updateBattleData();
|
$battleDataService->updateBattleData();
|
||||||
@ -87,7 +87,7 @@ class BattleController extends BaseAuthedController {
|
|||||||
'modifytime' => $this->_getNowTime(),
|
'modifytime' => $this->_getNowTime(),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
error_log(json_encode($battleDataService->getReward()));
|
// error_log(json_encode($battleDataService->getReward()));
|
||||||
$data = array(
|
$data = array(
|
||||||
'reward' => $battleDataService->getReward()
|
'reward' => $battleDataService->getReward()
|
||||||
);
|
);
|
||||||
|
@ -126,11 +126,12 @@ class BattleDataService extends BaseService {
|
|||||||
|
|
||||||
|
|
||||||
//录入战斗记录
|
//录入战斗记录
|
||||||
$this->saveBattleHistory();
|
// $this->saveBattleHistory();
|
||||||
|
|
||||||
switch ($matchMode) {
|
switch ($matchMode) {
|
||||||
case self::MATCH_MODE_PVP:
|
case self::MATCH_MODE_PVP:
|
||||||
{
|
{
|
||||||
|
error_log('updateBattleData1');
|
||||||
//匹配赛模式
|
//匹配赛模式
|
||||||
$this->updatePvpData();
|
$this->updatePvpData();
|
||||||
// $this->rewardCegPvp();
|
// $this->rewardCegPvp();
|
||||||
@ -667,87 +668,87 @@ class BattleDataService extends BaseService {
|
|||||||
{
|
{
|
||||||
|
|
||||||
error_log('updateBattleData2');
|
error_log('updateBattleData2');
|
||||||
$hisBattleData = Battle::getMyBattleData();
|
// $hisBattleData = Battle::getMyBattleData();
|
||||||
if (!isset($hisBattleData)) {
|
// if (!isset($hisBattleData)) {
|
||||||
$hisBattleData = array(
|
// $hisBattleData = array(
|
||||||
'createtime' => myself()->_getNowTime(),
|
// 'createtime' => myself()->_getNowTime(),
|
||||||
'modifytime' => myself()->_getNowTime()
|
// 'modifytime' => myself()->_getNowTime()
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
$this->apply($hisBattleData);
|
// $this->apply($hisBattleData);
|
||||||
Battle::add(json_encode($hisBattleData));
|
// Battle::add(json_encode($hisBattleData));
|
||||||
|
//
|
||||||
error_log('updateBattleData3');
|
// error_log('updateBattleData3');
|
||||||
$this->currSeasonMeta = mt\RankSeason::getCurrentSeason();
|
// $this->currSeasonMeta = mt\RankSeason::getCurrentSeason();
|
||||||
// if ( $this->currSeasonMeta && myself()->_getV(TN_RANK_STATUS, 0 ) == 0) {
|
//// if ( $this->currSeasonMeta && myself()->_getV(TN_RANK_STATUS, 0 ) == 0) {
|
||||||
if ( $this->currSeasonMeta ) {
|
// if ( $this->currSeasonMeta ) {
|
||||||
$this->seasonDb = Season::find($this->currSeasonMeta['id']);
|
// $this->seasonDb = Season::find($this->currSeasonMeta['id']);
|
||||||
if (!$this->seasonDb) {
|
// if (!$this->seasonDb) {
|
||||||
Season::add($this->currSeasonMeta['id']);
|
// Season::add($this->currSeasonMeta['id']);
|
||||||
$this->seasonDb = Season::find($this->currSeasonMeta['id']);
|
// $this->seasonDb = Season::find($this->currSeasonMeta['id']);
|
||||||
}
|
// }
|
||||||
if (!$this->seasonDb) {
|
// if (!$this->seasonDb) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
error_log('updateBattleData4');
|
// error_log('updateBattleData4');
|
||||||
$this->updateScore();
|
// $this->updateScore();
|
||||||
$seasonBattleData = json_decode($this->seasonDb['battle_data'], true);
|
// $seasonBattleData = json_decode($this->seasonDb['battle_data'], true);
|
||||||
if (!isset($seasonBattleData['today_data'])) {
|
// if (!isset($seasonBattleData['today_data'])) {
|
||||||
$seasonBattleData['today_data'] = array(
|
// $seasonBattleData['today_data'] = array(
|
||||||
'createtime' => myself()->_getNowTime(),
|
// 'createtime' => myself()->_getNowTime(),
|
||||||
'modifytime' => myself()->_getNowTime()
|
// 'modifytime' => myself()->_getNowTime()
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
if (!isset($seasonBattleData['season_data'])) {
|
// if (!isset($seasonBattleData['season_data'])) {
|
||||||
$seasonBattleData['season_data'] = array(
|
// $seasonBattleData['season_data'] = array(
|
||||||
'createtime' => myself()->_getNowTime(),
|
// 'createtime' => myself()->_getNowTime(),
|
||||||
'modifytime' => myself()->_getNowTime()
|
// 'modifytime' => myself()->_getNowTime()
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
if (!isset($seasonBattleData['his_week_data'])) {
|
// if (!isset($seasonBattleData['his_week_data'])) {
|
||||||
$seasonBattleData['his_week_data'] = array(
|
// $seasonBattleData['his_week_data'] = array(
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
if (!isset($seasonBattleData['this_week_data'])) {
|
// if (!isset($seasonBattleData['this_week_data'])) {
|
||||||
$seasonBattleData['this_week_data'] = array(
|
// $seasonBattleData['this_week_data'] = array(
|
||||||
'createtime' => myself()->_getNowTime(),
|
// 'createtime' => myself()->_getNowTime(),
|
||||||
'modifytime' => myself()->_getNowTime()
|
// 'modifytime' => myself()->_getNowTime()
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
if (myself()->_getDaySeconds($seasonBattleData['today_data']['modifytime']) <
|
// if (myself()->_getDaySeconds($seasonBattleData['today_data']['modifytime']) <
|
||||||
myself()->_getNowDaySeconds()) {
|
// myself()->_getNowDaySeconds()) {
|
||||||
$seasonBattleData['today_data'] = array(
|
// $seasonBattleData['today_data'] = array(
|
||||||
'createtime' => $seasonBattleData['today_data']['createtime'],
|
// 'createtime' => $seasonBattleData['today_data']['createtime'],
|
||||||
'modifytime' => myself()->_getNowTime()
|
// 'modifytime' => myself()->_getNowTime()
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
if (myself()->_getDaySeconds($seasonBattleData['this_week_data']['modifytime']) <
|
// if (myself()->_getDaySeconds($seasonBattleData['this_week_data']['modifytime']) <
|
||||||
myself()->_getMondaySeconds()) {
|
// myself()->_getMondaySeconds()) {
|
||||||
$seasonBattleData['this_week_data'] = array(
|
// $seasonBattleData['this_week_data'] = array(
|
||||||
'createtime' => $seasonBattleData['this_week_data']['createtime'],
|
// 'createtime' => $seasonBattleData['this_week_data']['createtime'],
|
||||||
'modifytime' => myself()->_getNowTime()
|
// 'modifytime' => myself()->_getNowTime()
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
$oldSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
|
// $oldSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
|
||||||
$this->apply($seasonBattleData['season_data']);
|
// $this->apply($seasonBattleData['season_data']);
|
||||||
$newSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
|
// $newSeasonDataKills = getXVal($seasonBattleData['season_data'], 'total_kills_times', 0);
|
||||||
if ($newSeasonDataKills > $oldSeasonDataKills) {
|
// if ($newSeasonDataKills > $oldSeasonDataKills) {
|
||||||
Season::update($this->currSeasonMeta['id'], array(
|
// Season::update($this->currSeasonMeta['id'], array(
|
||||||
'kills_modifytime' => myself()->_getNowTime(),
|
// 'kills_modifytime' => myself()->_getNowTime(),
|
||||||
));
|
// ));
|
||||||
Battle::update(array(
|
// Battle::update(array(
|
||||||
'kills_modifytime' => myself()->_getNowTime(),
|
// 'kills_modifytime' => myself()->_getNowTime(),
|
||||||
));
|
// ));
|
||||||
}
|
// }
|
||||||
$this->apply($seasonBattleData['today_data']);
|
// $this->apply($seasonBattleData['today_data']);
|
||||||
$this->apply($seasonBattleData['this_week_data']);
|
// $this->apply($seasonBattleData['this_week_data']);
|
||||||
Season::update(
|
// Season::update(
|
||||||
$this->currSeasonMeta['id'],
|
// $this->currSeasonMeta['id'],
|
||||||
array(
|
// array(
|
||||||
'battle_data' => json_encode($seasonBattleData),
|
// 'battle_data' => json_encode($seasonBattleData),
|
||||||
)
|
// )
|
||||||
);
|
// );
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
private function updatePveData()
|
private function updatePveData()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user