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

---
 webapp/services/MissionService.php | 87 ++++++++++++++++++------------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/webapp/services/MissionService.php b/webapp/services/MissionService.php
index 496a2f3..5ef6dee 100644
--- a/webapp/services/MissionService.php
+++ b/webapp/services/MissionService.php
@@ -51,7 +51,7 @@ class MissionService extends BaseService {
         case mt\Task::TOTAL_BATTLE_TIMES_COND:
         {
             //进行X场比赛
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_battle_times');
         }
         break;
@@ -64,104 +64,108 @@ class MissionService extends BaseService {
         case mt\Task::SINGLE_BATTLE_TIMES_COND:
         {
             //进行X场单人比赛
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_single_battle_times');
         }
         break;
         case mt\Task::TEAM_BATTLE_TIMES_COND:
         {
             //进行X场组队比赛
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_team_battle_times');
         }
         break;
         case mt\Task::SINGLE_BATTLE_RANK_COND:
         {
             //单人比赛排名前X
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'single_battle_rank');
         }
         break;
         case mt\Task::TEAM_BATTLE_RANK_COND:
         {
             //组队比赛排名前X
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'team_battle_rank');
         }
         break;
         case mt\Task::TOTAL_KILL_NUM_COND:
         {
             //累计击败X个敌人
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_kills_times');
         }
         break;
         case mt\Task::TOTAL_DAMGE_OUT_COND:
         {
             //累计造成X点伤害
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_damage_out');
         }
         break;
         case mt\Task::RESCUE_TEAMMATE_TIMES_COND:
         {
             //救援X个队友
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'rescue_teammate_times');
         }
         break;
         case mt\Task::TOTAL_SURVIVAL_TIME_COND:
         {
             //累计生存X分钟
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_alive_time');
         }
         break;
         case mt\Task::USE_WEAPON_KILL_NUM_COND:
         {
-            //使用X枪械击杀Y个敌人 未实现
+            //使用X枪械击杀Y个敌人
+            $handled = false;
         }
         break;
         case mt\Task::USE_WEAPON_DAMGE_OUT_COND:
         {
-            //使用X种枪械对敌人累计造成Y点伤害 未实现
+            //使用X种枪械对敌人累计造成Y点伤害
+            $handled = false;
         }
         break;
         case mt\Task::USE_WEAPON_SLOT_TIMES_COND:
         {
-            //使用某个槽位的次数 cond_param1=槽位 未实现
+            //使用某个槽位的次数 cond_param1=槽位
+            $handled = false;
         }
         break;
         case mt\Task::GET_EQUIP_TIMES_COND:
         {
-            //获得某种类型的装备 cond_param1=equip.type cond_param2=equip.sub_type 未实现
+            //获得某种类型的装备 cond_param1=equip.type cond_param2=equip.sub_type
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_DIVING_TIMES_COND:
         {
             //累计潜水X次
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'diving_times');
         }
         break;
         case mt\Task::TOTAL_DAMAGE_IN_COND:
         {
             //累计受到X点伤害
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_damage_in');
         }
         break;
         case mt\Task::TOTAL_RECOVER_HP_COND:
         {
             //累计恢复X点血量
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'total_recover_hp');
         }
         break;
         case mt\Task::TOTAL_OPEN_AIRDROP_COND:
         {
             //累计打开空投补给X次
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'open_airdrop_times');
         }
         break;
@@ -180,49 +184,49 @@ class MissionService extends BaseService {
         case mt\Task::TOTAL_MEDICINE_TIMES_COND:
         {
             //累计使用X药品Y次
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'use_medicine_times');
         }
         break;
         case mt\Task::TOTAL_DESTORY_CAR_TIMES_COND:
         {
             //累计破坏载具X个
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'destory_car_times');
         }
         break;
         case mt\Task::TOTAL_USE_CAMOUFLAGE_TIMES_COND:
         {
             //累计使用X个伪装物
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'use_camouflage_times');
         }
         break;
         case mt\Task::TOTAL_USE_SKILL_TIMES_COND:
         {
             //累计使用X次角色技能
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'use_skill_times');
         }
         break;
         case mt\Task::RIDE_CAR_MOVE_DISTANCE_COND:
         {
             //驾驶或乘坐载具累计移动X米（所有模式）
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'ride_car_move_distance');
         }
         break;
         case mt\Task::RIDE_CAR_KILL_NUM_COND:
         {
             //驾驶或乘坐载具累计击杀X个敌人（所有模式）
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'ride_car_kills');
         }
         break;
         case mt\Task::LIKE_TEAMMATE_TIMES_COND:
         {
             //战斗结算中累计给队友点赞X次
-            $missionDto['current'] = getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
+            $missionDto['current'] = $this->getBattleData($userInfo, $seasonDb, $missionDb, $missionMeta,
                                                    'to_teammate_like_times');
         }
         break;
@@ -240,52 +244,62 @@ class MissionService extends BaseService {
         break;
         case mt\Task::BATTLE_RANK_COND:
         {
-            //获得X级评价Y次 未实现
+            //获得X级评价Y次
+            $handled = false;
         }
         break;
         case mt\Task::FINISHED_ALL_DAILY_MISSION_COND:
         {
-            //完成所有每日任务 未实现
+            //完成所有每日任务
+            $handled = false;
         }
         break;
         case mt\Task::SHOP_BUY_TIMES_COND:
         {
-            //在X商店消费Y次 未实现
+            //在X商店消费Y次
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_UPGRADE_TALENT_LV_COND:
         {
-            //科研升级X次 未实现
+            //科研升级X次
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_GET_HERO_SKIN_COUNT_COND:
         {
-            //累计获得X个角色时装 未实现
+            //累计获得X个角色时装
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_GET_GUN_SKIN_COUNT_COND:
         {
-            //累计获得X个枪械皮肤 未实现
+            //累计获得X个枪械皮肤
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_INVITE_FRIEND_TIMES_COND:
         {
-            //邀请好友组队X次 未实现
+            //邀请好友组队X次
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_GIVE_FRIEND_GOLD_COUNT_COND:
         {
-            //赠送X个好友金币 未实现
+            //赠送X个好友金币
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_INVITE_FRIEND_ONLINE_TIMES_COND:
         {
-            //邀请X个好友上线 未实现
+            //邀请X个好友上线
+            $handled = false;
         }
         break;
         case mt\Task::TOTAL_CREATE_OR_JOIN_GUILD_COUNT_COND:
         {
-            //创建或加入1个战队 未实现
+            //创建或加入1个战队
+            $handled = false;
         }
         break;
         default:
@@ -297,6 +311,9 @@ class MissionService extends BaseService {
             $missionDto['current'] = $missionDto['target'];
             $missionDto['state'] = Mission::RECEIVEABLE_STATE;
         }
+        if (!$handled) {
+            var_dump($missionDto);
+        }
         return $missionDto;
     }
 
@@ -307,7 +324,7 @@ class MissionService extends BaseService {
             if ($missionMeta['type'] == mt\Task::SEASONCARD_MISSON_TYPE &&
                 $missionMeta['subtype'] == mt\Task::SEASON_WEAKLY_MISSON_SUBTYPE) {
                 $weeklyData = getXVal($seasonDb, 'weekly_data', array());
-                $weekDb = getXVal($weeklyData, $missionMeta['keek'], array());
+                $weekDb = getXVal($weeklyData, $missionMeta['week'], array());
                 $val = getXVal($weekDb, $key, 0);
             } else {
                 $val = getXVal($seasonDb, $key, 0);