完成任务功能

This commit is contained in:
aozhiwei 2021-12-15 13:48:22 +08:00
parent 0e8054548f
commit fafb9c7cac
2 changed files with 5 additions and 3 deletions

View File

@ -173,7 +173,8 @@ class MissionController extends BaseAuthedController {
if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) { if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) {
$notFinishedCount++; $notFinishedCount++;
} }
if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND) { if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND &&
$missionDto['state'] == Mission::NOT_FINISHED_STATE) {
$specMissionDto = &$missionDto; $specMissionDto = &$missionDto;
} }
} }
@ -183,6 +184,7 @@ class MissionController extends BaseAuthedController {
$specMissionDto['state'] == Mission::NOT_FINISHED_STATE && $specMissionDto['state'] == Mission::NOT_FINISHED_STATE &&
$notFinishedCount <= 1) { $notFinishedCount <= 1) {
$specMissionDto['state'] == Mission::RECEIVEABLE_STATE; $specMissionDto['state'] == Mission::RECEIVEABLE_STATE;
array_push($missionDtoList, $missionDto);
} }
foreach ($missionDtoList as $missionDto) { foreach ($missionDtoList as $missionDto) {
$missionMeta = mt\Mission::get($missionDto['mission_id']); $missionMeta = mt\Mission::get($missionDto['mission_id']);

View File

@ -66,7 +66,7 @@ class SeasonCardController extends BaseAuthedController {
public function info() public function info()
{ {
$seasonCardMeta = mt\SeasonCard::get(1); $seasonCardMeta = mt\SeasonCard::get($this->seasonDb['card_lv']);
$this->_rspData(array( $this->_rspData(array(
'info' => array( 'info' => array(
'season_id' => $this->currSeasonMeta['id'], 'season_id' => $this->currSeasonMeta['id'],
@ -126,7 +126,7 @@ class SeasonCardController extends BaseAuthedController {
public function getAllReward() public function getAllReward()
{ {
$seasonCardMeta = mt\SeasonCard::get(1); $seasonCardMeta = mt\SeasonCard::get($this->seasonDb['card_lv']);
$info = array( $info = array(
'season_id' => $this->currSeasonMeta['id'], 'season_id' => $this->currSeasonMeta['id'],
'season_begin_time' => strtotime($this->currSeasonMeta['begin_time']), 'season_begin_time' => strtotime($this->currSeasonMeta['begin_time']),