From 26cf92f16ceb0b7257dc7a75ffec5beda306508b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Wed, 22 Oct 2025 13:14:52 +0800 Subject: [PATCH] dev --- backend/core/character/GF/archer/traveler.py | 6 +++++- backend/core/character/GF/fighter_male/nenmaster_male.py | 6 +++--- backend/core/character/GF/gunner_male/ranger_male.py | 8 ++++---- backend/core/character/GF/gunner_male/spitfire_male.py | 8 ++++---- backend/core/character/adventure.py | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/backend/core/character/GF/archer/traveler.py b/backend/core/character/GF/archer/traveler.py index 995f3b68..2cd5168c 100644 --- a/backend/core/character/GF/archer/traveler.py +++ b/backend/core/character/GF/archer/traveler.py @@ -327,7 +327,7 @@ class Skill11(ActiveSkill): maxLv = 11 position = 6 #TODO rangeLv = 3 - cd = [20, 19.5, 19, 18.5, 18, 17.5, 17, 16.5, 16, 15.5, 15] + cds = [0, 20, 19.5, 19, 18.5, 18, 17.5, 17, 16.5, 16, 15.5, 15] mp = [85, 146] uuid = "f2fb27162beb0b87a7cb9af7900e95f2" hasVP = False @@ -356,6 +356,10 @@ class Skill11(ActiveSkill): data8 = get_data(f'{prefix}/{uuid}', 8) # 在最小恢复范围外不会获得恢复。 + def getSkillCD(self, mode=None): + self.cd = self.cds[self.lv] + return super().getSkillCD(mode) + # 强化 - 后跳 # archer/traveler/2b340542e776818b78f3212af184bd6b # b9cb48777665de22c006fabaf9a560b3/2b340542e776818b78f3212af184bd6b diff --git a/backend/core/character/GF/fighter_male/nenmaster_male.py b/backend/core/character/GF/fighter_male/nenmaster_male.py index b7597898..0b2490d2 100644 --- a/backend/core/character/GF/fighter_male/nenmaster_male.py +++ b/backend/core/character/GF/fighter_male/nenmaster_male.py @@ -177,7 +177,7 @@ class Skill23(ActiveSkill): mp = [5, 210] uuid = "0ed3148658fe37b3336ccb718dc0fdb0" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 data0 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45]# noqa: E501 @@ -304,7 +304,7 @@ class Skill32(ActiveSkill): mp = [357, 2911] uuid = "1b1cfab062e0768bcc889e33e1f30dbf" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 # data1~5 一轮平x data1 = [0, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 174]# noqa: E501 @@ -664,7 +664,7 @@ class Skill43(ActiveSkill): uuid = "8d996a242c5c0efd8cfe6cb4bc6defcc" damage = False hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 hasVP = False data0 = [0, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, 99, 101, 103, 105, 107, 109, 111]# noqa: E501 diff --git a/backend/core/character/GF/gunner_male/ranger_male.py b/backend/core/character/GF/gunner_male/ranger_male.py index 74086be2..512d89f0 100644 --- a/backend/core/character/GF/gunner_male/ranger_male.py +++ b/backend/core/character/GF/gunner_male/ranger_male.py @@ -215,7 +215,7 @@ class Skill13(ActiveSkill): mp = [45, 392] uuid = "8f73f243041c2d27739fe7696f02bf9b" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 data2 = [0, 765, 842, 920, 998, 1076, 1154, 1231, 1309, 1389, 1464, 1542, 1620, 1697, 1777, 1853, 1931, 2009, 2084, 2164, 2242, 2317, 2395, 2472, 2552, 2630, 2706, 2785, 2865, 2941, 3019, 3094, 3172, 3252, 3329, 3407, 3485, 3562, 3641, 3720, 3796, 3873, 3951, 4029, 4107, 4182, 4260, 4342, 4417, 4495, 4571, 4648, 4728, 4804, 4882, 4959, 5039, 5117, 5194, 5272, 5350, 5426, 5505, 5581, 5659, 5738, 5816, 5894, 5972, 6049, 6129]# noqa: E501 hit2 = 8 @@ -266,7 +266,7 @@ class Skill16(ActiveSkill): mp = [20, 160] uuid = "de3fea2d65c597f4d55c70a02b97fc79" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 data1 = [0, 1936, 2134, 2329, 2526, 2723, 2921, 3116, 3313, 3511, 3706, 3903, 4099, 4296, 4491, 4689, 4884, 5083, 5280, 5476, 5673, 5868, 6066, 6261, 6458, 6654, 6851, 7047, 7244, 7443, 7638, 7835, 8031, 8228, 8424, 8621, 8816, 9013, 9211, 9406, 9603, 9801, 9998, 10193, 10390, 10588, 10783, 10980, 11176, 11373, 11569, 11766, 11965, 12160, 12357, 12553, 12750, 12946, 13143, 13338, 13535, 13731, 13928, 14124, 14323, 14520, 14715, 14912, 15108, 15305, 15501]# noqa: E501 hit1 = 1 @@ -333,7 +333,7 @@ class Skill21(ActiveSkill): mp = [252, 252] uuid = "5dc7008b12a459325b548b0715c6b73c" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 def skillInfo(self, mode = None): pre = self.char.GetSkillByName("溃灭射击").skillInfo() @@ -369,7 +369,7 @@ class Skill23(ActiveSkill): cd = 13.9 uuid = "3d8f3d438405d79f8d3ed68072674d1e" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 def skillInfo(self, mode = None): pre = self.char.GetSkillByName("溃灭射击").skillInfo() diff --git a/backend/core/character/GF/gunner_male/spitfire_male.py b/backend/core/character/GF/gunner_male/spitfire_male.py index e28a7de1..95e0526d 100644 --- a/backend/core/character/GF/gunner_male/spitfire_male.py +++ b/backend/core/character/GF/gunner_male/spitfire_male.py @@ -19,7 +19,7 @@ class Skill1(ActiveSkill): mp = [126, 975] uuid = "9dda3f4a849dba1a288dd65e116860f2" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 damage = False @@ -38,7 +38,7 @@ class Skill2(ActiveSkill): mp = [22, 119] uuid = "bb34e8854a93fd250347a1c64119f7ab" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 damage = False @@ -231,7 +231,7 @@ class Skill13(ActiveSkill): mp = [357, 2765] uuid = "3c5604bdbb0240b8f130f59ab40509c3" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 data0 = [0, 960, 1114, 1266, 1418, 1572, 1724, 1876, 2030, 2184, 2336, 2490, 2642, 2794, 2948, 3100, 3254, 3407, 3560, 3713, 3866]# noqa: E501 hit0 = 1 #TODO @@ -251,7 +251,7 @@ class Skill14(ActiveSkill): mp = [357, 2765] uuid = "d0cdaca82892e54097f22a1f60817048" hasUP = False - custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 + # custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501 data0 = [0, 960, 1114, 1266, 1418, 1572, 1724, 1876, 2030, 2184, 2336, 2490, 2642, 2794, 2948, 3100, 3254, 3407, 3560, 3713, 3866]# noqa: E501 hit0 = 1 #TODO diff --git a/backend/core/character/adventure.py b/backend/core/character/adventure.py index 922dbd9d..9ce50e62 100644 --- a/backend/core/character/adventure.py +++ b/backend/core/character/adventure.py @@ -195,7 +195,7 @@ adv = [ 'title': '弓箭手', 'children': [ {'id': 0, 'name': 'muse', 'title': '聆风·缪斯', 'open': False}, - {'id': 1, 'name': 'traveler', 'title': '聆风·旅人', 'open': False}, + {'id': 1, 'name': 'traveler', 'title': '聆风·旅人', 'open': True, 'class': 'GF.archer.traveler'}, {'id': 2, 'name': 'hunter', 'title': '聆风·猎人', 'open': True, 'class': 'GF.archer.hunter'}, {'id': 3, 'name': 'vigilante', 'title': '聆风·妖护使', 'open': False}, {'id': 4, 'name': 'chimera', 'title': '聆风·奇美拉', 'open': True, 'class': 'GF.archer.chimera'},