diff --git a/doc/_common.py b/doc/_common.py index 340a3586..ce7b4fb4 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -857,6 +857,7 @@ class BattleCegReward(object): def __init__(self): self.fields = [ ['uuid', '', '唯一id'], + ['curr_ceg', 0, '当前ceg数量'], ['obtain_ceg', 0, '实际获得ceg数量'], ['ceg_uplimit', 0, 'ceg数量上限'], ] @@ -915,4 +916,4 @@ class BattleHistory(object): ['battle_foreign_key', 0, '结算外键'], ['pve_instance_id', 0, 'pve副本难度id'], ['pve_instance_mode', 0, 'pve副本mode'], - ] \ No newline at end of file + ] diff --git a/webapp/services/BattleDataService.php b/webapp/services/BattleDataService.php index 627dbb40..3612afe7 100644 --- a/webapp/services/BattleDataService.php +++ b/webapp/services/BattleDataService.php @@ -66,6 +66,7 @@ class BattleDataService extends BaseService { 'hero_uniid' => '', 'ceg_uplimit' => 0, 'obtain_ceg' => 0, + 'curr_ceg' => 0, ), 'weapon1' => array( 'gun_uniid' => '', @@ -76,6 +77,7 @@ class BattleDataService extends BaseService { 'gun_uniid' => '', 'ceg_uplimit' => 0, 'obtain_ceg' => 0, + 'curr_ceg' => 0, ), 'total_ceg' => 0, 'items' => array() @@ -795,6 +797,7 @@ class BattleDataService extends BaseService { LogService::productCEG($event,$this->heroDto,$log_param); } + $this->reward['hero']['curr_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; } @@ -810,6 +813,7 @@ class BattleDataService extends BaseService { LogService::productCEG($event,$this->weapon1Dto,$log_param); } + $this->reward['weapon1']['curr_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; } @@ -825,6 +829,7 @@ class BattleDataService extends BaseService { LogService::productCEG($event,$this->weapon2Dto,$log_param); } + $this->reward['weapon2']['curr_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; }