From a62cab968af13aa2d9de207dc66b26b9c56a411d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 9 Dec 2021 11:14:38 +0800
Subject: [PATCH] 1

---
 webapp/services/MissionService.php | 224 +++++++----------------------
 1 file changed, 48 insertions(+), 176 deletions(-)

diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index f8f9fdb..ce939ed 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -38,34 +38,22 @@ class MissionService extends BaseService {
         case mt\Task::DAILY_LOGIN_TIMES_COND:
         {
             //今日登陆
-            if (myself()->_getDailyV(TN_DAILY_LOGINS, 0) >= $missionDto['target']) {
-                $missionDto['current'] = $missionDto['target'];
-                $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-            }
+            $missionDto['current'] = myself()->_getDailyV(TN_DAILY_LOGINS, 0);
         }
         break;
         case mt\Task::PLAYER_LEVEL_COND:
         {
             //玩家等级达到X
-            if ($userInfo['level'] >= $missionDto['target']) {
-                $missionDto['current'] = $missionDto['target'];
-                $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-            }
+            $missionDto['current'] = $userInfo['level'];
         }
         break;
         case mt\Task::TOTAL_BATTLE_TIMES_COND:
         {
             //进行X场比赛
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_battle_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_battle_times', 0);
             } else {
-                if ($userInfo['total_battle_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_battle_times', 0);
             }
         }
         break;
@@ -78,15 +66,9 @@ class MissionService extends BaseService {
         {
             //进行X场单人比赛
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_single_battle_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_single_battle_times', 0);
             } else {
-                if ($userInfo['total_single_battle_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_single_battle_times', 0);
             }
         }
         break;
@@ -94,15 +76,9 @@ class MissionService extends BaseService {
         {
             //进行X场组队比赛
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_team_battle_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_team_battle_times', 0);
             } else {
-                if ($userInfo['total_team_battle_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_team_battle_times', 0);
             }
         }
         break;
@@ -110,15 +86,9 @@ class MissionService extends BaseService {
         {
             //单人比赛排名前X
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'single_battle_rank', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'single_battle_rank', 0);
             } else {
-                if ($userInfo['single_battle_rank'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'single_battle_rank', 0);
             }
         }
         break;
@@ -126,15 +96,9 @@ class MissionService extends BaseService {
         {
             //组队比赛排名前X
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'team_battle_rank', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'team_battle_rank', 0);
             } else {
-                if ($userInfo['team_battle_rank'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'team_battle_rank', 0);
             }
         }
         break;
@@ -142,15 +106,9 @@ class MissionService extends BaseService {
         {
             //累计击败X个敌人
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_kills_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_kills_times', 0);
             } else {
-                if ($userInfo['total_kills_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_kills_times', 0);
             }
         }
         break;
@@ -158,15 +116,9 @@ class MissionService extends BaseService {
         {
             //累计造成X点伤害
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_damage_out', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_damage_out', 0);
             } else {
-                if ($userInfo['total_damage_out'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_damage_out', 0);
             }
         }
         break;
@@ -174,15 +126,9 @@ class MissionService extends BaseService {
         {
             //救援X个队友
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'rescue_teammate_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'rescue_teammate_times', 0);
             } else {
-                if ($userInfo['rescue_teammate_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'rescue_teammate_times', 0);
             }
         }
         break;
@@ -190,15 +136,9 @@ class MissionService extends BaseService {
         {
             //累计生存X分钟
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_alive_time', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_alive_time', 0);
             } else {
-                if ($userInfo['total_alive_time'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_alive_time', 0);
             }
         }
         break;
@@ -226,15 +166,9 @@ class MissionService extends BaseService {
         {
             //累计潜水X次
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'diving_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'diving_times', 0);
             } else {
-                if ($userInfo['diving_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'diving_times', 0);
             }
         }
         break;
@@ -242,15 +176,9 @@ class MissionService extends BaseService {
         {
             //累计受到X点伤害
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_damage_in', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_damage_in', 0);
             } else {
-                if ($userInfo['total_damage_in'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_damage_in', 0);
             }
         }
         break;
@@ -258,15 +186,9 @@ class MissionService extends BaseService {
         {
             //累计恢复X点血量
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'total_recover_hp', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'total_recover_hp', 0);
             } else {
-                if ($userInfo['total_recover_hp'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'total_recover_hp', 0);
             }
         }
         break;
@@ -274,15 +196,9 @@ class MissionService extends BaseService {
         {
             //累计打开空投补给X次
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'open_airdrop_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'open_airdrop_times', 0);
             } else {
-                if ($userInfo['open_airdrop_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'open_airdrop_times', 0);
             }
         }
         break;
@@ -300,15 +216,9 @@ class MissionService extends BaseService {
         {
             //累计使用X药品Y次
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'use_medicine_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'use_medicine_times', 0);
             } else {
-                if ($userInfo['use_medicine_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'use_medicine_times', 0);
             }
         }
         break;
@@ -316,15 +226,9 @@ class MissionService extends BaseService {
         {
             //累计破坏载具X个
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'destory_car_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'destory_car_times', 0);
             } else {
-                if ($userInfo['destory_car_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'destory_car_times', 0);
             }
         }
         break;
@@ -332,15 +236,9 @@ class MissionService extends BaseService {
         {
             //累计使用X个伪装物
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'use_camouflage_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'use_camouflage_times', 0);
             } else {
-                if ($userInfo['use_camouflage_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'use_camouflage_times', 0);
             }
         }
         break;
@@ -348,15 +246,9 @@ class MissionService extends BaseService {
         {
             //累计使用X次角色技能
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'use_skill_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'use_skill_times', 0);
             } else {
-                if ($userInfo['use_skill_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'use_skill_times', 0);
             }
         }
         break;
@@ -364,15 +256,9 @@ class MissionService extends BaseService {
         {
             //驾驶或乘坐载具累计移动X米（所有模式）
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'ride_car_move_distance', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'ride_car_move_distance', 0);
             } else {
-                if ($userInfo['ride_car_move_distance'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'ride_car_move_distance', 0);
             }
         }
         break;
@@ -380,15 +266,9 @@ class MissionService extends BaseService {
         {
             //驾驶或乘坐载具累计击杀X个敌人（所有模式）
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'ride_car_kills', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'ride_car_kills', 0);
             } else {
-                if ($userInfo['ride_car_kills'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'ride_car_kills', 0);
             }
         }
         break;
@@ -396,34 +276,22 @@ class MissionService extends BaseService {
         {
             //战斗结算中累计给队友点赞X次
             if ($missionMeta['season_task'] == mt\Task::SEASON_MISSON_FLAG) {
-                if (getXVal($seasonDb, 'to_teammate_like_times', 0) >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($seasonDb, 'to_teammate_like_times', 0);
             } else {
-                if ($userInfo['to_teammate_like_times'] >= $missionDto['target']) {
-                    $missionDto['current'] = $missionDto['target'];
-                    $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+                $missionDto['current'] = getXVal($userInfo, 'to_teammate_like_times', 0);
             }
         }
         break;
         case mt\Task::SEASON_LEVEL_COND:
         {
             //赛季段位达到X
-            if ($userInfo['rank'] >= $missionDto['target']) {
-                $missionDto['current'] = $missionDto['target'];
-                $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-            }
+            $missionDto['current'] = $userInfo['rank'];
         }
         break;
         case mt\Task::CONSUME_GOLD_COND:
         {
             //消耗X个金币
-            if ($userInfo['consume_gold'] >= $missionDto['target']) {
-                $missionDto['current'] = $missionDto['target'];
-                $missionDto['state'] = Mission::RECEIVEABLE_STATE;
-                }
+            $missionDto['current'] = $userInfo['consume_gold'];
         }
         break;
         case mt\Task::BATTLE_RANK_COND:
@@ -481,6 +349,10 @@ class MissionService extends BaseService {
         }
         break;
         }
+        if ($missionDto['current'] >= $missionDto['target']) {
+            $missionDto['current'] = $missionDto['target'];
+            $missionDto['state'] = Mission::RECEIVEABLE_STATE;
+        }
         return $missionDto;
     }