diff --git a/backend/core/character/GF/mage_female/witch.py b/backend/core/character/GF/mage_female/witch.py index 249043bd..e1208935 100644 --- a/backend/core/character/GF/mage_female/witch.py +++ b/backend/core/character/GF/mage_female/witch.py @@ -2419,7 +2419,7 @@ class Skill47(ActiveSkill): # 魔道学助手 # mage_female/witch/bda6ddc3adc54328a759a6203b68eeea # 3909d0b188e9c95311399f776e331da5/bda6ddc3adc54328a759a6203b68eeea -class Skill49(PassiveSkill): +class Skill49(ActiveSkill): """ 魔道学者经过长时间的研究,结合魔道学和法米利尔的能量制作了人造生命体——何蒙库鲁兹并将其当做自己的助手,大大增强特定技能的效果。\n 何蒙库鲁兹的技能等级随[贤者之石]技能等级增加而增加。\n @@ -2447,6 +2447,7 @@ class Skill49(PassiveSkill): maxLv = 1 position = 0 rangeLv = 3 + type = 'passive' uuid = 'bda6ddc3adc54328a759a6203b68eeea' hasVP = False hasUP = False @@ -2525,10 +2526,33 @@ class Skill49(PassiveSkill): @lv.setter def lv(self, value): ... + def getSkillData(self, lv = 0): + pre = self.char.GetSkillByName('超级苍蝇拍') + if pre and pre.vp == 2: + # 杰克爆弹 + self.hit7 = 1 * 13 / 20 + # 冰霜雪人 + self.hit10 = 10 * 3 / 20 + self.hit12 = 8 * 5 / 20 + # 光电鳗 + self.hit16 = 4 * 4 / 20 + self.hit18 = 6 * 2 / 20 + # 暗影夜猫 + self.hit23 = 1* 6 / 20 + self.hit24 = 1* 6 / 20 + self.hit25 = 1* 6 / 20 + self.hit26 = 1* 2 / 20 + return super().getSkillData(lv) + + def getSkillCD(self, mode=None): + return 1.0 + + # 贤者之石 # mage_female/witch/8e358ecf99ac9df31a6132aeafe378a9 # 3909d0b188e9c95311399f776e331da5/8e358ecf99ac9df31a6132aeafe378a9 class Skill48(PassiveSkill): + """ 运用魔道学中的圣器——贤者之石作为媒介,获得比以往更高境界的成果。\n 使用[引爆试验]时,自身不会摔倒; 使用[旋转扫把]时,不会进入混乱状态。\n diff --git a/backend/openapi b/backend/openapi index 7a7e85fb..a4221a4c 160000 --- a/backend/openapi +++ b/backend/openapi @@ -1 +1 @@ -Subproject commit 7a7e85fb198fa4c7da2fb0d433105feb1c12825a +Subproject commit a4221a4c9f03469568615795344813804af9adc7 diff --git a/images b/images index f4ee0c50..77a175e6 160000 --- a/images +++ b/images @@ -1 +1 @@ -Subproject commit f4ee0c5029feb3f303317c0a9b3056db712b72e2 +Subproject commit 77a175e687ed49034fb7ee8b4cc4beecf2b8dba7