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

Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

Browse Source
This commit is contained in:
hujiabin 2024-04-22 21:25:08 +08:00
commit f9dcec7c49
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/controller/BattleController.class.php
View File

@ -709,7 +709,6 @@ class BattleController extends BaseAuthedController {
$info['weapon_uuid1'] = $userPresetInfo['presetInfo']['weapon_uid1']; $info['weapon_uuid1'] = $userPresetInfo['presetInfo']['weapon_uid1'];
$info['weapon_uuid2'] = $userPresetInfo['presetInfo']['weapon_uid2']; $info['weapon_uuid2'] = $userPresetInfo['presetInfo']['weapon_uid2'];
$chipPageDb = ChipPage::find($userPresetInfo['hero_uniId']); $chipPageDb = ChipPage::find($userPresetInfo['hero_uniId']);
$info['chip_page'] = ChipPage::toDtoBattle($chipPageDb);
$info['honor_info'] = $userPresetInfo['honor_info']; $info['honor_info'] = $userPresetInfo['honor_info'];
$battleDb = Battle::find($accountId); $battleDb = Battle::find($accountId);
if ($battleDb){ if ($battleDb){
@ -722,6 +721,7 @@ class BattleController extends BaseAuthedController {
if ($heroDb) { if ($heroDb) {
$info['is_valid_battle'] = 1; $info['is_valid_battle'] = 1;
$info['hero_dto'] = Hero::toDto($heroDb); $info['hero_dto'] = Hero::toDto($heroDb);
$info['hero_dto']['chip_page'] = ChipPage::toDtoBattle($chipPageDb);
} else { } else {
$info['errcode'] = 51; $info['errcode'] = 51;
$info['errmsg'] = 'paramater error'; $info['errmsg'] = 'paramater error';