From 6308dd69a024b0c2155e862c77cd1f06107a7caf Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Wed, 22 May 2024 14:46:08 +0800
Subject: [PATCH] 1

---
 webapp/services/RoomBattleDataService.php | 12 ++++++++----
 webapp/services/TameBattleDataService.php |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php
index 482b739e..dd7d8a55 100644
--- a/webapp/services/RoomBattleDataService.php
+++ b/webapp/services/RoomBattleDataService.php
@@ -113,10 +113,14 @@ class RoomBattleDataService extends BaseService {
                         $member['new_elo'] = $newElo;
                     }
 
-
-                    $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);
-                    myself()->_addItems($member['reward'], $awardService,$propertyChgService);
-
+                    if ($this->mapMode == mt\MapMode::GOLD_MODE &&
+                        ($member['move_distance'] <= 2000 || $member['damage_out'] <= 500) ){
+                        error_log("金币模式:消极战斗");
+                    }else{
+                        $this->_getBattleRewards($userDb,$heroDb,$battleScore,$myTeamScoreAvg,$myTeamScore,$member['reward']);
+                        myself()->_addItems($member['reward'], $awardService,$propertyChgService);
+                    }
+                
                     $battleSingleDb = BattleSettlement::findSingle($this->battleSettlementDb['battle_uuid']);
                     if ($battleSingleDb){
                         $battleSingleData = emptyReplace(json_decode($battleSingleDb['data'], true), array());
diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php
index c726aef4..5ed0c8ad 100644
--- a/webapp/services/TameBattleDataService.php
+++ b/webapp/services/TameBattleDataService.php
@@ -691,6 +691,8 @@ class TameBattleDataService extends BaseService {
                 'dead'=> getXVal($info,'dead', 0),
                 'skin_id'=> getXVal($info,'skin_id', 0),
                 'is_mvp'=> getXVal($info,'is_mvp', 0),
+                'damage_out'=> getXVal($info,'damage_out', 0),
+                'move_distance'=> getXVal($info,'move_distance', 0),
                 'old_rank'=> $oldRank,
                 'new_rank'=> $newRank,
                 'old_score'=> $oldScore,