feat:修改特效伤害

backend/core/basic/character/calc_equip.py

@@ -188,8 +188,9 @@ class CalcEquipMixin(CharacterBase):
                 apply_uppercase_attrs(self, oathSuit)
                 if skill is not None:
                     base_suit = next((x for x in suitList if x.suitId == oathSuit.suitId), None)
-                    base_effect_damage = [] if base_suit is None else base_suit.effectDamage
-                    oathSkillEffect.append((skill, base_effect_damage + skill.effectDamage))
+                    suit_effect_damage = [] if base_suit is None else base_suit.effectDamage
+                    oath_effect_damage = skill.effectDamage
+                    oathSkillEffect.append((skill, oath_effect_damage, suit_effect_damage))
                     # 誓约技能效果生效
                     apply_uppercase_attrs(self, skill)
                     self.oathSkillInfo.append(skill)
@@ -207,11 +208,11 @@ class CalcEquipMixin(CharacterBase):
                             'skills': [{'id': skill.id, 'skillId': i.skillId, 'name': i.name, 'imageUrl': i.imageUrl, 'enable': i.skillId == '1' or max_point_oath_suit == max_point_suit} for i in skills],
                             # 'value': oathSuit.value,
                         }
-        for skill, effectDamage in oathSkillEffect:
+        for skill, oath_effect_damage, suit_effect_damage in oathSkillEffect:
             func = equs.funs.execture(f'oath_skill_{skill.id}')
             if func is not None:
                 # print(f'誓约技能 {skill.id} 生效')
-                func(self, effectDamage)
+                func(self, oath_effect_damage, suit_effect_damage)
         # 太初积分以上，每超过70点数增加1%技能攻击力
         if self.max_point >= 2550:
             skillAttack = (self.max_point - 2550) // 70 * 0.02