fix:修正觉醒cd

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

@@ -41,13 +41,13 @@ class Skill0(CreatorActiveSkill):
     # 火焰攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 1
-    energyCost = 4
-    totalEnergy = 140
     # 能量消耗值 : {value1}
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # [范围信息]
     # 火焰大小比率 : {value2}%
     data2 = get_data(f'{prefix}/{uuid}', 2)
+    energyCost = 4
+    totalEnergy = 140
 
 # 炽炎星陨
 # extra/creator/902a016f6978f13740f237e4740a5646
@@ -75,13 +75,13 @@ class Skill1(CreatorActiveSkill):
     # 陨石攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 1
-    energyCost = 20
-    totalEnergy = 140
     # 能量消耗值 : {value1}
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # [范围信息]
     # 陨石大小比率 : {value2}%
     data2 = get_data(f'{prefix}/{uuid}', 2)
+    energyCost = 20
+    totalEnergy = 140
 
 # 后跳
 # extra/creator/7822d6d52e10964a6755f142c666b494
@@ -238,8 +238,6 @@ class Skill7(CreatorActiveSkill):
     # 冰球攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 6
-    energyCost = 20
-    totalEnergy = 140
     # 冰球多段攻击次数 : {value1}次
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # 能量消耗值 : {value2}
@@ -247,6 +245,8 @@ class Skill7(CreatorActiveSkill):
     # [范围信息]
     # 冰球大小比率 : {value3}%
     data3 = get_data(f'{prefix}/{uuid}', 3)
+    energyCost = 20
+    totalEnergy = 140
 
 # 冰天震地
 # extra/creator/fa3ee243b36699e9d3fc34328adf6417
@@ -274,13 +274,13 @@ class Skill8(CreatorActiveSkill):
     # 冰盘攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 1
-    energyCost = 40
-    totalEnergy = 140
     # 能量消耗值 : {value1}
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # [范围信息]
     # 冰盘大小 : {value2}px
     data2 = get_data(f'{prefix}/{uuid}', 2)
+    energyCost = 40
+    totalEnergy = 140
 
 # 强化 - 后跳
 # extra/creator/2b340542e776818b78f3212af184bd6b
@@ -566,8 +566,6 @@ class Skill18(CreatorActiveSkill):
     # 烈焰飓风攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 12
-    energyCost = 60
-    totalEnergy = 140
     # 烈焰飓风多段攻击次数 : {value1}次
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # 能量消耗值: {value2}
@@ -575,6 +573,8 @@ class Skill18(CreatorActiveSkill):
     # [范围信息]
     # 烈焰飓风大小比率 : {value3}%
     data3 = get_data(f'{prefix}/{uuid}', 3)
+    energyCost = 60
+    totalEnergy = 140
 
     def vp_1(self):
         """
@@ -628,8 +628,6 @@ class Skill19(CreatorActiveSkill):
     # 护盾攻击力 : {value2}
     data2 = get_data(f'{prefix}/{uuid}', 2)
     hit2 = 1
-    energyCost = 60
-    totalEnergy = 140
     # 推开距离 : {value3}px
     data3 = get_data(f'{prefix}/{uuid}', 3)
     # 能量消耗值 : {value4}
@@ -640,6 +638,8 @@ class Skill19(CreatorActiveSkill):
     # [范围信息]
     # 护盾大小 : {value7}px
     data7 = get_data(f'{prefix}/{uuid}', 7)
+    energyCost = 60
+    totalEnergy = 140
 
     def vp_1(self):
         """
@@ -741,13 +741,13 @@ class Skill22(CreatorActiveSkill):
     # 旋风波攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 1
-    energyCost = 4
-    totalEnergy = 140
     # 能量消耗值 : {value1}
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # [范围信息]
     # 旋风波发射距离 : {value2}px
     data2 = get_data(f'{prefix}/{uuid}', 2)
+    energyCost = 4
+    totalEnergy = 140
 
     def vp_1(self):
         """
@@ -797,13 +797,13 @@ class Skill23(CreatorActiveSkill):
     # 风暴攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 1
-    energyCost = 20
-    totalEnergy = 140
     # 能量消耗值 : {value1}
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # [范围信息]
     # 风暴大小比率 : {value2}%
     data2 = get_data(f'{prefix}/{uuid}', 2)
+    energyCost = 20
+    totalEnergy = 140
 
     def vp_1(self):
         """
