dev

backend/core/basic/character.py

@@ -409,6 +409,13 @@ class Character(CharacterProperty):
         """获取技能名字"""
         return [skill.name for skill in self.skills if (type == 'all' or skill.type == type) and (damage == 'all' or skill.damage == damage)]
 
+    def GetWeaponType(self) -> str:
+        """获取武器类型"""
+        weapon = self.charEquipInfo["武器"].equInfo
+        if weapon is None:
+            return None
+        else:
+            return weapon.itemDetailType
     # endregion
 
     # region 计算相关

backend/core/basic/skill.py

@@ -171,6 +171,9 @@ class ActiveSkill(Skill):
             power = getattr(self, f'power{i}', None)
             if power is None:
                 setattr(self, f'power{i}', 1)
+            dataplus = getattr(self, f'dataplus{i}', None)
+            if dataplus is None:
+                setattr(self, f'dataplus{i}', 0)
 
     def skillInfo(self, mode: str | None = None):
         if mode is not None:
@@ -191,12 +194,13 @@ class ActiveSkill(Skill):
         keys = [key.replace("data","") for key in dir(self) if key.startswith('data')]
         for i in keys:
             data = getattr(self, f'data{i}', [])
+            dataplus = getattr(self, f'dataplus{i}', 0)
             if len(data) == 0:
                 break
             if lv < len(data):
                 hit = getattr(self, f'hit{i}', 1)
                 power = getattr(self, f'power{i}', 1)
-                res += hit * power * data[lv]
+                res += hit * power * (data[lv] + dataplus)
         return res
 
     def getWeaponCDRatio(self):

backend/core/character/GF/mage_male/glacial_master.py

@@ -174,7 +174,10 @@ class Skill10(PassiveSkill):
 
     data0 = [0, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120]# noqa: E501
 
-    associate = [{"type":"*skillRation","data":data0,"skills":["冰魄剑"]}]
+    associate = [
+        {"type":"*skillRation","data":data0,"skills":["冰魄剑"]},
+        {"type":"+hit1","data":[0] + [-1]*maxLv,"skills":["冰魄剑"],"ratio":1},
+        ]
 
 
 # 冰魄锤击 아이스 빅 해머

backend/core/character/GF/swordman_male/asura.py

@@ -374,6 +374,8 @@ class Skill17(ActiveSkill):
         elif self.currentMode == "闪枪":
             pre = self.char.GetSkillByName("爆炎 · 波动剑")
             return 4.9 * pre.getSkillCD() / pre.cd
+        elif self.currentMode == "平X":
+            return 1.0
         else:
             return super().getSkillCD()
 # 极冰 · 裂波剑 극파동검 빙인

backend/core/character/adventure.py

@@ -7,7 +7,7 @@ adv = [
         'name': 'swordman_male',
         'title': '鬼剑士(男)',
         'children': [
-            {'id': 0, 'name': 'weapon_master', 'title': '极诣·剑魂', 'open': False},
+            {'id': 0, 'name': 'weapon_master', 'title': '极诣·剑魂', 'open': False, 'class': 'GF.swordman_male.weapon_master'},
             {'id': 1, 'name': 'soul_bender', 'title': '极诣·鬼泣', 'open': True, 'class': 'GF.swordman_male.soul_bender'},
             {'id': 2, 'name': 'berserker', 'title': '极诣·狂战士', 'open': True, 'class': 'GF.swordman_male.berserker'},
             {'id': 3, 'name': 'asura', 'title': '极诣·阿修罗', 'open': True, 'class': 'GF.swordman_male.asura'},