diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index 08c09503..1f660c55 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -376,12 +376,7 @@ class UserController extends BaseAuthedController { return; } $userInfo = User::Info($userDb); - { - $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); - $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); - $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); - $userInfo['has_lucky_symbol'] = myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol'); - } + $this->fillBattleUserInfo($userInfo); $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); if (!$heroDb) { $this->_rspErr(1, 'Hero does not exist'); @@ -416,12 +411,7 @@ class UserController extends BaseAuthedController { return; } $userInfo = User::Info($userDb); - { - $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); - $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); - $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); - $userInfo['has_lucky_symbol'] = myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol'); - } + $this->fillBattleUserInfo($userInfo); $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); if (!$heroDb) { $this->_rspErr(1, 'Hero does not exist'); @@ -457,12 +447,7 @@ class UserController extends BaseAuthedController { return; } $userInfo = User::Info($userDb); - { - $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); - $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); - $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); - $userInfo['has_lucky_symbol'] = myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol'); - } + $this->fillBattleUserInfo($userInfo); $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $heroUniId); if (!$heroDb) { $this->_rspErr(1, 'Hero does not exist'); @@ -1185,4 +1170,16 @@ class UserController extends BaseAuthedController { ) ); } + + private function fillBattleUserInfo(&$userInfo) + { + $userInfo['total_lucky'] = Hero::getAccountLuckyTemp(); + $userInfo['admission_item_num'] = myself()->_getItemCount(900006, $userInfo); + $userInfo['circuit_score'] = myself()->_callModelStatic('Circuit', 'getCurrentMyScore'); + $userInfo['has_lucky_symbol'] = myself()->_callModelStatic('LuckySymbol', 'hasLuckySymbol'); + $userInfo['has_vip_lucky'] = myself()->_getVipRightsVal( + myself()->_getMtConstant('StakingVip', 'ACCOUNT_LUCKY_INC') + ); + } + }