From 9af091e1145d642e219b9cacaded4f5c24ec8dca Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 9 Oct 2024 16:32:18 +0800
Subject: [PATCH] 1

---
 webapp/services/RoomBattleDataService.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 804b43ed..bfcaba07 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -142,17 +142,17 @@ class RoomBattleDataService extends BaseService {
                         }
                     }
 
+                    $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']);
                     if ($this->mapMode == mt\MapMode::TREASURE_BOX_MODE && $member['move_distance'] <= 2000 ){
                         error_log("金币模式:消极战斗");
                     }else{
-                        $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward'], $member);
+                        $this->_getBattleRewards($battleSingleDb, $userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward'], $member);
                         myself()->_addItems($member['reward'], $awardService,$propertyChgService);
                         if ($this->mapMode == mt\MapMode::GOLD_MODE){
                             $member['today_hero_battles'] = $heroDb['idx'] . '|' .myself()->_getDailyV(TN_DAILY_GOLD_MODE_BATTLE_TIMES,$heroDb['idx']);
                         }
                     }
 
-                    $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']);
                     if ($battleSingleDb){
                         $battleSingleData = emptyReplace(json_decode($battleSingleDb['data'], true), array());
                         $battleSingleData['reward'] = $member['reward'];
@@ -177,7 +177,7 @@ class RoomBattleDataService extends BaseService {
 
     }
 
-    public function _getBattleRewards($userDb,$heroDb,$battleScore,$teamScoreAvg,$teamScore,&$reward, $member){
+    public function _getBattleRewards($battleSingleDb, $userDb,$heroDb,$battleScore,$teamScoreAvg,$teamScore,&$reward, $member){
         error_log('settlementReward -> _getBattleRewards');
         $mapModeMeta = mt\MapMode::findByMapMode($this->mapMode);
         $teamRank = getXVal($this->teamData,'pvp_team_rank', 0);