diff --git a/backend/core/character/GF/archer/chimera.py b/backend/core/character/GF/archer/chimera.py index 3ff7287f..bd4cf39a 100644 --- a/backend/core/character/GF/archer/chimera.py +++ b/backend/core/character/GF/archer/chimera.py @@ -854,7 +854,7 @@ class Skill26(ActiveSkill): position = 2 rangeLv = 2 cube = 1 - cd = 30 #15 + cd = 15 mp = [121, 286] uuid = "854997c3bdfc3a2b498b4c4001f69e06" hasVP = True @@ -1055,7 +1055,7 @@ class Skill30(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1423, 6389] uuid = "94c450d6214cafdc673f763badceeaf1" hasVP = False @@ -1390,7 +1390,7 @@ class Skill36(ActiveSkill): position = 2 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2400, 10777] uuid = "6166762c62f234c5f50c2d2ebc5e48d0" hasVP = False @@ -1478,7 +1478,7 @@ class Skill39(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [3944, 17712] uuid = "de20372767d014d62dc7361ac686834e" hasVP = False diff --git a/backend/core/character/GF/archer/hunter.py b/backend/core/character/GF/archer/hunter.py index 553bd392..22005b2d 100644 --- a/backend/core/character/GF/archer/hunter.py +++ b/backend/core/character/GF/archer/hunter.py @@ -1247,7 +1247,7 @@ class Skill33(HunterActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1670, 7095] uuid = '1812a1ece67bb37b6b44b54766450064' hasVP = False @@ -1593,7 +1593,7 @@ class Skill39(HunterActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2780, 11814] uuid = '7f80b887a09e88e2c4728c898bd73654' hasVP = False @@ -1693,7 +1693,7 @@ class Skill42(HunterActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4538, 19283] uuid = '0fbb8de70002ad34f046c94c2cb3e863' hasVP = False diff --git a/backend/core/character/GF/archer/traveler.py b/backend/core/character/GF/archer/traveler.py index 762a2099..3df4a0fb 100644 --- a/backend/core/character/GF/archer/traveler.py +++ b/backend/core/character/GF/archer/traveler.py @@ -1124,7 +1124,7 @@ class Skill30(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1420, 6378] uuid = '506e7ed77d517419a6e1c437a2cedb17' hasVP = False @@ -1508,7 +1508,7 @@ class Skill38(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2396, 10757] uuid = 'a6c8f69107f8c4f5d1a0c7a57d000290' hasVP = False @@ -1625,7 +1625,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [3944, 17712] uuid = 'bb34e8854a93fd250347a1c64119f7ab' hasVP = False diff --git a/backend/core/character/GF/archer/vigilante.py b/backend/core/character/GF/archer/vigilante.py index 2bf28cc7..ec4974de 100644 --- a/backend/core/character/GF/archer/vigilante.py +++ b/backend/core/character/GF/archer/vigilante.py @@ -1209,7 +1209,7 @@ class Skill32(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1406, 7707] uuid = '0e409ac3e1c1f3976b3ef2bfe4c13069' hasVP = False @@ -1527,7 +1527,7 @@ class Skill38(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2484, 13617] uuid = '902a016f6978f13740f237e4740a5646' hasVP = False @@ -1677,7 +1677,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [3904, 17834] uuid = 'fa3ee243b36699e9d3fc34328adf6417' hasVP = False diff --git a/backend/core/character/GF/demonic_lancer/dragoon.py b/backend/core/character/GF/demonic_lancer/dragoon.py index 0604014b..cedae731 100644 --- a/backend/core/character/GF/demonic_lancer/dragoon.py +++ b/backend/core/character/GF/demonic_lancer/dragoon.py @@ -1179,7 +1179,7 @@ class Skill33(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [980, 8232] uuid = '4f2e001e9a19eb7bae50ad1840dfb329' hasVP = False @@ -1488,7 +1488,7 @@ class Skill39(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '5806440d21e7546d50007a5ba11f8024' hasVP = False @@ -1590,7 +1590,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8055] uuid = 'dac8d8207618150c162e4c6f9e168527' hasVP = False diff --git a/backend/core/character/GF/demonic_lancer/impaler.py b/backend/core/character/GF/demonic_lancer/impaler.py index 28ba2e77..75ad7dde 100644 --- a/backend/core/character/GF/demonic_lancer/impaler.py +++ b/backend/core/character/GF/demonic_lancer/impaler.py @@ -1239,7 +1239,7 @@ class Skill34(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1200, 10080] uuid = 'e0daa922b19cdc35de879e938361464e' hasVP = False @@ -1593,7 +1593,7 @@ class Skill40(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '8b08f9504167a9c0f3a1d29d71b7943e' hasVP = False @@ -1715,7 +1715,7 @@ class Skill43(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = 'e788de1a4498c99fcc790302c4d41fed' hasVP = False diff --git a/backend/core/character/GF/demonic_lancer/skirmisher.py b/backend/core/character/GF/demonic_lancer/skirmisher.py index 100cf9c6..9004a24d 100644 --- a/backend/core/character/GF/demonic_lancer/skirmisher.py +++ b/backend/core/character/GF/demonic_lancer/skirmisher.py @@ -1191,7 +1191,7 @@ class Skill32(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1000, 8400] uuid = '506e7ed77d517419a6e1c437a2cedb17' hasVP = False @@ -1553,7 +1553,7 @@ class Skill38(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2600, 5300] uuid = '1721e94897e9961d5c98130a13392f17' hasVP = False @@ -1666,7 +1666,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '2e2b7efe778656690f9c8cb6e47c3932' hasVP = False diff --git a/backend/core/character/GF/demonic_lancer/vanguard.py b/backend/core/character/GF/demonic_lancer/vanguard.py index 25b0907d..9907cea0 100644 --- a/backend/core/character/GF/demonic_lancer/vanguard.py +++ b/backend/core/character/GF/demonic_lancer/vanguard.py @@ -1075,7 +1075,7 @@ class Skill30(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [980, 8232] uuid = 'd0cdaca82892e54097f22a1f60817048' hasVP = False @@ -1373,7 +1373,7 @@ class Skill36(ActiveSkill): position = 7 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = 'b163d099c8cc27fdb6fd3639c2ee6df9' hasVP = False @@ -1472,7 +1472,7 @@ class Skill39(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8055] uuid = 'f4a561e272cc434a4905b3aa0c0de090' hasVP = False diff --git a/backend/core/character/GF/extra/creator.py b/backend/core/character/GF/extra/creator.py index 2b7d5281..486abab7 100644 --- a/backend/core/character/GF/extra/creator.py +++ b/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) \ No newline at end of file + super().SetSkillCDRecover(min, max, cd, exclude) diff --git a/backend/core/character/GF/extra/dark_knight.py b/backend/core/character/GF/extra/dark_knight.py index b449d11d..d8ed3105 100644 --- a/backend/core/character/GF/extra/dark_knight.py +++ b/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) \ No newline at end of file + super().SetSkillCDRecover(min, max, cd, exclude) diff --git a/backend/core/character/GF/fighter_female/grappler_female.py b/backend/core/character/GF/fighter_female/grappler_female.py index eddee0b0..0ab8d9d6 100644 --- a/backend/core/character/GF/fighter_female/grappler_female.py +++ b/backend/core/character/GF/fighter_female/grappler_female.py @@ -1343,7 +1343,7 @@ class Skill39(ActiveSkill): position = 7 rangeLv = 5 cube = 5 - cd = 140 + cd = 130 mp = [900, 7559] uuid = "d296043df164385a14cb973c8c7c4d07" hasVP = False @@ -1731,7 +1731,7 @@ class Skill46(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "d89f26862e348a801b30bb9fd7125db5" hasVP = False @@ -1866,7 +1866,7 @@ class Skill49(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = "c91a62dc0a18360acf5031ac0ebf09f5" hasVP = False diff --git a/backend/core/character/GF/fighter_female/nenmaster_female.py b/backend/core/character/GF/fighter_female/nenmaster_female.py index e65910bf..cd40fc85 100644 --- a/backend/core/character/GF/fighter_female/nenmaster_female.py +++ b/backend/core/character/GF/fighter_female/nenmaster_female.py @@ -1385,7 +1385,7 @@ class Skill39(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = '51a08fd0c90f0a5276cd552047fac93d' hasVP = False @@ -1749,7 +1749,7 @@ class Skill46(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '5dc7008b12a459325b548b0715c6b73c' hasVP = False @@ -1864,7 +1864,7 @@ class Skill49(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 4028] uuid = '002cbdd9bfd0f0b970451ae8d48d029e' hasVP = False diff --git a/backend/core/character/GF/fighter_female/striker_female.py b/backend/core/character/GF/fighter_female/striker_female.py index 15769a69..c735839b 100644 --- a/backend/core/character/GF/fighter_female/striker_female.py +++ b/backend/core/character/GF/fighter_female/striker_female.py @@ -1228,7 +1228,7 @@ class Skill35(ActiveSkill): position = 2 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = "47bd4871f29defc2a0021ee9261d7a5b" hasVP = False @@ -1579,7 +1579,7 @@ class Skill41(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "78be08a3f8c834d3b06fa20c6a08c5a5" hasVP = False @@ -1678,7 +1678,7 @@ class Skill44(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = "8e358ecf99ac9df31a6132aeafe378a9" hasVP = False diff --git a/backend/core/character/GF/fighter_male/brawler_male.py b/backend/core/character/GF/fighter_male/brawler_male.py index 758a179e..d72cc6e5 100644 --- a/backend/core/character/GF/fighter_male/brawler_male.py +++ b/backend/core/character/GF/fighter_male/brawler_male.py @@ -1701,7 +1701,7 @@ class Skill43(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = 'c5a2956d8ed3af1746ed2f76ca971a09' hasVP = False @@ -2077,7 +2077,7 @@ class Skill49(ActiveSkill): position = 8 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '949849d5791944973d60af7e2a7eefb0' hasVP = False @@ -2224,7 +2224,7 @@ class Skill52(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = 'f1fdc6c2482ecc510a2a9f04201ba125' hasVP = False diff --git a/backend/core/character/GF/fighter_male/grappler_male.py b/backend/core/character/GF/fighter_male/grappler_male.py index d6f19fcb..2ee1f7df 100644 --- a/backend/core/character/GF/fighter_male/grappler_male.py +++ b/backend/core/character/GF/fighter_male/grappler_male.py @@ -1333,7 +1333,7 @@ class Skill40(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = "d296043df164385a14cb973c8c7c4d07" @@ -1699,7 +1699,7 @@ class Skill46(ActiveSkill): position = 7 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "97ee58d5b8f825c3809e3bb541aaac86" @@ -1800,7 +1800,7 @@ class Skill49(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = "9376d04c476cd41d60ed1974ca69ab95" diff --git a/backend/core/character/GF/fighter_male/nenmaster_male.py b/backend/core/character/GF/fighter_male/nenmaster_male.py index 2af0536d..639a9bfe 100644 --- a/backend/core/character/GF/fighter_male/nenmaster_male.py +++ b/backend/core/character/GF/fighter_male/nenmaster_male.py @@ -1487,7 +1487,7 @@ class Skill40(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = '51a08fd0c90f0a5276cd552047fac93d' hasVP = False @@ -1894,7 +1894,7 @@ class Skill47(ActiveSkill): position = 7 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [500, 4480] uuid = '087d1068ff506d090710566608a17760' hasVP = False @@ -2002,7 +2002,7 @@ class Skill50(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8054] uuid = '9ceb0c55f40f1fc0fe0fcc65c8fee3a0' hasVP = False diff --git a/backend/core/character/GF/fighter_male/striker_male.py b/backend/core/character/GF/fighter_male/striker_male.py index cf1f27b3..40b6b716 100644 --- a/backend/core/character/GF/fighter_male/striker_male.py +++ b/backend/core/character/GF/fighter_male/striker_male.py @@ -1297,7 +1297,7 @@ class Skill39(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [500, 4480] uuid = "01384bbfc346775d1267fa0bc4ca605f" hasVP = False @@ -1348,7 +1348,7 @@ class Skill40(ActiveSkill): maxLv = 50 position = 5 rangeLv = 5 - cd = 145 + cd = 135 mp = [850, 7000] uuid = "c39c703f72d289fcd5a8f182068140d4" hasVP = False @@ -1643,7 +1643,7 @@ class Skill46(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "c524c4f378d1cd0ff99e4580750a4567" hasVP = False @@ -1738,7 +1738,7 @@ class Skill49(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = "e36ae35f8964d92e30e33529a65544d7" hasVP = False diff --git a/backend/core/character/GF/gunblader/agent.py b/backend/core/character/GF/gunblader/agent.py index 54c179ce..50bd98b5 100644 --- a/backend/core/character/GF/gunblader/agent.py +++ b/backend/core/character/GF/gunblader/agent.py @@ -1128,7 +1128,7 @@ class Skill32(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [881, 7403] uuid = '01c3a2fb793d293a25ed8dc7a0d70c1a' hasVP = False @@ -1434,7 +1434,7 @@ class Skill38(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '78bd107acd474518b606be1e4fd38239' hasVP = False @@ -1537,7 +1537,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = 'e0a072e8cef2d77893aad5f68aeed56a' hasVP = False diff --git a/backend/core/character/GF/gunblader/hitman.py b/backend/core/character/GF/gunblader/hitman.py index 26b58dda..99c7a485 100644 --- a/backend/core/character/GF/gunblader/hitman.py +++ b/backend/core/character/GF/gunblader/hitman.py @@ -1177,7 +1177,7 @@ class Skill32(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1018, 8551] uuid = '669f1428193f61f9d92c743b72438c4d' hasVP = False @@ -1533,7 +1533,7 @@ class Skill38(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = 'c7bf7ccab413009640e65ca6f2f0263a' hasVP = False @@ -1680,7 +1680,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = 'e0daa922b19cdc35de879e938361464e' hasVP = False diff --git a/backend/core/character/GF/gunblader/specialist.py b/backend/core/character/GF/gunblader/specialist.py index 964b6dd6..7db1d59f 100644 --- a/backend/core/character/GF/gunblader/specialist.py +++ b/backend/core/character/GF/gunblader/specialist.py @@ -1212,7 +1212,7 @@ class Skill32(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1129, 9483] uuid = 'fc458e449ee00b01dbf88d09aae65462' hasVP = False @@ -1554,7 +1554,7 @@ class Skill38(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2633, 5266] uuid = '7cf17936a039b418660424125dc968d7' hasVP = False @@ -1683,7 +1683,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '7ec521d063d2190e1fcc5bd229af9bcf' hasVP = False diff --git a/backend/core/character/GF/gunblader/trouble_shooter.py b/backend/core/character/GF/gunblader/trouble_shooter.py index e6795889..8e1dc786 100644 --- a/backend/core/character/GF/gunblader/trouble_shooter.py +++ b/backend/core/character/GF/gunblader/trouble_shooter.py @@ -1129,7 +1129,7 @@ class Skill31(ActiveSkill): position = 8 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [980, 8232] uuid = '1dad88963abdc96b091fcab185a8820d' hasVP = False @@ -1459,7 +1459,7 @@ class Skill37(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '0ed3148658fe37b3336ccb718dc0fdb0' hasVP = False @@ -1567,7 +1567,7 @@ class Skill40(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = '3fb8395ae3b81bd608e0c4223a8eb534' hasVP = False diff --git a/backend/core/character/GF/gunner_female/launcher_female.py b/backend/core/character/GF/gunner_female/launcher_female.py old mode 100755 new mode 100644 index 64c4cb60..fff7c694 --- a/backend/core/character/GF/gunner_female/launcher_female.py +++ b/backend/core/character/GF/gunner_female/launcher_female.py @@ -1335,7 +1335,7 @@ class Skill39(ActiveSkill): position = 8 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1000, 8400] uuid = "2ba299855fc22192cba4f73db75e9d0e" hasVP = False @@ -1661,7 +1661,7 @@ class Skill45(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = "0f638da961acf7958ac6070b7aaed013" hasVP = False @@ -1766,7 +1766,7 @@ class Skill48(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 12889] uuid = "25c0018b82c644f6e20d728f1478e671" hasVP = False diff --git a/backend/core/character/GF/gunner_female/mechanic_female.py b/backend/core/character/GF/gunner_female/mechanic_female.py old mode 100755 new mode 100644 index b003cf64..b4b41ee0 --- a/backend/core/character/GF/gunner_female/mechanic_female.py +++ b/backend/core/character/GF/gunner_female/mechanic_female.py @@ -1549,7 +1549,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1000, 8400] uuid = 'd89f26862e348a801b30bb9fd7125db5' hasVP = False @@ -1914,7 +1914,7 @@ class Skill48(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = 'ce7cd04a44e32212e80f120f4421996e' hasVP = False @@ -2035,7 +2035,7 @@ class Skill51(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 12889] uuid = '4e62e33aa37394ec4207a72af2968abf' hasVP = False diff --git a/backend/core/character/GF/gunner_female/paramedic.py b/backend/core/character/GF/gunner_female/paramedic.py index 435dbbef..28b8b0a1 100644 --- a/backend/core/character/GF/gunner_female/paramedic.py +++ b/backend/core/character/GF/gunner_female/paramedic.py @@ -163,7 +163,6 @@ class Skill5(PassiveSkill): # 防御力增加 : {value0} data0 = get_data(f'{prefix}/{uuid}', 0) - # 技能连招 # gunner_female/paramedic/10b31c7e8cd2d60b9bcf3b1d3ada4b0a # 944b9aab492c15a8474f96947ceeb9e4/10b31c7e8cd2d60b9bcf3b1d3ada4b0a @@ -555,7 +554,7 @@ class Skill17(ActiveBufferSkill): maxLv = 20 position = 1 rangeLv = 3 - cd = 0.1 + cd = 20 mp = [25, 56] uuid = "4e431eaadc1c4563fe33d03c072564f0" hasVP = False @@ -610,7 +609,7 @@ class Skill19(ActiveBufferSkill): maxLv = 11 position = 1 rangeLv = 3 - cd = 0.1 + cd = 15 mp = [17, 27] uuid = "6b557a0a96ccd83b37ddb77c550f6a68" hasVP = False @@ -829,7 +828,7 @@ class Skill25(ActiveBufferSkill): maxLv = 70 position = 1 rangeLv = 3 - cd = 0.1 + cd = 8 mp = [36, 195] uuid = "fc30c667a58e1dd54b5d214e04f4f23c" hasVP = False @@ -926,7 +925,7 @@ class Skill27(ActiveBufferSkill): maxLv = 1 position = 1 rangeLv = 3 - cd = 0.1 + cd = 20 mp = [40, 40] uuid = "1c9cf3b27d9d6ee5e024e2592cad24a5" hasVP = False @@ -1139,7 +1138,7 @@ class Skill31(ActiveBufferSkill): position = 4 rangeLv = 5 cube = 5 - cd = 170 + cd = 160 mp = [1727, 7104] uuid = "ca0cc360e00e5f13e33027bf5fc53d5d" hasVP = False @@ -1478,7 +1477,7 @@ class Skill38(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2327, 9573] uuid = "c6eaf15c287d9154479d1714cad5b4e0" hasVP = False @@ -1611,7 +1610,7 @@ class Skill42(ActiveBufferSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [3258, 13402] uuid = "d40a932ac818bf4fa044dc1e4f8b2708" hasVP = False diff --git a/backend/core/character/GF/gunner_female/ranger_female.py b/backend/core/character/GF/gunner_female/ranger_female.py old mode 100755 new mode 100644 index e0913347..d69deaf8 --- a/backend/core/character/GF/gunner_female/ranger_female.py +++ b/backend/core/character/GF/gunner_female/ranger_female.py @@ -1400,7 +1400,7 @@ class Skill39(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1000, 8400] uuid = "374f53e8989ef04a8506c8ec99d9ecdc" hasVP = False @@ -1714,7 +1714,7 @@ class Skill45(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = "3af805da8505fe6234a95b535610f064" hasVP = False @@ -1841,7 +1841,7 @@ class Skill48(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 9667] uuid = "bbc15561bec24f9c1e79e23d715b1dd2" hasVP = False diff --git a/backend/core/character/GF/gunner_female/spitfire_female.py b/backend/core/character/GF/gunner_female/spitfire_female.py index 272a7885..2b3fbdef 100644 --- a/backend/core/character/GF/gunner_female/spitfire_female.py +++ b/backend/core/character/GF/gunner_female/spitfire_female.py @@ -1498,7 +1498,7 @@ class Skill42(ActiveSkill): position = 7 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [880, 7392] uuid = '2c9d9a36c8401bddff6cdb80fab8dc24' hasVP = False @@ -1803,7 +1803,7 @@ class Skill48(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = '13a759aad5bb7fb7f08fae8f88c1cdbb' hasVP = False @@ -1901,7 +1901,7 @@ class Skill51(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '8ad90fd01b5844edd692fff54d9f74e7' hasVP = False diff --git a/backend/core/character/GF/gunner_male/launcher_male.py b/backend/core/character/GF/gunner_male/launcher_male.py index 3bcb0672..0d93faa3 100644 --- a/backend/core/character/GF/gunner_male/launcher_male.py +++ b/backend/core/character/GF/gunner_male/launcher_male.py @@ -1252,7 +1252,7 @@ class Skill39(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [881, 5288] uuid = "0232c151ef3731c2dede51931a374723" @@ -1564,7 +1564,7 @@ class Skill45(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = "78b86e64fbb74c1db1b71c50a5ac21cd" @@ -1652,7 +1652,7 @@ class Skill48(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8054] uuid = "61c8cb33dd20b4ff335e8deed70d3d9c" diff --git a/backend/core/character/GF/gunner_male/mechanic_male.py b/backend/core/character/GF/gunner_male/mechanic_male.py index 4fd31a9f..b81f7dba 100644 --- a/backend/core/character/GF/gunner_male/mechanic_male.py +++ b/backend/core/character/GF/gunner_male/mechanic_male.py @@ -1475,7 +1475,7 @@ class Skill43(ActiveSkill): position = 7 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [881, 7403] uuid = "51a08fd0c90f0a5276cd552047fac93d" hasVP = False @@ -1808,7 +1808,7 @@ class Skill49(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = "31823197cc0b04d4c5dcf8f928d9220c" hasVP = False @@ -1909,7 +1909,7 @@ class Skill52(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 12889] uuid = "515b442ffbf61a82371abb645c149a31" hasVP = False diff --git a/backend/core/character/GF/gunner_male/ranger_male.py b/backend/core/character/GF/gunner_male/ranger_male.py index 11066a10..2135c007 100644 --- a/backend/core/character/GF/gunner_male/ranger_male.py +++ b/backend/core/character/GF/gunner_male/ranger_male.py @@ -1576,7 +1576,7 @@ class Skill44(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = 'dde3b443bd5e61d90c34e5ee771e2c28' @@ -1661,7 +1661,7 @@ class Skill47(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '94c450d6214cafdc673f763badceeaf1' diff --git a/backend/core/character/GF/gunner_male/spitfire_male.py b/backend/core/character/GF/gunner_male/spitfire_male.py index 7f69f12b..618f8029 100644 --- a/backend/core/character/GF/gunner_male/spitfire_male.py +++ b/backend/core/character/GF/gunner_male/spitfire_male.py @@ -1430,7 +1430,7 @@ class Skill42(ActiveSkill): position = 7 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1000, 8400] uuid = "147d005ac868e0de52b1f255eea35d62" @@ -1719,7 +1719,7 @@ class Skill48(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = "ab6fc3303df03b58911967dfca2b5d07" @@ -1822,7 +1822,7 @@ class Skill51(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = "696721534394b40e78ac96e880f19e5a" diff --git a/backend/core/character/GF/imperialknight/breaker.py b/backend/core/character/GF/imperialknight/breaker.py index b336c55e..219e894a 100644 --- a/backend/core/character/GF/imperialknight/breaker.py +++ b/backend/core/character/GF/imperialknight/breaker.py @@ -756,7 +756,7 @@ class Skill25(ActiveSkill): maxLv = 70 position = 4 rangeLv = 3 - cd = 14 + cd = 18 mp = [122, 516] uuid = "78bd107acd474518b606be1e4fd38239" hasVP = True @@ -787,8 +787,8 @@ class Skill25(ActiveSkill): 基础冷却时间变为9秒\n - 技能攻击力 -11.5%\n """ - self.cd = 8 - self.skillRation *= 1 - 0.117 + self.cd = 9 + self.skillRation *= 1 - 0.115 def vp_2(self): """ @@ -799,8 +799,9 @@ class Skill25(ActiveSkill): 索敌范围 +20%\n 攻击力 -17.6%\n """ - self.cd = 7 - self.skillRation *= 1 - 0.5 + pass + # self.cd = 7 + # self.skillRation *= 1 - 0.5 def effect(self, old, new): if self.vp == 2: diff --git a/backend/core/character/GF/knight/chaos.py b/backend/core/character/GF/knight/chaos.py index 69808737..31341e16 100644 --- a/backend/core/character/GF/knight/chaos.py +++ b/backend/core/character/GF/knight/chaos.py @@ -1909,7 +1909,7 @@ class Skill49(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = '6a1d1f08a6572be420bb3a256c44c015' hasVP = False @@ -2224,7 +2224,7 @@ class Skill55(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = 'c5a2956d8ed3af1746ed2f76ca971a09' hasVP = False @@ -2331,7 +2331,7 @@ class Skill58(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '7f9ffcd296361f1367b8b74e773d5e99' hasVP = False diff --git a/backend/core/character/GF/knight/dragon_knight.py b/backend/core/character/GF/knight/dragon_knight.py index 8caf3dbc..346918cd 100644 --- a/backend/core/character/GF/knight/dragon_knight.py +++ b/backend/core/character/GF/knight/dragon_knight.py @@ -1316,7 +1316,7 @@ class Skill36(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = 'c9a29f5c3509b90a96d5ca9b70dc9c85' @@ -1745,7 +1745,7 @@ class Skill42(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = 'e0578e280d5de3aa6d59b9ec7498a19b' @@ -1835,7 +1835,7 @@ class Skill45(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8055] uuid = 'ebff277c02cc8b54c32635cd0d25f6f3' diff --git a/backend/core/character/GF/knight/elven_knight.py b/backend/core/character/GF/knight/elven_knight.py index 5e684547..4e45fea5 100644 --- a/backend/core/character/GF/knight/elven_knight.py +++ b/backend/core/character/GF/knight/elven_knight.py @@ -1735,7 +1735,7 @@ class Skill40(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [400, 8400] uuid = '1fadde0eece18649caddbca7bd58cc2f' hasVP = False @@ -2066,7 +2066,7 @@ class Skill46(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '7f80b887a09e88e2c4728c898bd73654' hasVP = False @@ -2177,7 +2177,7 @@ class Skill49(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '3153ca0e6752a6283412c59c5ec8e002' hasVP = False diff --git a/backend/core/character/GF/knight/paladin.py b/backend/core/character/GF/knight/paladin.py index bf68849d..b2781053 100644 --- a/backend/core/character/GF/knight/paladin.py +++ b/backend/core/character/GF/knight/paladin.py @@ -1186,7 +1186,7 @@ class Skill32(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [300, 3000] uuid = "002cbdd9bfd0f0b970451ae8d48d029e" hasVP = False @@ -1504,7 +1504,7 @@ class Skill39(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2000, 5000] uuid = "6d7c9a15c08cc41d70125083e869e1a1" hasVP = False @@ -1615,7 +1615,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = "5f4c55fe2ebdf0623bd76d4fda872ddc" hasVP = False diff --git a/backend/core/character/GF/mage_female/battle_mage.py b/backend/core/character/GF/mage_female/battle_mage.py index b60617c8..59fa53b1 100644 --- a/backend/core/character/GF/mage_female/battle_mage.py +++ b/backend/core/character/GF/mage_female/battle_mage.py @@ -1223,7 +1223,7 @@ class Skill34(ActiveSkill): position = 4 rangeLv = 5 cube = 7 - cd = 145 + cd = 135 mp = [1500, 3500] bind = True uuid = 'b860cbf5979b4bcc6beea725636b915e' @@ -1602,7 +1602,7 @@ class Skill43(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = '28fc502b0b8b4e57709f34a1e9369692' @@ -1696,7 +1696,7 @@ class Skill46(ActiveSkill): position = 2 rangeLv = 5 cube = 15 - cd = 180 + cd = 170 mp = [1500, 12600] bind = False damage = False @@ -1739,7 +1739,7 @@ class Skill47(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = '1e81fd08f9696b9f0165df569e445d08' diff --git a/backend/core/character/GF/mage_female/enchantress.py b/backend/core/character/GF/mage_female/enchantress.py index 7712870c..635bed4f 100644 --- a/backend/core/character/GF/mage_female/enchantress.py +++ b/backend/core/character/GF/mage_female/enchantress.py @@ -1686,7 +1686,7 @@ class Skill44(ActiveBufferSkill): position = 5 rangeLv = 5 cube = 5 - cd = 170 + cd = 160 mp = [1200, 10080] buffType = 'awake' uuid = "56fca6cff74d828e92301a40cd2148b9" @@ -2108,7 +2108,7 @@ class Skill52(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "48d7d6b7617e6ed24027d1478f460c00" hasVP = False @@ -2229,7 +2229,7 @@ class Skill55(ActiveBufferSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = "caef38e23a8ae551466f8a8eb039df22" hasVP = False diff --git a/backend/core/character/GF/mage_female/summoner.py b/backend/core/character/GF/mage_female/summoner.py index 187e91b1..f604063a 100644 --- a/backend/core/character/GF/mage_female/summoner.py +++ b/backend/core/character/GF/mage_female/summoner.py @@ -2377,7 +2377,7 @@ class Skill51(SummonSkill): position = 6 rangeLv = 5 cube = 7 - cd = 145 + cd = 135 mp = [1200, 10080] uuid = '0b8db1e10b3abbd24d38564e708675d5' hasVP = False @@ -2441,7 +2441,7 @@ class Skill52(ActiveSkill): maxLv = 1 position = 7 rangeLv = 5 - cd = 145 + cd = 135 mp = [600, 600] uuid = '4c3e0c5955661f7bbc1ed6a6d3bb7803' hasVP = False @@ -2800,7 +2800,7 @@ class Skill59(SummonSkill): position = 4 rangeLv = 5 cube = 5 - cd = 180 + cd = 170 mp = [2000, 6400] dule = {'cd': 10, 'mp': [400, 1280]} uuid = 'd89f26862e348a801b30bb9fd7125db5' @@ -2892,7 +2892,7 @@ class Skill60(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 180 + cd = 170 mp = [500, 4200] uuid = '3b712691fcaaaa80438e5e31b6451884' hasVP = False @@ -3026,7 +3026,7 @@ class Skill63(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = 'efdf4a86b626b8887a145dea6f46a4fe' hasVP = False diff --git a/backend/core/character/GF/mage_female/witch.py b/backend/core/character/GF/mage_female/witch.py index 0abdcf72..a5fd470d 100644 --- a/backend/core/character/GF/mage_female/witch.py +++ b/backend/core/character/GF/mage_female/witch.py @@ -2122,7 +2122,7 @@ class Skill45(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1000, 8400] uuid = '3fb8395ae3b81bd608e0c4223a8eb534' hasVP = False @@ -2698,7 +2698,7 @@ class Skill52(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = '0f638da961acf7958ac6070b7aaed013' hasVP = False @@ -2811,7 +2811,7 @@ class Skill55(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '5fe93d62fcf6d0b1bb6b910b2dd24a0b' hasVP = False diff --git a/backend/core/character/GF/mage_male/blood_mage.py b/backend/core/character/GF/mage_male/blood_mage.py index 65a1f69e..f5291707 100644 --- a/backend/core/character/GF/mage_male/blood_mage.py +++ b/backend/core/character/GF/mage_male/blood_mage.py @@ -1147,7 +1147,7 @@ class Skill33(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 uuid = '0e409ac3e1c1f3976b3ef2bfe4c13069' hasVP = False hasUP = False @@ -1451,7 +1451,7 @@ class Skill39(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 uuid = 'fa3ee243b36699e9d3fc34328adf6417' hasVP = False hasUP = False @@ -1557,7 +1557,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 uuid = '1ff42548e611b94781a1ae8f063dd679' hasVP = False hasUP = False diff --git a/backend/core/character/GF/mage_male/dimension_walker.py b/backend/core/character/GF/mage_male/dimension_walker.py index 63ef8e06..26736865 100644 --- a/backend/core/character/GF/mage_male/dimension_walker.py +++ b/backend/core/character/GF/mage_male/dimension_walker.py @@ -1508,7 +1508,7 @@ class Skill39(ActiveSkill): position = 7 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1200, 10080] uuid = '9dc8438e4572d39243c97da31c113acc' hasVP = False @@ -1898,7 +1898,7 @@ class Skill45(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = 'c9a29f5c3509b90a96d5ca9b70dc9c85' hasVP = False @@ -2055,7 +2055,7 @@ class Skill48(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '7a96c262533919beee21b5a666062880' hasVP = False diff --git a/backend/core/character/GF/mage_male/elemental_bomber.py b/backend/core/character/GF/mage_male/elemental_bomber.py index 64964374..2da17352 100644 --- a/backend/core/character/GF/mage_male/elemental_bomber.py +++ b/backend/core/character/GF/mage_male/elemental_bomber.py @@ -320,7 +320,6 @@ class Skill10(ActiveSkill): data0 = get_data(f'{prefix}/{uuid}', 0) # 攻击力增加率 : {value1}% data1 = get_data(f'{prefix}/{uuid}', 1) - data1 = [i + 100 if i > 0 else 0 for i in data1] hit1 = 5 # - [转职为元素爆破师后附加效果] - # 冷却时间减少 : {value2}秒 @@ -1268,7 +1267,7 @@ class Skill36(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [600, 5040] uuid = 'c27418ae613c647527200a7ca17d97fd' hasVP = False @@ -1577,7 +1576,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '147d005ac868e0de52b1f255eea35d62' hasVP = False @@ -1683,7 +1682,7 @@ class Skill45(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = 'd58681f38f393dbfd22ffdb049d97002' hasVP = False diff --git a/backend/core/character/GF/mage_male/glacial_master.py b/backend/core/character/GF/mage_male/glacial_master.py index 7012dc41..f136ce01 100644 --- a/backend/core/character/GF/mage_male/glacial_master.py +++ b/backend/core/character/GF/mage_male/glacial_master.py @@ -1234,7 +1234,7 @@ class Skill34(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1200, 10080] uuid = '78be08a3f8c834d3b06fa20c6a08c5a5' hasVP = False @@ -1554,7 +1554,7 @@ class Skill40(ActiveSkill): position = 8 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = 'c61f5a010370101402b05b21916c2071' hasVP = False @@ -1653,7 +1653,7 @@ class Skill43(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8055] uuid = '0e3da11226dd30c2aaef52e36eff7f3f' hasVP = False diff --git a/backend/core/character/GF/mage_male/swift_master.py b/backend/core/character/GF/mage_male/swift_master.py index 8bbae26c..b7f159ee 100644 --- a/backend/core/character/GF/mage_male/swift_master.py +++ b/backend/core/character/GF/mage_male/swift_master.py @@ -1131,7 +1131,7 @@ class Skill33(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [600, 5040] uuid = '0b8db1e10b3abbd24d38564e708675d5' hasVP = False @@ -1402,7 +1402,7 @@ class Skill39(ActiveSkill): position = 7 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [1500, 5000] uuid = '5ece7efb92358406e59338ef66479010' hasVP = False @@ -1515,7 +1515,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = 'e0578e280d5de3aa6d59b9ec7498a19b' hasVP = False diff --git a/backend/core/character/GF/priest_female/crusader_female.py b/backend/core/character/GF/priest_female/crusader_female.py index c363d481..f63d45b4 100644 --- a/backend/core/character/GF/priest_female/crusader_female.py +++ b/backend/core/character/GF/priest_female/crusader_female.py @@ -1445,7 +1445,7 @@ class Skill39(ActiveBufferSkill): position = 6 rangeLv = 5 cube = 5 - cd = 170 + cd = 160 mp = [1200, 10080] uuid = "bb34e8854a93fd250347a1c64119f7ab" hasVP = False @@ -1835,7 +1835,7 @@ class Skill46(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "5892d1fa4462e561ac8f8d2c74892b0a" hasVP = False @@ -1958,7 +1958,7 @@ class Skill49(ActiveBufferSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = "002cbdd9bfd0f0b970451ae8d48d029e" hasVP = False diff --git a/backend/core/character/GF/priest_female/infighter_female.py b/backend/core/character/GF/priest_female/infighter_female.py index 83d7b953..3956794e 100644 --- a/backend/core/character/GF/priest_female/infighter_female.py +++ b/backend/core/character/GF/priest_female/infighter_female.py @@ -828,7 +828,6 @@ class Skill26(ActiveSkill): # 冲击波范围比率 : {value5}% data5 = get_data(f'{prefix}/{uuid}', 5) - # 旋风冲拳 # priest_female/infighter_female/5f4c55fe2ebdf0623bd76d4fda872ddc # 0c1b401bb09241570d364420b3ba3fd7/5f4c55fe2ebdf0623bd76d4fda872ddc diff --git a/backend/core/character/GF/priest_female/inquistor.py b/backend/core/character/GF/priest_female/inquistor.py index 28ddac14..b3a05bdc 100644 --- a/backend/core/character/GF/priest_female/inquistor.py +++ b/backend/core/character/GF/priest_female/inquistor.py @@ -1265,7 +1265,7 @@ class Skill35(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [881, 7403] uuid = '1fadde0eece18649caddbca7bd58cc2f' hasVP = False @@ -1582,7 +1582,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '2ba299855fc22192cba4f73db75e9d0e' hasVP = False @@ -1707,7 +1707,7 @@ class Skill44(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '0c3a468aee1f7ce06bf91eb3319518c1' hasVP = False diff --git a/backend/core/character/GF/priest_female/mistress.py b/backend/core/character/GF/priest_female/mistress.py index 20f20f92..df975789 100644 --- a/backend/core/character/GF/priest_female/mistress.py +++ b/backend/core/character/GF/priest_female/mistress.py @@ -1202,7 +1202,7 @@ class Skill32(ActiveSkill): position = 4 rangeLv = 5 cube = 7 - cd = 140 + cd = 130 mp = [1500, 12600] uuid = "a2d943797daca862a6f321aca6ac9bfa" hasVP = False @@ -1236,7 +1236,7 @@ class Skill33(ActiveSkill): maxLv = 50 position = 4 rangeLv = 5 - cd = 140 + cd = 130 mp = [1500, 3500] uuid = "9dc8438e4572d39243c97da31c113acc" hasVP = False @@ -1566,7 +1566,7 @@ class Skill39(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [1500, 5000] uuid = "c5a2956d8ed3af1746ed2f76ca971a09" hasVP = False @@ -1669,7 +1669,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = "ac21c02567f04a92b54dd85c091d1e5a" hasVP = False diff --git a/backend/core/character/GF/priest_female/sorceress.py b/backend/core/character/GF/priest_female/sorceress.py index 19067edd..d679deed 100644 --- a/backend/core/character/GF/priest_female/sorceress.py +++ b/backend/core/character/GF/priest_female/sorceress.py @@ -1080,7 +1080,7 @@ class Skill31(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = 'ca75c965f20a150f99f54155a37400df' hasVP = False @@ -1405,7 +1405,7 @@ class Skill37(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '7f80b887a09e88e2c4728c898bd73654' hasVP = False @@ -1506,7 +1506,7 @@ class Skill40(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4000, 8000] uuid = '7ec521d063d2190e1fcc5bd229af9bcf' hasVP = False diff --git a/backend/core/character/GF/priest_male/avenger.py b/backend/core/character/GF/priest_male/avenger.py index 62903a13..d4cc23bb 100644 --- a/backend/core/character/GF/priest_male/avenger.py +++ b/backend/core/character/GF/priest_male/avenger.py @@ -1249,7 +1249,7 @@ class Skill32(ActiveSkill): position = 1 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1500, 12600] uuid = "5cac3411ccef1af333953e0ded5e942d" hasVP = False @@ -1346,7 +1346,7 @@ class Skill33(ActiveSkill): maxLv = 1 position = 2 rangeLv = 1 - cd = 145 + cd = 135 uuid = "85f7c810ad503790e8626439fe936d56" hasVP = False hasUP = False @@ -1770,7 +1770,7 @@ class Skill41(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "4126d0a7ccd5bdf87a0ab698f857dcd1" hasVP = False @@ -1912,7 +1912,7 @@ class Skill44(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = "c1dd8b776fb1dd24c6373c678ef1dd2e" hasVP = False diff --git a/backend/core/character/GF/priest_male/crusader_male.py b/backend/core/character/GF/priest_male/crusader_male.py index 58a078b9..df2c6e2c 100644 --- a/backend/core/character/GF/priest_male/crusader_male.py +++ b/backend/core/character/GF/priest_male/crusader_male.py @@ -1461,7 +1461,7 @@ class Skill39(ActiveBufferSkill): position = 6 rangeLv = 5 cube = 5 - cd = 170 + cd = 160 mp = [1200, 10080] uuid = "dcb31a63ef58954f44ff2070c42a9a98" hasVP = False @@ -1865,7 +1865,7 @@ class Skill46(ActiveBufferSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "c524c4f378d1cd0ff99e4580750a4567" hasVP = False @@ -1912,7 +1912,7 @@ class Skill47(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 2500] uuid = "481348575c1e141925c836b59c5db3ca" hasVP = False @@ -2027,7 +2027,7 @@ class Skill50(ActiveBufferSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = "a81e5b7defa1819263ed8e86f69fd06f" hasVP = False diff --git a/backend/core/character/GF/priest_male/exorcist.py b/backend/core/character/GF/priest_male/exorcist.py index 80c59b0f..35a0a4f2 100644 --- a/backend/core/character/GF/priest_male/exorcist.py +++ b/backend/core/character/GF/priest_male/exorcist.py @@ -1199,7 +1199,7 @@ class Skill34(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = '5892d1fa4462e561ac8f8d2c74892b0a' hasVP = False @@ -1544,7 +1544,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = '75747c67e14eec6088ce67f63ea41628' hasVP = False @@ -1647,7 +1647,7 @@ class Skill44(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 12888] uuid = '02ac8e048f7bbcfa616e74ac68988872' hasVP = False diff --git a/backend/core/character/GF/priest_male/infighter.py b/backend/core/character/GF/priest_male/infighter.py index c84b31ef..caef877f 100644 --- a/backend/core/character/GF/priest_male/infighter.py +++ b/backend/core/character/GF/priest_male/infighter.py @@ -1431,7 +1431,7 @@ class Skill39(ActiveSkill): position = 2 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [800, 6720] uuid = "dbf8b30c7057032af0d68fcfa289fdae" hasVP = False @@ -1738,7 +1738,7 @@ class Skill45(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "0f638da961acf7958ac6070b7aaed013" hasVP = False @@ -1845,7 +1845,7 @@ class Skill48(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8055] uuid = "aa51c4ddf1659092fa9ed612b9837061" hasVP = False diff --git a/backend/core/character/GF/swordman_female/dark_templar.py b/backend/core/character/GF/swordman_female/dark_templar.py index 2f7be37b..e3796434 100644 --- a/backend/core/character/GF/swordman_female/dark_templar.py +++ b/backend/core/character/GF/swordman_female/dark_templar.py @@ -1202,7 +1202,7 @@ class Skill36(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = 'b3659936a9a74c4ed6f7faf07cca1f9e' hasVP = False @@ -1488,7 +1488,7 @@ class Skill42(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '0fbb8de70002ad34f046c94c2cb3e863' hasVP = False diff --git a/backend/core/character/GF/swordman_female/demon_slayer.py b/backend/core/character/GF/swordman_female/demon_slayer.py index 2faeaa5c..8c4987e0 100644 --- a/backend/core/character/GF/swordman_female/demon_slayer.py +++ b/backend/core/character/GF/swordman_female/demon_slayer.py @@ -1139,7 +1139,7 @@ class Skill32(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1500, 12232] uuid = "42c82812f86ff6704ae9952a2e6093a4" hasVP = False @@ -1487,7 +1487,7 @@ class Skill38(ActiveSkill): position = 9 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "9dc8438e4572d39243c97da31c113acc" hasVP = False @@ -1596,7 +1596,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4025, 8055] uuid = "6d7c9a15c08cc41d70125083e869e1a1" hasVP = False diff --git a/backend/core/character/GF/swordman_female/spectre.py b/backend/core/character/GF/swordman_female/spectre.py index f71af0aa..c5fb78e6 100644 --- a/backend/core/character/GF/swordman_female/spectre.py +++ b/backend/core/character/GF/swordman_female/spectre.py @@ -1170,7 +1170,7 @@ class Skill34(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = '515b442ffbf61a82371abb645c149a31' hasVP = False @@ -1497,7 +1497,7 @@ class Skill40(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = 'ca2536eb56df0e812c88c59cabd38be0' hasVP = False @@ -1609,7 +1609,7 @@ class Skill43(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8055] uuid = '481348575c1e141925c836b59c5db3ca' hasVP = False diff --git a/backend/core/character/GF/swordman_female/sword_master.py b/backend/core/character/GF/swordman_female/sword_master.py index d11a59b1..437946e4 100644 --- a/backend/core/character/GF/swordman_female/sword_master.py +++ b/backend/core/character/GF/swordman_female/sword_master.py @@ -1632,7 +1632,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [980, 8232] uuid = '0232c151ef3731c2dede51931a374723' @@ -2012,7 +2012,7 @@ class Skill47(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '7cf17936a039b418660424125dc968d7' hasVP = False @@ -2122,7 +2122,7 @@ class Skill50(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '9f57da5cb3651d81ca7dc9f78be33d01' diff --git a/backend/core/character/GF/swordman_female/vegabond.py b/backend/core/character/GF/swordman_female/vegabond.py index e2380cc1..bca5a50d 100644 --- a/backend/core/character/GF/swordman_female/vegabond.py +++ b/backend/core/character/GF/swordman_female/vegabond.py @@ -1326,7 +1326,7 @@ class Skill38(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [1500, 12232] uuid = "8510294202d0e042dd29a2422fc6770d" hasVP = False @@ -1642,7 +1642,7 @@ class Skill44(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "7ec521d063d2190e1fcc5bd229af9bcf" hasVP = False @@ -1764,7 +1764,7 @@ class Skill47(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = "3cb633d00f8f6ee088682c9171020d26" hasVP = False diff --git a/backend/core/character/GF/swordman_male/asura.py b/backend/core/character/GF/swordman_male/asura.py index 069661b8..40ea81de 100644 --- a/backend/core/character/GF/swordman_male/asura.py +++ b/backend/core/character/GF/swordman_male/asura.py @@ -1661,7 +1661,7 @@ class Skill41(ActiveSkill): position = 6 rangeLv = 5 cube = 7 - cd = 140 + cd = 130 mp = [1500, 12600] uuid = 'd53301bb328baf12a3ae482cc6a565dd' hasVP = False @@ -2153,7 +2153,7 @@ class Skill47(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [1500, 5000] uuid = '087d1068ff506d090710566608a17760' @@ -2259,7 +2259,7 @@ class Skill50(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '94c450d6214cafdc673f763badceeaf1' diff --git a/backend/core/character/GF/swordman_male/berserker.py b/backend/core/character/GF/swordman_male/berserker.py index b9e0bd43..bbab8fb9 100644 --- a/backend/core/character/GF/swordman_male/berserker.py +++ b/backend/core/character/GF/swordman_male/berserker.py @@ -1650,7 +1650,7 @@ class Skill41(ActiveSkill): position = 3 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [900, 7559] uuid = "8572675ec6a1f50b6eff6a867376c2de" hasVP = False @@ -1969,7 +1969,7 @@ class Skill48(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = "c524c4f378d1cd0ff99e4580750a4567" hasVP = False @@ -2065,7 +2065,7 @@ class Skill51(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 8055] uuid = "d59c9840f65381bde8487757f1753c71" hasVP = False diff --git a/backend/core/character/GF/swordman_male/ghostblade.py b/backend/core/character/GF/swordman_male/ghostblade.py index 7f6a82ac..afd204a0 100644 --- a/backend/core/character/GF/swordman_male/ghostblade.py +++ b/backend/core/character/GF/swordman_male/ghostblade.py @@ -1319,7 +1319,7 @@ class Skill37(ActiveSkill): position = 4 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [998, 8383] uuid = "ca2536eb56df0e812c88c59cabd38be0" hasVP = False @@ -1633,7 +1633,7 @@ class Skill43(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2329, 4658] uuid = "573723c8c0614f5b1218ca9ff992115b" hasVP = False @@ -1783,7 +1783,7 @@ class Skill46(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [3752, 7505] uuid = "6166762c62f234c5f50c2d2ebc5e48d0" hasVP = False diff --git a/backend/core/character/GF/swordman_male/soul_bender.py b/backend/core/character/GF/swordman_male/soul_bender.py index 0b57d17f..8c127126 100644 --- a/backend/core/character/GF/swordman_male/soul_bender.py +++ b/backend/core/character/GF/swordman_male/soul_bender.py @@ -1828,7 +1828,7 @@ class Skill44(ActiveSkill): position = 8 rangeLv = 5 cube = 5 - cd = 140 + cd = 130 mp = [600, 5040] uuid = 'b8f4966608e4ebb3cc80ba4eac3649bb' hasVP = False @@ -2169,7 +2169,7 @@ class Skill50(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '9bc30e0f6e22b0333762d04acae7d252' hasVP = False @@ -2293,7 +2293,7 @@ class Skill53(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '56fca6cff74d828e92301a40cd2148b9' hasVP = False diff --git a/backend/core/character/GF/swordman_male/weapon_master.py b/backend/core/character/GF/swordman_male/weapon_master.py index 08816a27..d9fbf2c8 100644 --- a/backend/core/character/GF/swordman_male/weapon_master.py +++ b/backend/core/character/GF/swordman_male/weapon_master.py @@ -2153,7 +2153,7 @@ class Skill47(ActiveSkill): position = 6 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [980, 8232] uuid = '4f2e001e9a19eb7bae50ad1840dfb329' hasVP = False @@ -2667,7 +2667,7 @@ class Skill54(ActiveSkill): position = 4 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '0f638da961acf7958ac6070b7aaed013' hasVP = False @@ -2839,7 +2839,7 @@ class Skill57(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '8b08f9504167a9c0f3a1d29d71b7943e' hasVP = False diff --git a/backend/core/character/GF/thief/kunoichi.py b/backend/core/character/GF/thief/kunoichi.py index f2880900..602d61ac 100644 --- a/backend/core/character/GF/thief/kunoichi.py +++ b/backend/core/character/GF/thief/kunoichi.py @@ -1657,7 +1657,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [881, 7403] uuid = '2ba299855fc22192cba4f73db75e9d0e' hasVP = False @@ -2115,7 +2115,7 @@ class Skill48(ActiveSkill): position = 7 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2800, 5000] uuid = '669f1428193f61f9d92c743b72438c4d' hasVP = False @@ -2269,7 +2269,7 @@ class Skill51(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = '6067de229738524687e5a9ee1c53d583' hasVP = False diff --git a/backend/core/character/GF/thief/necro.py b/backend/core/character/GF/thief/necro.py index 623bbb5c..f8b1d078 100644 --- a/backend/core/character/GF/thief/necro.py +++ b/backend/core/character/GF/thief/necro.py @@ -1661,7 +1661,7 @@ class Skill43(ActiveSkill): position = 5 rangeLv = 5 cube = 5 - cd = 145 + cd = 135 mp = [881, 7403] uuid = "2a3c96b88d02372505692da0a8b54743" hasVP = False @@ -1981,7 +1981,7 @@ class Skill49(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [1500, 5000] uuid = "4c5271b0ecce120d7fc113f377fae76f" hasVP = False @@ -2080,7 +2080,7 @@ class Skill52(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4027, 12888] uuid = "394e2f09c1f37ae61d831d8567707170" hasVP = False diff --git a/backend/core/character/GF/thief/rogue.py b/backend/core/character/GF/thief/rogue.py index bf7ec106..c4fbbd78 100644 --- a/backend/core/character/GF/thief/rogue.py +++ b/backend/core/character/GF/thief/rogue.py @@ -1700,7 +1700,7 @@ class Skill41(ActiveSkill): position = 5 rangeLv = 5 cube = 7 - cd = 145 + cd = 135 mp = [850, 7000] uuid = 'c61f5a010370101402b05b21916c2071' hasVP = False @@ -1738,7 +1738,7 @@ class Skill42(ActiveSkill): maxLv = 50 position = 5 rangeLv = 5 - cd = 145 + cd = 135 mp = [850, 7000] uuid = 'dec8961c485edb02036ba00c789010f0' hasVP = False @@ -2078,7 +2078,7 @@ class Skill48(ActiveSkill): position = 6 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 8000] uuid = '002cbdd9bfd0f0b970451ae8d48d029e' hasVP = False @@ -2188,7 +2188,7 @@ class Skill51(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 9667] uuid = 'ef9d26746effee9199b54541f01b8752' hasVP = False diff --git a/backend/core/character/GF/thief/shadow_dancer.py b/backend/core/character/GF/thief/shadow_dancer.py index 5125bf13..39058288 100644 --- a/backend/core/character/GF/thief/shadow_dancer.py +++ b/backend/core/character/GF/thief/shadow_dancer.py @@ -1340,7 +1340,7 @@ class Skill37(ActiveSkill): position = 7 rangeLv = 5 cube = 7 - cd = 145 + cd = 135 mp = [881, 7403] uuid = '8b08f9504167a9c0f3a1d29d71b7943e' hasVP = False @@ -1650,7 +1650,7 @@ class Skill43(ActiveSkill): position = 5 rangeLv = 5 cube = 10 - cd = 180 + cd = 170 mp = [2500, 5000] uuid = '28b583c75a49103a1d8aabf799c000a4' hasVP = False @@ -1804,7 +1804,7 @@ class Skill46(ActiveSkill): position = 5 rangeLv = 5 cube = 15 - cd = 290 + cd = 270 mp = [4028, 8056] uuid = 'aa6dd52e1c925d87cdc0ca340056c543' hasVP = False diff --git a/backend/openapi b/backend/openapi index aec2ed12..2cd6c4d8 160000 --- a/backend/openapi +++ b/backend/openapi @@ -1 +1 @@ -Subproject commit aec2ed12c560587947852f4ac591be31e0078189 +Subproject commit 2cd6c4d8a05af744ce1fd374fd37204fbc1d89ca