This commit is contained in:
aozhiwei 2024-10-21 11:17:57 +08:00
parent ec54527292
commit 2eaa689cd7

View File

@ -376,12 +376,7 @@ class UserController extends BaseAuthedController {
return; return;
} }
$userInfo = User::Info($userDb); $userInfo = User::Info($userDb);
{ $this->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');
}
$heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']);
if (!$heroDb) { if (!$heroDb) {
$this->_rspErr(1, 'Hero does not exist'); $this->_rspErr(1, 'Hero does not exist');
@ -416,12 +411,7 @@ class UserController extends BaseAuthedController {
return; return;
} }
$userInfo = User::Info($userDb); $userInfo = User::Info($userDb);
{ $this->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');
}
$heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']); $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $userInfo['hero_uniid']);
if (!$heroDb) { if (!$heroDb) {
$this->_rspErr(1, 'Hero does not exist'); $this->_rspErr(1, 'Hero does not exist');
@ -457,12 +447,7 @@ class UserController extends BaseAuthedController {
return; return;
} }
$userInfo = User::Info($userDb); $userInfo = User::Info($userDb);
{ $this->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');
}
$heroDb = Hero::findByAccountId(myself()->_getAccountId(), $heroUniId); $heroDb = Hero::findByAccountId(myself()->_getAccountId(), $heroUniId);
if (!$heroDb) { if (!$heroDb) {
$this->_rspErr(1, 'Hero does not exist'); $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')
);
}
} }