@@ -973,13 +973,13 @@ class Skill28(CreatorActiveSkill):
     # 虫洞大爆炸攻击力 : {value2}
     data2 = get_data(f'{prefix}/{uuid}', 2)
     hit2 = 1
-    energyCost = 100
-    totalEnergy = 100
     # 能量消耗值 : {value3}
     data3 = get_data(f'{prefix}/{uuid}', 3)
     # [范围信息]
     # 虫洞大小比率 : {value4}%
     data4 = get_data(f'{prefix}/{uuid}', 4)
+    energyCost = 100
+    totalEnergy = 100
 
     def vp_1(self):
         """
@@ -1058,8 +1058,6 @@ class Skill30(CreatorActiveSkill):
     # 冰河地带攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 21
-    energyCost = 50
-    totalEnergy = 100
     # 冰河地带多段攻击次数 : {value1}次
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # 不同范围的攻击力增加率 : 0%~{value2}%
@@ -1078,6 +1076,8 @@ class Skill30(CreatorActiveSkill):
     # [范围信息]
     # 冰河地带大小比率 : {value8}%
     data8 = get_data(f'{prefix}/{uuid}', 8)
+    energyCost = 50
+    totalEnergy = 100
 
     skillDamage = 1.2
 
@@ -1157,8 +1157,6 @@ class Skill32(CreatorActiveSkill):
     # 红色实线攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 35
-    energyCost = 50
-    totalEnergy = 100
     # 红色实线多段攻击次数 : {value1}次
     data1 = get_data(f'{prefix}/{uuid}', 1)
     # [时空链接]连接线持续时间 : {value2}秒
@@ -1167,6 +1165,8 @@ class Skill32(CreatorActiveSkill):
     data3 = get_data(f'{prefix}/{uuid}', 3)
     # 能量消耗值 : {value4}
     data4 = get_data(f'{prefix}/{uuid}', 4)
+    energyCost = 50
+    totalEnergy = 100
 
     def vp_1(self):
         """
@@ -1281,8 +1281,6 @@ class Skill35(CreatorActiveSkill):
     # 卡巴拉爆炸攻击力 : {value2}
     data2 = get_data(f'{prefix}/{uuid}', 2)
     hit2 = 1
-    energyCost = 100
-    totalEnergy = 100
     # 卡巴拉召唤持续时间 : {value3}秒
     data3 = get_data(f'{prefix}/{uuid}', 3)
     # 能量消耗值 : {value4}
@@ -1293,6 +1291,8 @@ class Skill35(CreatorActiveSkill):
     # [范围信息]
     # 领域大小比率 : {value7}%
     data7 = get_data(f'{prefix}/{uuid}', 7)
+    energyCost = 100
+    totalEnergy = 100
 
     def vp_1(self):
         """
@@ -1331,7 +1331,7 @@ class Skill36(ActiveSkill):
     maxLv = 1
     position = 6
     rangeLv = 3
-    cd = 180
+    cd = 170
     uuid = 'c47b66efd27845ef14954928ea2f95c8'
     hasVP = False
     hasUP = False
@@ -1357,7 +1357,7 @@ class Skill37(PassiveSkill):
     position = 5
     rangeLv = 5
     cube = 10
-    cd = 180
+    cd = 170
     mp = [3727, 7454]
     uuid = '1c1a9606eb702ebe5a7bb4397f3aeae0'
     hasVP = False
@@ -1419,7 +1419,7 @@ class Skill38(CreatorActiveSkill):
     position = 6
     rangeLv = 5
     cube = 10
-    cd = 180
+    cd = 170
     mp = [4000, 4000]
     uuid = '66a9967e677651d0def34c475795ccde'
     hasVP = False
@@ -1429,14 +1429,14 @@ class Skill38(CreatorActiveSkill):
     # 每个元素果实爆炸攻击力 : {value0}
     data0 = get_data(f'{prefix}/{uuid}', 0)
     hit0 = 6
-    power0 = 1 / 1.07  #TODO：CHECK
     # 元素果实同时爆炸攻击力 : {value1} X 剩余果实数
     data1 = get_data(f'{prefix}/{uuid}', 1)
     hit1 = 0
-    energyCost = 100
-    totalEnergy = 100
     # 能量消耗值 : {value2}
     data2 = get_data(f'{prefix}/{uuid}', 2)
+    power0 = 1 / 1.07  #TODO：CHECK
+    energyCost = 100
+    totalEnergy = 100
 
     mode = ['秒炸', '常规']
 
@@ -1550,14 +1550,15 @@ class Skill41(CreatorActiveSkill):
     # 太初之光爆炸攻击力 : {value1}
     data1 = get_data(f'{prefix}/{uuid}', 1)
     hit1 = 1
-    energyCost = 100
-    totalEnergy = 100
     # 能量消耗量 : {value2}
     data2 = get_data(f'{prefix}/{uuid}', 2)
+    energyCost = 100
+    totalEnergy = 100
 
 # 觉醒之心
 # extra/creator/8c10cefa65364880451e389bb74d3600
 # b522a95d819a5559b775deb9a490e49a/8c10cefa65364880451e389bb74d3600
+# MIGRATION: character 中没有同名技能“觉醒之心”，暂不启用
 # class Skill42(PassiveSkill):
 #     """
 #         获得三次自我觉醒的线索，增加[生命之树]的技能攻击力。\n
