From 63245ebcc79f522a46832fc62cb3f7bcdfcbb13b Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Mon, 14 Oct 2024 16:15:07 +0800
Subject: [PATCH] 1

---
 webapp/mt/RookieTask.php                  |  3 +++
 webapp/services/TameBattleDataService.php | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/webapp/mt/RookieTask.php b/webapp/mt/RookieTask.php
index 5490e4cb..01562eea 100644
--- a/webapp/mt/RookieTask.php
+++ b/webapp/mt/RookieTask.php
@@ -24,6 +24,9 @@ class RookieTask {
     const  AND_FRIENDS_BATTLE_COND = 17;        //和好友完成x场战斗
     const  UP_HERO_TIMES_COND = 18;             //进阶x次英雄
     const  SYN_HERO_TIMES_COND = 19;            //合成x次英雄
+    const  USE_BATTLE_MIXTURES_COND = 20;       //使用一次战斗药剂
+    const  USE_LUCKY_CHARM_COND = 21;           //使用一次幸运符
+
     const  TOTAL_COMMIT_TASK_TIMES_COND = 101;  //累积任务积分达到X
 
     public static function getCustomDayMetaList($day=0){
diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php
index f7299dea..61457faf 100644
--- a/webapp/services/TameBattleDataService.php
+++ b/webapp/services/TameBattleDataService.php
@@ -105,8 +105,8 @@ class TameBattleDataService extends BaseService {
             return false;
         }
         myself()->_fireEvent('Battle','onSettlement',$this->battleInfo);
-        myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::BATTLE_TIMES_COND,1);
-        $this->isMyFriend();
+
+        $this->incRookieTaskValue();
         //记录战斗有效行为
 //        $this->_updateBattleData();
         //记录战斗数据的排行榜
@@ -165,7 +165,20 @@ class TameBattleDataService extends BaseService {
     }
 
 
-    private function isMyFriend(){
+    private function incRookieTaskValue(){
+        myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::BATTLE_TIMES_COND,1);
+        $battleItems = getXVal($this->battleInfo,'battle_items', 0);
+        if (count($battleItems) > 0){
+            foreach ($battleItems as $item){
+                $itemMeta = mt\Item::get($item['item_id']);
+                if ($itemMeta['type'] == mt\Item::FUNC_TYPE && $itemMeta['sub_type'] == 8){
+                    myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::USE_LUCKY_CHARM_COND,$item['item_num']);
+                }
+                if ($itemMeta['type'] == mt\Item::FUNC_TYPE && $itemMeta['sub_type'] == 9){
+                    myself()->_callModelStatic('RookieTask','incTaskVal',mt\RookieTask::USE_BATTLE_MIXTURES_COND,$item['item_num']);
+                }
+            }
+        }
         $myAccount = getXVal($this->userInfo,'account_id', 0);
         foreach ($this->teamInfo as $member){
             $account = getXVal($member,'account_id', 0);