diff --git a/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py b/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py index f04a857..d2c020a 100644 --- a/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py +++ b/StarRailUID/starrailuid_charinfo/effect/Avatar/Avatar.py @@ -231,8 +231,12 @@ class Fuxuan(BaseAvatar): def extra_ability(self): logger.info('符玄战技【穷观阵】属性加成') - self.extra_ability_attribute['CriticalChanceBase'] = self.BPSkill_num('BPSkill_CC') - self.extra_ability_attribute['HPAddedRatio'] = self.BPSkill_num('BPSkill_HP') + self.extra_ability_attribute['CriticalChanceBase'] = self.BPSkill_num( + 'BPSkill_CC' + ) + self.extra_ability_attribute['HPAddedRatio'] = self.BPSkill_num( + 'BPSkill_HP' + ) class Gepard(BaseAvatar): @@ -426,6 +430,7 @@ class Jingliu(BaseAvatar): 'UltraAttackAddedRatio' ] = attack_added_ratio + class Topaz(BaseAvatar): Buff: BaseAvatarBuff @@ -452,9 +457,14 @@ class Topaz(BaseAvatar): logger.info('托帕和账账对拥有火属性弱点的敌方目标造成的伤害提高15%。') self.extra_ability_attribute['AllDamageAddedRatio'] = 0.15 logger.info('涨幅惊人暴击伤害提高') - self.extra_ability_attribute['Talent1_CriticalDamageBase'] = self.Ultra_num('Ultra_CD') + self.extra_ability_attribute[ + 'Talent1_CriticalDamageBase' + ] = self.Ultra_num('Ultra_CD') logger.info('【负债证明】状态,使其受到的追加攻击伤害提高') - self.extra_ability_attribute['TalentDmgAdd'] = self.BPSkill_num('BPSkill_add') + self.extra_ability_attribute['TalentDmgAdd'] = self.BPSkill_num( + 'BPSkill_add' + ) + class Avatar: @classmethod diff --git a/StarRailUID/starrailuid_charinfo/effect/Role.py b/StarRailUID/starrailuid_charinfo/effect/Role.py index 60e5957..541c8b0 100644 --- a/StarRailUID/starrailuid_charinfo/effect/Role.py +++ b/StarRailUID/starrailuid_charinfo/effect/Role.py @@ -166,7 +166,9 @@ class RoleInstance: skill_multiplier = self.avatar.BPSkill_num(skill_type) skill_type = 'BPSkill' elif self.raw_data.avatar.id_ == 1112: - skill_multiplier = self.avatar.Ultra_num(skill_type) + self.avatar.BPSkill() + skill_multiplier = ( + self.avatar.Ultra_num(skill_type) + self.avatar.BPSkill() + ) skill_type = 'Talent' else: raise Exception('skill type error') @@ -290,19 +292,20 @@ class RoleInstance: enemy_status_resistance = 0.0 for attr in merged_attr: if attr.__contains__('ResistancePenetration'): - #检查是否有某一属性的抗性穿透 + # 检查是否有某一属性的抗性穿透 attr_name = attr.split('ResistancePenetration')[0] if attr_name in (self.avatar.avatar_element, 'AllDamage'): - logger.info( - f'{attr_name}属性有{merged_attr[attr]}穿透加成' - ) + logger.info(f'{attr_name}属性有{merged_attr[attr]}穿透加成') enemy_status_resistance += merged_attr[attr] - #检查是否有某一技能属性的抗性穿透 + # 检查是否有某一技能属性的抗性穿透 skill_name = attr_name.split('_')[0] skillattr_name = attr_name.split('_')[1] - if ( - skill_name in (skill_type, skill_info[3]) - and skillattr_name in (self.avatar.avatar_element, 'AllDamage') + if skill_name in ( + skill_type, + skill_info[3], + ) and skillattr_name in ( + self.avatar.avatar_element, + 'AllDamage', ): enemy_status_resistance += merged_attr[attr] logger.info(