1

backend/core/character/GF/archer/hunter.py

@@ -1,5 +1,5 @@
 # b9cb48777665de22c006fabaf9a560b3
-from core.basic.skill import PassiveSkill, ActiveSkill, get_data
+from core.basic.skill import PassiveSkill, ActiveSkill, get_data, _get_skill_damage_suffixes, _get_skill_dataplus_suffixes
 from core.basic.character import Character
 
 prefix = 'archer/hunter/cn/skillDetail'
@@ -12,8 +12,7 @@ class HunterActiveSkill(ActiveSkill):
     # 标记消耗，大于0为消耗，小于0为生成
     def getSkillData(self, lv: int = 0):
         res = 0
-        keys = [key.replace('data', '') for key in dir(self) if key.startswith('data') and not key.startswith('dataplus')]
-        for i in keys:
+        for i in _get_skill_damage_suffixes(self.__class__):
             data = getattr(self, f'data{i}', [])
             plus = getattr(self, f'plus{i}', 0)
             hit = getattr(self, f'hit{i}', 0)
@@ -24,8 +23,7 @@ class HunterActiveSkill(ActiveSkill):
                 power = getattr(self, f'power{i}', 1)
                 cost = getattr(self, f'cost{i}', 0)
                 res += hit * power * (data[lv] + plus) * ((1 + self.normalRation) if cost <= 0 else (1 + self.markRation * cost))
-        keys = [key.replace('dataplus', '') for key in dir(self) if key.startswith('dataplus')]
-        for i in keys:
+        for i in _get_skill_dataplus_suffixes(self.__class__):
             data = getattr(self, f'dataplus{i}', 0)
             hit = getattr(self, f'hitplus{i}', 1)
             power = getattr(self, f'powerplus{i}', 1)