server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hjb' into james

Browse Source
This commit is contained in:
aozhiwei 2022-10-20 14:44:13 +08:00
commit 52b7050c87
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/_common.py
View File

@ -858,6 +858,7 @@ class BattleCegReward(object):
def __init__(self):
self.fields = [
['uuid', '', '唯一id'],
['curr_ceg', 0, '当前ceg数量'],
['obtain_ceg', 0, '实际获得ceg数量'],
['ceg_uplimit', 0, 'ceg数量上限'],
]

5
webapp/services/BattleDataService.php
View File

@ -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;
}