diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php index a13a16a1..8b185108 100644 --- a/webapp/services/BattleDataService.php +++ b/webapp/services/BattleDataService.php @@ -87,7 +87,7 @@ class BattleDataService extends BaseService { } $this->weapon1Dto = Gun::toDto($weaponDb); $this->reward['weapon1']['gun_uniid'] = $this->weapon1Dto['gun_uniid']; - $this->reward['weapon1']['gun_uniid'] = $matchMode == 2 ? $this->weapon1Dto['pve_ceg_uplimit'] : $this->weapon1Dto['pvp_ceg_uplimit']; + $this->reward['weapon1']['ceg_uplimit'] = $matchMode == 2 ? $this->weapon1Dto['pve_ceg_uplimit'] : $this->weapon1Dto['pvp_ceg_uplimit']; } } { @@ -580,12 +580,15 @@ class BattleDataService extends BaseService { ))); if ($heroPvpCeg > 0) { $heroPvpCeg = Hero::gainGoldPvp($this->heroDto, $heroPvpCeg); + $this->reward['hero']['obtain_ceg'] = $this->heroDto['current_pvp_get_ceg'] + $heroPvpCeg; } if ($weaponPvpCeg1 > 0) { $weaponPvpCeg1 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg1); + $this->reward['weapon1']['obtain_ceg'] = $this->weapon1Dto['current_pvp_get_ceg'] + $weaponPvpCeg1; } if ($weaponPvpCeg2 > 0) { $weaponPvpCeg2 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg2); + $this->reward['weapon2']['obtain_ceg'] = $this->weapon2Dto['current_pvp_get_ceg'] + $weaponPvpCeg2; } error_log(json_encode(array( 'new_heroPvpCeg' => $heroPvpCeg, @@ -619,12 +622,15 @@ class BattleDataService extends BaseService { ))); if ($heroPveCeg > 0) { $heroPveCeg = Hero::gainGoldPve($this->heroDto, $heroPveCeg); + $this->reward['hero']['obtain_ceg'] = $this->heroDto['current_pve_get_ceg'] + $heroPveCeg; } if ($weaponPveCeg1 > 0) { $weaponPveCeg1 = Gun::gainGoldPve($this->weapon1Dto, $weaponPveCeg1); + $this->reward['weapon1']['obtain_ceg'] = $this->weapon1Dto['current_pve_get_ceg'] + $weaponPveCeg1; } if ($weaponPveCeg2 > 0) { $weaponPveCeg2 = Gun::gainGoldPve($this->weapon1Dto, $weaponPveCeg2); + $this->reward['weapon2']['obtain_ceg'] = $this->weapon2Dto['current_pve_get_ceg'] + $weaponPveCeg2; } error_log(json_encode(array( 'new_heroPveCeg' => $heroPveCeg,