dev

backend/core/basic/character.py

@@ -491,6 +491,7 @@ class Character(CharacterProperty):
         info['emblems'] = [i for i in equInfos.emblems]
         info['avatar'] = equInfos.funs.get_dress_list(skill_clothes)
         info['jades'] = equInfos.jades
+        info['options'] = equInfos.funs.options
         info['sundry'] = equInfos.funs.sundryList
         for skill in platinum:
             info['emblems'].append(
@@ -686,6 +687,19 @@ class Character(CharacterProperty):
             # 获取装备额外属性
             if fun is not None:
                 fun(self)
+        # 武器贴膜处理
+        weapon = self.charEquipInfo['武器']
+        if weapon.equInfo is None or weapon.weaponFusion is None or weapon.weaponFusion == 0:
+            return
+        adaptation = min(weapon.adaptation,weapon.equInfo.max_adaptation)
+        if weapon.weaponFusion == 1:
+            self.SetStatus(SkillAttack = 0.07 + adaptation * 0.01)
+        if weapon.weaponFusion == 2:
+            self.SetStatus(SkillAttack = 0.01 + adaptation * 0.01)
+            self.SetSkillCD(1, 100, 0.1)
+        if weapon.weaponFusion == 3:
+            self.SetStatus(SkillAttack = 0.055 + adaptation * 0.01)
+            self.SetStatus(SpeedA = 0.2,SpeedM = 0.2,SpeedR = 0.2)
 
     def calc_avatar(self, avatar: dict):
         """计算时装效果"""

backend/core/basic/roleinfo.py

@@ -21,8 +21,8 @@ class CharacterEquipInfo:
     """贴膜ID"""
     refine: int | None
     """锻造等级"""
-    fusionDetail: dict | None
-    """贴膜详情"""
+    weaponFusion: int | None
+    """武器融合详情"""
     adaptation: int
     """调适等级"""
     equInfo: Union['Equ', None]
@@ -35,6 +35,7 @@ class CharacterEquipInfo:
     def __init__(self, info={}, equVerison=0, part='') -> None:
         info["fusion"] = info.get("fusion", None)
         info["precision"] = info.get("precision", 0)
+        info["weaponFusion"] = info.get("weaponFusion", None)
         self.__dict__.update(info)
         equ = get_equipment(equVerison).equ_dict.get(self.id, None)
         fusion = get_equipment(equVerison).stone_dict.get(self.fusion, None)

backend/core/basic/skill.py

@@ -216,7 +216,7 @@ class ActiveSkill(Skill):
             self.vp_2()
 
     def setReinforce(self):
-        if self.learnLv in [50, 85, 100] and not self.damage:
+        if self.learnLv in [50, 85, 100] or not self.damage:
             return
         if self.reinforce == 1:
             if self.learnLv < 35:

backend/core/equipment/version_0/stone.py

@@ -3488,7 +3488,7 @@ def stone_298(char: CharacterProperty):
     技能伤害+17%
     所有速度+25%
     """
-    char.SetStatus(SkillAttack=0.17,SpeedA=0.25,SpeedM=0.25,SpeedR=0.25)
+    char.SetStatus(SkillAttack=0.185,SpeedA=0.25,SpeedM=0.25,SpeedR=0.25)
     pass
 
 
@@ -3512,7 +3512,7 @@ def stone_300(char: CharacterProperty):
     技能伤害+17%
     800px范围内的队员所受物理/魔法伤害-15%
     """
-    char.SetStatus(SkillAttack=0.17)
+    char.SetStatus(SkillAttack=0.185)
     pass