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

1

Browse Source
This commit is contained in:
hujiabin 2023-07-16 13:47:30 +08:00
parent e88026c9d5
commit 4e93162231
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,6 +272,7 @@ class BattleController extends BaseAuthedController {
$info['weapon_uuid2'] = $userPresetInfo['presetInfo']['weapon_uid2']; $info['weapon_uuid2'] = $userPresetInfo['presetInfo']['weapon_uid2'];
$chipPageDb = ChipPage::find($userPresetInfo['presetInfo']['chip_page']); $chipPageDb = ChipPage::find($userPresetInfo['presetInfo']['chip_page']);
$info['chip_page'] = ChipPage::toDtoBattle($chipPageDb); $info['chip_page'] = ChipPage::toDtoBattle($chipPageDb);
$info['honor_info'] = $userPresetInfo['honor_info'];
$battleDb = Battle::find($account_id); $battleDb = Battle::find($account_id);
if ($battleDb){ if ($battleDb){
$battleData = json_decode($battleDb['battle_data'], true); $battleData = json_decode($battleDb['battle_data'], true);

6
webapp/models/User.php
View File

@ -271,6 +271,10 @@ class User extends BaseModel {
} }
$preset = HeroPreset::getHeroPreset($row['hero_id']); $preset = HeroPreset::getHeroPreset($row['hero_id']);
$skinDb = HeroSkin::findBx($heroId); $skinDb = HeroSkin::findBx($heroId);
$honorInfo = array();
if ($row['address']){
$honorInfo = UserHonor::info($row['address']);
}
return array( return array(
'account_id' => $row['account_id'], 'account_id' => $row['account_id'],
'address' => $row['address'], 'address' => $row['address'],
@ -294,6 +298,8 @@ class User extends BaseModel {
'presetInfo' => $preset, 'presetInfo' => $preset,
'is_leader' => 0, 'is_leader' => 0,
'is_ready' => 0, 'is_ready' => 0,
'honor_info' => $honorInfo,
); );
} }