@@ -1573,7 +1574,7 @@ class Skill41(CreatorActiveSkill):
 #     hasVP = False
 #     hasUP = False
 #     custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501
-
+#
 #     # [生命之树]技能攻击力增加率 : {value0}%
 #     data0 = get_data(f'{prefix}/{uuid}', 0)
 
@@ -1596,7 +1597,7 @@ class Skill43(ActiveSkill):
     maxLv = 1
     position = 8
     rangeLv = 5
-    cd = 290
+    cd = 270
     uuid = '3736fe00a26b0086c23db9a4426a5641'
     hasVP = False
     hasUP = False
@@ -1625,7 +1626,7 @@ class Skill44(CreatorActiveSkill):
     position = 8
     rangeLv = 5
     cube = 15
-    cd = 290
+    cd = 270
     mp = [4028, 8056]
     uuid = '03bd172c9c50cfdcf9d7e83a3ef82842'
     hasVP = False
@@ -1640,10 +1641,10 @@ class Skill44(CreatorActiveSkill):
     # 次元爆炸攻击力 : {value2}
     data2 = get_data(f'{prefix}/{uuid}', 2)
     hit2 = 1
-    energyCost = 100
-    totalEnergy = 100
     # 能量消耗量 : {value3}
     data3 = get_data(f'{prefix}/{uuid}', 3)
+    energyCost = 100
+    totalEnergy = 100
 
 class classChange(Character):
     def __init__(self, equVersion):
@@ -1672,7 +1673,7 @@ class classChange(Character):
     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)
+        super().SetSkillCDRecover(min, max, cd, exclude)

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

@@ -37,6 +37,7 @@ class DarkKnightSkill(ActiveSkill):
             power = powers[self.stage - 1]
         return res[0], res[1] * power, res[2]
 
+
 # 暗影斩
 # extra/dark_knight/eb71e1d82d92c7e1d40500a0dcd77aa6
 # 17e417b31686389eebff6d754c3401ea/eb71e1d82d92c7e1d40500a0dcd77aa6
@@ -2000,7 +2001,7 @@ class Skill51(DarkKnightSkill):
     position = 4
     rangeLv = 5
     cube = 10
-    cd = 180
+    cd = 170
     mp = [2500, 5000]
     uuid = 'd204ec03a0aed2f20211fb6ccc48d46d'
     hasVP = False
@@ -2091,6 +2092,7 @@ class Skill53(DarkKnightSkill):
 # 觉醒之心
 # extra/dark_knight/2ff50c35efcf0f287c4c418c8454da48
 # 17e417b31686389eebff6d754c3401ea/2ff50c35efcf0f287c4c418c8454da48
+# MIGRATION: character 中没有同名技能“觉醒之心”，暂不启用
 # class Skill54(PassiveSkill):
 #     """
 #         获得自我觉醒的线索，增加[超时空碎裂]的技能攻击力。\n
@@ -2106,7 +2108,7 @@ class Skill53(DarkKnightSkill):
 #     hasVP = False
 #     hasUP = False
 #     custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501
-
+#
 #     # [超时空碎裂]技能攻击力增加率 : {value0}%
 #     data0 = get_data(f'{prefix}/{uuid}', 0)
 
@@ -2133,7 +2135,7 @@ class Skill55(DarkKnightSkill):
     position = 4
     rangeLv = 5
     cube = 15
-    cd = 290
+    cd = 270
     mp = [4027, 8055]
     uuid = '9ceb0c55f40f1fc0fe0fcc65c8fee3a0'
     hasVP = False
@@ -2234,11 +2236,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)
+        super().SetSkillCDRecover(min, max, cd, exclude)