server/game2005api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-12-15 11:13:46 +08:00
parent cbe3a18f7c
commit 62232d51f8
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/bootstrap/init.php
View File

@ -47,6 +47,9 @@ function getResBaseDir()
function getXVal($arr, $name, $defVal = null) function getXVal($arr, $name, $defVal = null)
{ {
if (is_null($arr)) {
error_log('callstack:' . json_encode(debug_backtrace(), JSON_PRETTY_PRINT));
}
$val = array_key_exists($name, $arr) ? $arr[$name] : $defVal; $val = array_key_exists($name, $arr) ? $arr[$name] : $defVal;
return $val; return $val;
} }

26
webapp/services/MissionService.php
View File

@ -5,11 +5,13 @@ namespace services;
require_once('mt/Task.php'); require_once('mt/Task.php');
require_once('models/Mission.php'); require_once('models/Mission.php');
require_once('models/Battle.php');
use phpcommon\SqlHelper; use phpcommon\SqlHelper;
use mt; use mt;
use models\User; use models\User;
use models\Mission; use models\Mission;
use models\Battle;
class MissionService extends BaseService { class MissionService extends BaseService {
@ -24,6 +26,28 @@ class MissionService extends BaseService {
{ {
$this->userInfo = $userInfo; $this->userInfo = $userInfo;
$this->seasonDb = $seasonDb; $this->seasonDb = $seasonDb;
$this->hisBattleData = Battle::getMyBattleData();
$seasonBattleData = json_decode($this->seasonDb['battle_data'], true);
if (!isset($seasonBattleData)) {
$seasonBattleData = array();
}
$this->seasonBattleData = getXVal($seasonBattleData, 'season_data', array());
$this->thisWeekBattleData = getXVal($seasonBattleData, 'this_week_data', array());
$this->todayBattleData = getXVal($seasonBattleData, 'today_data', array());
if (myself()->_getDaySeconds(getXVal($this->todayBattleData, 'modifytime', 0)) <
myself()->_getNowDaySeconds()) {
$this->todayBattleData = array(
'createtime' => myself()->_getNowTime(),
'modifytime' => myself()->_getNowTime(),
);
}
if (myself()->_getDaySeconds(getXVal($this->thisWeekBattleData, 'modifytime', 0)) <
myself()->_getMondaySeconds()) {
$this->thisWeekBattleData = array(
'createtime' => myself()->_getNowTime(),
'modifytime' => myself()->_getNowTime(),
);
}
} }
public function getMissionDto($userInfo, $seasonDb, $missionDb, $missionMeta) public function getMissionDto($userInfo, $seasonDb, $missionDb, $missionMeta)
@ -375,7 +399,7 @@ class MissionService extends BaseService {
{ {
$battleData = null; $battleData = null;
if ($missionMeta['type'] == mt\Task::DAILY_MISSON_TYPE) { if ($missionMeta['type'] == mt\Task::DAILY_MISSON_TYPE) {
$battleData = $this->dailyBattleData; $battleData = $this->todayBattleData;
} else { } else {
if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) { if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
if ($missionMeta['type'] == mt\Task::SEASONCARD_MISSON_TYPE && if ($missionMeta['type'] == mt\Task::SEASONCARD_MISSON_TYPE &&