From 4ac69a0815c9734cb478bb60af8ced357287b303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Thu, 22 May 2025 10:41:28 +0800 Subject: [PATCH] dev --- backend/core/basic/character.py | 12 ++++++++---- .../core/character/GF/swordman_male/ghostblade.py | 9 ++------- backend/core/character/GF/thief/rogue.py | 3 +++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py index 04187e00..fddeac82 100644 --- a/backend/core/basic/character.py +++ b/backend/core/basic/character.py @@ -368,9 +368,10 @@ class Character(CharacterProperty): 增加技能等级 type: -1 全部, 0 被动, 1 主动 """ + skillType = 'all' if type == -1 else ('active' if type == 1 else 'passive') for skill in self.skills: if min <= skill.learnLv <= max: - skillType = 'all' if type == -1 else ('active' if type == 1 else 'passive') + if (skillType == 'all' or skill.type == skillType) and skill.lv > 0 and skill.name not in exceptSkills: skill.lv += lv @@ -388,10 +389,13 @@ class Character(CharacterProperty): if min <= skill.learnLv <= max and (skill.type == 'active' or skill.damage) and skill.learnLv not in exclude: skill.cdRecover += cd - def SetSkillRation(self, min=1, max=100, ratio=0, type=0) -> None: - """设置技能倍率 0 修改技能面板 1 不修改技能面板""" + def SetSkillRation(self, min=1, max=100, ratio=0, type=-1) -> None: + """设置技能倍率 + 0 修改技能面板 1 不修改技能面板 + type: -1 全部, 0 被动, 1 主动 + """ for skill in self.skills: - if min <= skill.learnLv <= max and skill.damage: + if min <= skill.learnLv <= max and skill.damage and skill.type == 'active': if type == 0: skill.skillRation *= 1 + ratio else: diff --git a/backend/core/character/GF/swordman_male/ghostblade.py b/backend/core/character/GF/swordman_male/ghostblade.py index 9d220056..3061a68b 100644 --- a/backend/core/character/GF/swordman_male/ghostblade.py +++ b/backend/core/character/GF/swordman_male/ghostblade.py @@ -202,13 +202,8 @@ class Skill10(ActiveSkill): data0 = [0, 2011, 2217, 2421, 2627, 2829, 3033, 3237, 3441, 3647, 3851, 4056, 4259, 4463, 4667, 4871, 5076, 5280, 5486, 5688, 5892, 6096, 6302, 6506, 6710, 6914, 7118, 7322, 7526, 7732, 7934, 8140, 8344, 8548, 8752, 8956, 9160, 9364, 9569, 9773, 9979, 10181, 10384, 10589, 10793, 10999, 11203, 11409, 11611, 11815, 12019, 12225, 12429, 12633, 12837, 13041, 13245, 13449, 13654, 13858, 14062, 14266, 14470, 14674, 14878, 15084, 15286, 15492, 15696, 15902, 16104]# noqa: E501 hit0 = 3 - def skillInfo(self, mode: str | None = None): - pre = self.char.GetSkillByName("鬼连斩") - self.lv = pre.lv - cd = pre.getSkillCD() - res = super().skillInfo(mode) - return res[0],res[1],cd - + def getSkillCD(self): + return self.char.GetSkillByName("鬼连斩").getSkillCD() # 魂破斩 혼백참 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/87a918bb22cfc959a16e0bf939bb6c24?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 diff --git a/backend/core/character/GF/thief/rogue.py b/backend/core/character/GF/thief/rogue.py index f01b2292..cf2c0ed6 100644 --- a/backend/core/character/GF/thief/rogue.py +++ b/backend/core/character/GF/thief/rogue.py @@ -570,6 +570,9 @@ class Skill38(ActiveSkill): data0 = [0, 686, 795, 904, 1014, 1123, 1232, 1342, 1451, 1560, 1670, 1779, 1888, 1998, 2107, 2216, 2326, 2435, 2544, 2654, 2763, 2872, 2982, 3091, 3200, 3310, 3419, 3528, 3638, 3747, 3856, 3966, 4075, 4184, 4294, 4403, 4512, 4622, 4731, 4840, 4950, 5059, 5168, 5278, 5387, 5496, 5606, 5715, 5824, 5934, 6043, 6152, 6262, 6371, 6480, 6590, 6699, 6808, 6918, 7027, 7136, 7245, 7355, 7464, 7573, 7683, 7792, 7901, 8011, 8120, 8229]# noqa: E501 hit0 = 30 + def getSkillCD(self) -> float: + return self.char.GetSkillByName("剑刃风暴").getSkillCD() + # 绝境瞬狱袭 엑셀 스트라이크 # https://api.neople.co.kr/df/skills/ddc49e9ad1ff72a00b53c6cff5b1e920/128b9ddef2262f40723deae4407bdb42?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0