diff --git a/webapp/controller/BattleController.class.php b/webapp/controller/BattleController.class.php index f8b5d727..206acc24 100644 --- a/webapp/controller/BattleController.class.php +++ b/webapp/controller/BattleController.class.php @@ -272,6 +272,7 @@ class BattleController extends BaseAuthedController { $info['weapon_uuid2'] = $userPresetInfo['presetInfo']['weapon_uid2']; $chipPageDb = ChipPage::find($userPresetInfo['presetInfo']['chip_page']); $info['chip_page'] = ChipPage::toDtoBattle($chipPageDb); + $info['honor_info'] = $userPresetInfo['honor_info']; $battleDb = Battle::find($account_id); if ($battleDb){ $battleData = json_decode($battleDb['battle_data'], true); diff --git a/webapp/models/User.php b/webapp/models/User.php index 7620a403..d670af91 100644 --- a/webapp/models/User.php +++ b/webapp/models/User.php @@ -271,6 +271,10 @@ class User extends BaseModel { } $preset = HeroPreset::getHeroPreset($row['hero_id']); $skinDb = HeroSkin::findBx($heroId); + $honorInfo = array(); + if ($row['address']){ + $honorInfo = UserHonor::info($row['address']); + } return array( 'account_id' => $row['account_id'], 'address' => $row['address'], @@ -294,6 +298,8 @@ class User extends BaseModel { 'presetInfo' => $preset, 'is_leader' => 0, 'is_ready' => 0, + 'honor_info' => $honorInfo, + ); }