fix:修正外传觉醒技能判定

backend/core/character/GF/extra/creator.py

@@ -1659,3 +1659,11 @@ class classChange(Character):
     def SetDetail(self, info: dict[str, dict]) -> None:
         super().SetDetail(info)
         self.bindAwake = 85
+
+    def SetSkillCD(self, min=1, max=100, cd=0, exclude: tuple[int, ...] = (85, 100)) -> None:
+            """设置技能CD"""
+            super().SetSkillCD(min, max, cd, exclude)
+        
+    def SetSkillCDRecover(self, min=1, max=100, cd=0, exclude: tuple[int, ...] = (85, 100)) -> None:
+        """设置技能CD恢复"""
+        super().SetSkillCDRecover(min, max, cd, exclude)

backend/core/character/GF/extra/dark_knight.py

@@ -1974,7 +1974,7 @@ class Skill50(DarkKnightSkill):
         # 选择该vp之后，当前列的连招列的其他技能都没有伤害
         skills = []
         for index in self.char.combos[self.comboCol]:
-             if index != self.id:
+             if str(index) != str(self.id):
                  skill = self.char.GetSkillByID(index)
                  if skill:
                      skills.append(skill.name)
@@ -2234,4 +2234,11 @@ class classChange(Character):
                     # 总面板显示CD/（技能数量+总恢复加速）*1.2
                     skill['cd'] = total / totalRecover * 1.2
         return skillInfos
-    
+    
+    def SetSkillCD(self, min=1, max=100, cd=0, exclude: tuple[int, ...] = (85, 100)) -> None:
+        """设置技能CD"""
+        super().SetSkillCD(min, max, cd, exclude)
+    
+    def SetSkillCDRecover(self, min=1, max=100, cd=0, exclude: tuple[int, ...] = (85, 100)) -> None:
+        """设置技能CD恢复"""
+        super().SetSkillCDRecover(min, max, cd, exclude)

backend/core/equipment/version_0/equ.py

@@ -347,7 +347,7 @@ def equ_22(char: CharacterProperty,effectDamage: list[float] = []):
     所有速度 +10%
     rarity: 传说
     """
-    char.SetSkillCD(1, 100, 0.2, [50, 85, 100])
+    char.SetSkillCD(1, 100, 0.2)
     char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
     char.SetStatus(EquEffectRatio=0.1)
     pass
@@ -366,9 +366,9 @@ def equ_23(char: CharacterProperty,effectDamage: list[float] = []):
     分身攻击命中时，技能冷却时间恢复速度 +3%，效果持续3秒。（觉醒技能除外；最多叠加1次）
     rarity: 史诗
     """
-    char.SetSkillCD(1, 100, 0.2, [50, 85, 100])
+    char.SetSkillCD(1, 100, 0.2)
     char.SetStatus(SpeedM=0.125, SpeedA=0.125, SpeedR=0.125)
-    char.SetSkillCDRecover(1, 100, 0.03, [50, 85, 100])
+    char.SetSkillCDRecover(1, 100, 0.03)
     char.SetStatus(EquEffectRatio=0.1)
     pass
 
@@ -386,9 +386,9 @@ def equ_24(char: CharacterProperty,effectDamage: list[float] = []):
     分身攻击命中时，技能冷却时间恢复速度 +3%，效果持续3秒。（觉醒技能除外；最多叠加1次）
     rarity: 太初
     """
-    char.SetSkillCD(1, 100, 0.2, [50, 85, 100])
+    char.SetSkillCD(1, 100, 0.2)
     char.SetStatus(SpeedM=0.15, SpeedA=0.15, SpeedR=0.15)
-    char.SetSkillCDRecover(1, 100, 0.03, [50, 85, 100])
+    char.SetSkillCDRecover(1, 100, 0.03)
     char.SetStatus(EquEffectRatio=0.1)
     pass