From fafb9c7cacd4417fb6a6765a62dce195c898ed61 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 15 Dec 2021 13:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BB=BB=E5=8A=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/controller/MissionController.class.php | 4 +++- webapp/controller/SeasonCardController.class.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index 5ea47b53..de2af0f7 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -173,7 +173,8 @@ class MissionController extends BaseAuthedController { if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) { $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; } } @@ -183,6 +184,7 @@ class MissionController extends BaseAuthedController { $specMissionDto['state'] == Mission::NOT_FINISHED_STATE && $notFinishedCount <= 1) { $specMissionDto['state'] == Mission::RECEIVEABLE_STATE; + array_push($missionDtoList, $missionDto); } foreach ($missionDtoList as $missionDto) { $missionMeta = mt\Mission::get($missionDto['mission_id']); diff --git a/webapp/controller/SeasonCardController.class.php b/webapp/controller/SeasonCardController.class.php index 758ee739..192e8fc0 100644 --- a/webapp/controller/SeasonCardController.class.php +++ b/webapp/controller/SeasonCardController.class.php @@ -66,7 +66,7 @@ class SeasonCardController extends BaseAuthedController { public function info() { - $seasonCardMeta = mt\SeasonCard::get(1); + $seasonCardMeta = mt\SeasonCard::get($this->seasonDb['card_lv']); $this->_rspData(array( 'info' => array( 'season_id' => $this->currSeasonMeta['id'], @@ -126,7 +126,7 @@ class SeasonCardController extends BaseAuthedController { public function getAllReward() { - $seasonCardMeta = mt\SeasonCard::get(1); + $seasonCardMeta = mt\SeasonCard::get($this->seasonDb['card_lv']); $info = array( 'season_id' => $this->currSeasonMeta['id'], 'season_begin_time' => strtotime($this->currSeasonMeta['begin_time']),