From 17553e8e6c993b8622779a7ea9f69e068d36860e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 21 Aug 2024 21:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmvp=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/controller/BattleController.class.php | 2 +- webapp/controller/BattleDataController.class.php | 2 +- webapp/services/RoomBattleDataService.php | 7 ++++--- webapp/services/TameBattleDataService.php | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index 8a1fff3e..8c9bb23d 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -287,7 +287,7 @@ class BattleController extends BaseAuthedController { $roomBattleDataService->maxAssist = max($roomBattleDataService->maxAssist,getXVal($member,'pvp_assist', 0)); $roomBattleDataService->maxDamage = max($roomBattleDataService->maxDamage,getXVal($member,'damage_out', 0)); $roomBattleDataService->maxRecover = max($roomBattleDataService->maxRecover,getXVal($member,'recover_hp', 0)); - $roomBattleDataService->maxLevel = max($roomBattleDataService->maxLevel,getXVal($member,'hero_lv', 1)); + $roomBattleDataService->maxLevel = max($roomBattleDataService->maxLevel,getXVal($member,'hero_level', 1)); $aliveTime = getXVal($member,'alive_time', 0) / 1000; $roomBattleDataService->maxAlive = max($roomBattleDataService->maxAlive,$aliveTime); } diff --git a/webapp/controller/BattleDataController.class.php b/webapp/controller/BattleDataController.class.php index 66ec36d6..fc48807a 100644 --- a/webapp/controller/BattleDataController.class.php +++ b/webapp/controller/BattleDataController.class.php @@ -287,7 +287,7 @@ class BattleDataController extends BaseAuthedController { $roomBattleDataService->maxAssist = max($roomBattleDataService->maxAssist,getXVal($member,'pvp_assist', 0)); $roomBattleDataService->maxDamage = max($roomBattleDataService->maxDamage,getXVal($member,'damage_out', 0)); $roomBattleDataService->maxRecover = max($roomBattleDataService->maxRecover,getXVal($member,'recover_hp', 0)); - $roomBattleDataService->maxLevel = max($roomBattleDataService->maxLevel,getXVal($member,'hero_lv', 1)); + $roomBattleDataService->maxLevel = max($roomBattleDataService->maxLevel,getXVal($member,'hero_level', 1)); $aliveTime = getXVal($member,'alive_time', 0) / 1000; $roomBattleDataService->maxAlive = max($roomBattleDataService->maxAlive,$aliveTime); } diff --git a/webapp/services/RoomBattleDataService.php b/webapp/services/RoomBattleDataService.php index db35be5f..22db26b0 100644 --- a/webapp/services/RoomBattleDataService.php +++ b/webapp/services/RoomBattleDataService.php @@ -369,7 +369,6 @@ class RoomBattleDataService extends BaseService { $alive = getXVal($battleInfo, 'pvp_survia_time', 0) / 1000; $aliveSco = ($scoreParam[1] - $scoreParam[0]) / ($this->maxAlive - 0) * ($alive - 0) + $scoreParam[0]; } - /* error_log(json_encode(array( 'account_id' => myself()->_getAccountId(), 'kill_sco' => $killSco, @@ -383,8 +382,10 @@ class RoomBattleDataService extends BaseService { 'damage' => getXVal($battleInfo, 'pvp_damage', 0), 'max_damage' => $this->maxDamage, 'recover' => getXVal($battleInfo, 'pvp_recover', 0), - 'max_recover' => $this->maxRecover - )));*/ + 'max_recover' => $this->maxRecover, + 'level' => getXVal($battleInfo, 'hero_lv', 0), + 'max_level' => $this->maxLevel + ))); switch ($room_mode){ case self::ROOM_MODE_PVP: { if (count($weightPvp) == 5){ diff --git a/webapp/services/TameBattleDataService.php b/webapp/services/TameBattleDataService.php index c42dc1b1..d59a6c7b 100644 --- a/webapp/services/TameBattleDataService.php +++ b/webapp/services/TameBattleDataService.php @@ -584,7 +584,7 @@ class TameBattleDataService extends BaseService { 'pve_wave'=> getXVal($this->battleInfo,'pve_wave', 0), 'pve_max_wave'=> getXVal($this->battleInfo,'pve_max_wave', 0), 'pve_boss_killed'=> getXVal($this->battleInfo,'pve_boss_killed', 0), - 'hero_lv'=> getXVal($this->battleInfo,'hero_lv', 1), + 'hero_lv'=> getXVal($this->battleInfo,'hero_level', 1), 'dead_times'=> getXVal($this->battleInfo,'dead_times', 0), "game_time" => getXVal($this->battleInfo,'game_time', 0), 'reward' => array(),