diff --git a/webapp/models/Hero.php b/webapp/models/Hero.php index e8e65f2d..ea14f1f6 100644 --- a/webapp/models/Hero.php +++ b/webapp/models/Hero.php @@ -127,11 +127,6 @@ class Hero extends BaseModel { $lockType = $row['lock_type']; $unlockTime = $row['unlock_time']; } - $heroMeta = mt\Hero::get($row['hero_id']); - if ($heroMeta) { - $baseAttr = mt\Hero::getHeroAttr($heroMeta); - mt\AttrHelper::mergeAttr($attr, $baseAttr); - } $qualityMeta = mt\HeroQuality::getByQuality($row['quality']); $todayGetGold = $row['today_get_gold']; $lastGetGoldTime = $row['last_get_gold_time']; @@ -149,6 +144,12 @@ class Hero extends BaseModel { $speed = 0; $atk = 0; $def = 0; + $heroMeta = mt\Hero::get($row['hero_id']); + if ($heroMeta) { + $newAttr = emptyReplace(json_decode($row['rand_attr'], true), array()); + $baseAttr = mt\Hero::getHeroAttr($heroMeta); + mt\AttrHelper::mergeAttr($newAttr, $baseAttr); + } $heroLucky = $qualityMeta ? $qualityMeta['lucky'] : 0; $dto = array( 'token_id' => $row['token_id'],