diff --git a/doc/_common.py b/doc/_common.py index 46415800..9dd4556c 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -290,10 +290,10 @@ class Hero(object): ['tags', '', '1:Gen状态'], ['!avatarInfo', [AvatarInfo()], '装饰信息'], ['ability', Ability(), '属性'], - ['lucky', 0, '英雄自身幸运值'], - ['wealth', 0, '英雄自身财富值'], - ['luckyMax', 0, '英雄最大幸运值'], - ['wealthMax', 0, '英雄最大财富值'], + ['lucky_base', 0, '英雄自身幸运值'], + ['wealth_base', 0, '英雄自身财富值'], + ['lucky', 0, '英雄最大幸运值'], + ['wealth', 0, '英雄最大财富值'], ['seal_type', 0, '0:未封存 1:已封存'], ['unseal_time', 0, '解封时间'], ['valid_time', 0, '最大有效时间'], diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index 8e3d7820..0423f165 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -307,10 +307,10 @@ class Hero extends BaseModel { 'offer_reward_state' => 0, 'tags' => isset($row['tags'])?$row['tags']:'', 'is_select' => $isSelect, - 'luckyMax' => self::getHeroLucky($row), - 'lucky' => self::getHeroLuckyBase($row), - 'wealthMax' => self::getHeroWealth($row), - 'wealth' => self::getHeroWealthBase($row), + 'lucky' => self::getHeroLucky($row), + 'lucky_base' => self::getHeroLuckyBase($row), + 'wealth' => self::getHeroWealth($row), + 'wealth_base' => self::getHeroWealthBase($row), 'ability' => self::abilityInfo($row), 'seal_type' => $row['seal_type'], 'unseal_time' => $row['unseal_time'],