1
This commit is contained in:
parent
037fc12889
commit
9f05e8b36d
@ -38,11 +38,10 @@ class BattleController extends BaseAuthedController {
|
|||||||
'modifytime' => $this->_getNowTime(),
|
'modifytime' => $this->_getNowTime(),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
$this->_rspData($battleDataService->getReward());
|
error_log(json_encode($battleDataService->getReward()));
|
||||||
}
|
$this->_rspData(array(
|
||||||
|
'reward' => $battleDataService->getReward()
|
||||||
public function battleReportNew()
|
));
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getBattleData()
|
public function getBattleData()
|
||||||
|
@ -70,6 +70,7 @@ class BattleDataService extends BaseService {
|
|||||||
'ceg_uplimit' => 0,
|
'ceg_uplimit' => 0,
|
||||||
'obtain_ceg' => 0,
|
'obtain_ceg' => 0,
|
||||||
),
|
),
|
||||||
|
'total_ceg' => 0,
|
||||||
'items' => array()
|
'items' => array()
|
||||||
);
|
);
|
||||||
private $rankActivityService = null;
|
private $rankActivityService = null;
|
||||||
@ -620,14 +621,17 @@ class BattleDataService extends BaseService {
|
|||||||
if ($heroPvpCeg > 0) {
|
if ($heroPvpCeg > 0) {
|
||||||
$heroPvpCeg = Hero::gainGoldPvp($this->heroDto, $heroPvpCeg);
|
$heroPvpCeg = Hero::gainGoldPvp($this->heroDto, $heroPvpCeg);
|
||||||
$this->reward['hero']['obtain_ceg'] = $this->heroDto['current_pvp_get_ceg'] + $heroPvpCeg;
|
$this->reward['hero']['obtain_ceg'] = $this->heroDto['current_pvp_get_ceg'] + $heroPvpCeg;
|
||||||
|
$this->reward['total_ceg'] += $heroPvpCeg;
|
||||||
}
|
}
|
||||||
if ($weaponPvpCeg1 > 0) {
|
if ($weaponPvpCeg1 > 0) {
|
||||||
$weaponPvpCeg1 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg1);
|
$weaponPvpCeg1 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg1);
|
||||||
$this->reward['weapon1']['obtain_ceg'] = $this->weapon1Dto['current_pvp_get_ceg'] + $weaponPvpCeg1;
|
$this->reward['weapon1']['obtain_ceg'] = $this->weapon1Dto['current_pvp_get_ceg'] + $weaponPvpCeg1;
|
||||||
|
$this->reward['total_ceg'] += $weaponPvpCeg1;
|
||||||
}
|
}
|
||||||
if ($weaponPvpCeg2 > 0) {
|
if ($weaponPvpCeg2 > 0) {
|
||||||
$weaponPvpCeg2 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg2);
|
$weaponPvpCeg2 = Gun::gainGoldPvp($this->weapon1Dto, $weaponPvpCeg2);
|
||||||
$this->reward['weapon2']['obtain_ceg'] = $this->weapon2Dto['current_pvp_get_ceg'] + $weaponPvpCeg2;
|
$this->reward['weapon2']['obtain_ceg'] = $this->weapon2Dto['current_pvp_get_ceg'] + $weaponPvpCeg2;
|
||||||
|
$this->reward['total_ceg'] += $weaponPvpCeg2;
|
||||||
}
|
}
|
||||||
error_log(json_encode(array(
|
error_log(json_encode(array(
|
||||||
'new_heroPvpCeg' => $heroPvpCeg,
|
'new_heroPvpCeg' => $heroPvpCeg,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user