From b56b2792c1736e180ac5c694f2437bb7e0b6d36d Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Thu, 16 Mar 2023 20:32:32 +0800
Subject: [PATCH] 1

---
 webapp/bootstrap/constant.php                 |  1 +
 webapp/controller/MissionController.class.php | 24 ++++++++++---------
 webapp/services/MissionService.php            |  1 +
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/webapp/bootstrap/constant.php b/webapp/bootstrap/constant.php
index 26cf74e5..f269a61e 100644
--- a/webapp/bootstrap/constant.php
+++ b/webapp/bootstrap/constant.php
@@ -43,6 +43,7 @@ define('TN_DAILY_RANK_BATTLE_TIMES', 9011);
 define('TN_DAILY_END', 9011);
 define('TN_DAILY_PVE_GET_HERO_FRAGMENT_NUM', 9012);
 define('TN_DAILY_PVE_GET_GUN_FRAGMENT_NUM', 9013);
+define('TN_DAILY_COMPLETE_TASK_NUM', 9014);
 
 define('TN_WEEKLY_BEGIN', 10001);
 define('TN_WEEKLY_ACTIVE', 10002);
diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php
index 9b9f48f9..f5f31783 100644
--- a/webapp/controller/MissionController.class.php
+++ b/webapp/controller/MissionController.class.php
@@ -84,22 +84,23 @@ class MissionController extends BaseAuthedController {
                     array_push($missionDtoList1, $missionDto);
                 } else {
                     array_push($missionDtoList2, $missionDto);
-                    if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) {
-                        $notFinishedCount++;
-                    }
-                    if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND) {
-                        $specMissionDto = &$missionDto;
-                    }
+//                    if ($missionDto['state'] == Mission::NOT_FINISHED_STATE) {
+//                        $notFinishedCount++;
+//                    }
+//                    if ($missionMeta['condition'] == mt\Task::FINISHED_ALL_DAILY_MISSION_COND) {
+//                        $specMissionDto &= $missionDto;
+//                    }
                 }
             } else {
                 array_push($missionDtoList1, $missionDto);
             }
         }
-        if ($specMissionDto &&
-            $specMissionDto['state'] == Mission::NOT_FINISHED_STATE &&
-            $notFinishedCount <= 1) {
-            $specMissionDto['state'] = Mission::RECEIVEABLE_STATE;
-        }
+//        if ($specMissionDto &&
+//            $specMissionDto['state'] == Mission::NOT_FINISHED_STATE &&
+//            $notFinishedCount <= 1) {
+////            $specMissionDto['state'] = Mission::RECEIVEABLE_STATE;
+//            $specMissionDto['state'] = 9636;
+//        }
         $this->_rspData(array(
             'current_active_value' => min($this->_getV(TN_ACTIVE, 0), mt\Parameter::getVal('max_activity', 0)),
             'max_active_value' => mt\Parameter::getVal('max_activity', 0),
@@ -161,6 +162,7 @@ class MissionController extends BaseAuthedController {
         $missionDb = Mission::find($missionId);
         $missionDto = $this->missionService->getMissionDto(
             $this->userInfo, $this->seasonDb, $missionDb, $missionMeta);
+        $this->_incDailyV(TN_DAILY_COMPLETE_TASK_NUM, 0, 1);
         $this->propertyChgService->addHeroChg();
         $this->propertyChgService->addGunChg();
         $this->_rspData(array(
diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index 534e0ce8..09b47e6a 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -344,6 +344,7 @@ class MissionService extends BaseService {
         case mt\Task::FINISHED_ALL_DAILY_MISSION_COND:
         {
             //完成所有每日任务
+            $missionDto['current'] = myself()->_getDailyV(TN_DAILY_COMPLETE_TASK_NUM, 0);
         }
         break;
         case mt\Task::SHOP_BUY_TIMES_COND: