This commit is contained in:
aozhiwei 2024-08-05 17:02:36 +08:00
parent 0882a8eacf
commit 7f4988d6cf
2 changed files with 22 additions and 4 deletions

View File

@ -289,6 +289,7 @@ class Hero(object):
['tags', '', '1Gen状态'], ['tags', '', '1Gen状态'],
['!avatarInfo', [AvatarInfo()], '装饰信息'], ['!avatarInfo', [AvatarInfo()], '装饰信息'],
['ability', Ability(), '属性'], ['ability', Ability(), '属性'],
['ability_addition', Ability(), '属性-加成'],
['lucky', 0, '幸运值'], ['lucky', 0, '幸运值'],
['wealth', 0, '财富值'], ['wealth', 0, '财富值'],
['seal_type', 0, '0:未封存 1已封存'], ['seal_type', 0, '0:未封存 1已封存'],

View File

@ -280,6 +280,8 @@ class Hero extends BaseModel {
$validTime = $unsealTime + 86400 * $heroAtteMeta['validTime'] ; $validTime = $unsealTime + 86400 * $heroAtteMeta['validTime'] ;
} }
$baseAbility = self::abilityInfo($row);
$addAbility = self::abilityInfoAddition($baseAbility, $row);
$dto = array( $dto = array(
'idx' => $row['idx'], 'idx' => $row['idx'],
'token_id' => $row['token_id'], 'token_id' => $row['token_id'],
@ -308,7 +310,8 @@ class Hero extends BaseModel {
'is_select' => $isSelect, 'is_select' => $isSelect,
'lucky' => self::getHeroLucky($row), 'lucky' => self::getHeroLucky($row),
'wealth' => self::getHeroWealth($row), 'wealth' => self::getHeroWealth($row),
'ability' => self::abilityInfo($row), 'ability' => $baseAbility,
'ability_addition' => $addAbility,
'seal_type' => $row['seal_type'], 'seal_type' => $row['seal_type'],
'unseal_time' => $row['unseal_time'], 'unseal_time' => $row['unseal_time'],
'valid_lefttime' => max(0, 'valid_lefttime' => max(0,
@ -428,7 +431,7 @@ class Hero extends BaseModel {
return $avatarInfos; return $avatarInfos;
} }
public static function abilityInfo($row ){ public static function abilityInfoAddition($baseAbility, $row){
$info = array( $info = array(
'hp' => 0, 'hp' => 0,
'attack' => 0, 'attack' => 0,
@ -436,8 +439,18 @@ class Hero extends BaseModel {
'block' => 0, 'block' => 0,
'critical' => 0 'critical' => 0
); );
$attr = array(); return $info;
$basicMeta = mt\BattleBasicAttribute::get($row['hero_id']); }
public static function calcAbility($heroId, $attr) {
$info = array(
'hp' => 0,
'attack' => 0,
'defence' => 0,
'block' => 0,
'critical' => 0
);
$basicMeta = mt\BattleBasicAttribute::get($heroId);
if (!$basicMeta) { if (!$basicMeta) {
return $info; return $info;
} }
@ -562,6 +575,10 @@ class Hero extends BaseModel {
return $info; return $info;
} }
public static function abilityInfo($row){
return self::calcAbility($row['hero_id'], array());
}
public static function addFreeHero($heroMeta) public static function addFreeHero($heroMeta)
{ {
return self::internalAddHero( return self::internalAddHero(