dev

backend/core/basic/character.py

@@ -218,6 +218,8 @@ class Character(CharacterProperty):
         self.equ_effect = []
         self.equ_options = {}
         self.max_point = 0
+        self.skills = []
+        self.skills_dict = {}
         pass
 
     # region 角色属性设置
@@ -541,8 +543,6 @@ class Character(CharacterProperty):
 
     def load_skills(self, module:str) -> None:
         """加载技能"""
-        skills = []
-        skills_dict = {}
         classes = []
         for name in dir(module):
             member = getattr(module, name)
@@ -551,10 +551,8 @@ class Character(CharacterProperty):
         for i in classes:
             if i.__name__.startswith("Skill"):
                 skill = i(char=self)
-                skills_dict[skill.name] = skill
-                skills.append(skill)
-        self.skills = skills
-        self.skills_dict = skills_dict
+                self.skills_dict[skill.name] = skill
+                self.skills.append(skill)
 
     def calc_suits(self):
         """套装效果统计"""

backend/core/character/GF/mage_male/glacial_master.py

@@ -1,4 +1,5 @@
 #a5ccbaf5538981c6ef99b236c0a60b73
+import sys
 from core.basic.skill import PassiveSkill, ActiveSkill
 from core.basic.character import Character
 
@@ -533,20 +534,4 @@ class classChange(Character):
 
         self.职业 = '冰结师'
 
-        self.load_skills()
-
-    def load_skills(self):
-        """加载技能"""
-        skills = []
-        skills_dict = {}
-        i = 0
-        while i >= 0:
-            try:
-                tem = eval('Skill' + str(i) + '(char=self)')
-                skills_dict[tem.name] = tem
-                skills.append(tem)
-                i += 1
-            except Exception:
-                i = -1
-        self.skills = skills
-        self.skills_dict = skills_dict
+        self.load_skills(sys.modules[__name__])

backend/core/character/GF/priest_female/crusader_female.py

@@ -649,4 +649,4 @@ class classChange(Character):
             if skill.buffer and skill.buffType == 'buff' and skill.learnLv == 30:
                 self.BuffSkill = skill
             if skill.buffer and skill.buffType == 'awake':
-                self.AwakeSkill = skill
+                self.AwakeSkill = skill

backend/core/character/GF/swordman_female/dark_templar.py

@@ -337,7 +337,7 @@ class Skill19(ActiveSkill):
     mp = [120, 2024]
 
     data0 = [0, 4488, 4944, 5400, 5859, 6314, 6771, 7224, 7683, 8138, 8594, 9048, 9504, 9960, 10416, 10868, 11328, 11782, 12237, 12696, 13149, 13605, 14060, 14518, 14972, 15429, 15882, 16341, 16796, 17252, 17706, 18162, 18621, 19076, 19533, 19983, 20442, 20898, 21354, 21808, 22263, 22718, 23178, 23630, 24090, 24540, 24999, 25456, 25911, 26368, 26820, 27279, 27732, 28191, 28646, 29100, 29554, 30012, 30466, 30921, 31376, 31838, 32290, 32750, 33201, 33657, 34113, 34570, 35026, 35478, 35937]# noqa: E501
-    hit1 = 15
+    hit0 = 15
 
 
 # 灵魂傀儡 충실한 종

backend/core/character/GF/swordman_male/asura.py

@@ -178,7 +178,7 @@ class Skill10(ActiveSkill):
     icon = "$char/冰刃·波动剑"
 
     data0 = [0, 1674, 1844, 2014, 2183, 2351, 2523, 2693, 2864, 3031, 3199, 3374, 3548, 3714, 3883, 4049, 4224, 4400, 4568, 4731, 4906, 5080, 5248, 5413, 5579, 5754, 5924, 6096, 6259, 6433, 6606, 6774, 6941, 7111, 7288, 7456, 7623, 7791, 7963, 8141, 8310, 8473, 8644, 8814, 8988, 9156, 9318, 9493, 9666, 9838, 10001, 10171, 10346, 10518, 10683, 10853, 11019, 11200, 11363, 11534, 11703, 11874, 12044, 12218, 12386, 12553, 12726, 12893, 13068, 13231, 13404]# noqa: E501
-    hit0 = 1 #TODO
+    hit0 = 9
 
 
 # 杀意波动 살의의 파동

backend/core/character/GF/swordman_male/soul_bender.py

@@ -340,7 +340,7 @@ class Skill17(ActiveSkill):
     mp = [150, 1260]
 
     data0 = [0, 901, 993, 1084, 1176, 1267, 1359, 1450, 1542, 1633, 1725, 1816, 1908, 1999, 2091, 2182, 2274, 2365, 2457, 2549, 2641, 2732, 2824, 2915, 3007, 3098, 3190, 3281, 3372, 3464, 3556, 3646, 3739, 3830, 3921, 4012, 4105, 4195, 4287, 4381, 4470, 4561, 4655, 4745, 4836, 4930, 5020, 5111, 5204, 5294, 5386, 5479, 5569, 5661, 5753, 5842, 5934, 6027, 6117, 6208, 6301, 6391, 6483, 6576, 6667, 6757, 6851, 6941, 7033, 7126, 7216]# noqa: E501
-    hit1 = 10 #TODO
+    hit0 = 10 #TODO
 
 
 # 鬼影鞭 귀검편