dev

backend/core/abstract/character.py

@@ -100,6 +100,7 @@ class CharacterProperty(ABC):
     角色类型: str
     职业: str
     武器选项: list[str]
+    副武器选项: list[str]
     输出类型选项: list[str]
     防具精通属性: list[str]
     输出类型: str

backend/core/basic/character.py

@@ -142,6 +142,7 @@ class Character(CharacterProperty):
     角色类型: str = ''
     职业: str = ''
     武器选项: list[str] = []
+    副武器选项: list[str] = []
     输出类型选项: list[str] = []
     防具精通属性: list[str] = []
 
@@ -417,6 +418,7 @@ class Character(CharacterProperty):
         info['equVersion'] = self.equVersion
         info['name'] = self.nameCN
         info['weapons'] = self.武器选项
+        info['subweapons'] = self.副武器选项
         skillInfo = []
         skill_clothes = []
         platinum = []
@@ -462,7 +464,7 @@ class Character(CharacterProperty):
         info['stones'] = stones
         key = '辅助' if self.buffer else '输出'
         info['enchants'] = list(filter(lambda x: key in x["categorize"], equInfos.enchants))
-        info['emblems'] = list(filter(lambda x: key in x["categorize"], equInfos.emblems))
+        info['emblems'] = equInfos.emblems
         info['avatar'] = equInfos.funs.get_dress_list(skill_clothes)
         info['jades'] = equInfos.jades
         info['sundry'] = equInfos.funs.sundryList

backend/core/character/GF/swordman_female/vegabond.py

@@ -449,6 +449,7 @@ class classChange(Character):
         # 用来筛CP武器的
         # self.转职 = '弹药专家(女)'
         self.武器选项 = ['光剑', '巨剑', '钝器', '太刀', '短剑']
+        self.副武器选项 = ['光剑']
         self.输出类型选项 = ['物理百分比']
         self.输出类型 = '物理百分比'
         self.防具精通属性 = ['力量']

backend/core/equipment/version_0/equ.py

@@ -2888,6 +2888,8 @@ def equ_182(char: CharacterProperty):
 
     所有速度+15%
     """
+    char.equ_effect.append(EquEffect(name='流星念珠', icon='/equipment/icon/weapon/priest/rosary/00196.png', cd=10,data=15000))
+    char.SetStatus(SpeedM=0.15,SpeedA=0.15,SpeedR=0.15)
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -2907,6 +2909,8 @@ def equ_183(char: CharacterProperty):
 
     所有速度+20%
     """
+    char.equ_effect.append(EquEffect(name='流星念珠', icon='/equipment/icon/weapon/priest/rosary/00197.png', cd=5,data=15000))
+    char.SetStatus(SpeedM=0.15,SpeedA=0.15,SpeedR=0.15)
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -2926,6 +2930,7 @@ def equ_184(char: CharacterProperty):
 
     所有速度+30%
     """
+    char.equ_effect.append(EquEffect(name='流星念珠', icon='/equipment/icon/weapon/priest/rosary/00198.png', cd=20,data=340200))
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -3021,6 +3026,7 @@ def equ_190(char: CharacterProperty):
     -行星破坏伤害量：113400%
     -冷却时间：40秒
     """
+    char.equ_effect.append(EquEffect(name='行星破坏', icon='/equipment/skill/40.png', cd=40,data=340200))
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -3041,6 +3047,7 @@ def equ_191(char: CharacterProperty):
     -行星破坏伤害量：226800%
     -冷却时间：40秒
     """
+    char.equ_effect.append(EquEffect(name='行星破坏', icon='/equipment/skill/40.png', cd=40,data=340200))
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -3061,6 +3068,7 @@ def equ_192(char: CharacterProperty):
     -行星破坏伤害量：340200%
     -冷却时间：40秒
     """
+    char.equ_effect.append(EquEffect(name='行星破坏', icon='/equipment/skill/40.png', cd=40,data=340200))
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -3149,6 +3157,8 @@ def equ_198(char: CharacterProperty):
     攻击时，向前方施放怒击。（冷却时间1秒）
     -怒击伤害量：6000%
     """
+    char.SetSkillCD(1,100,0.2)
+    char.equ_effect.append(EquEffect(name='威严怒击', icon='/equipment/icon/weapon/priest/totem/00280.png', cd=1,data=6000))
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -3171,6 +3181,9 @@ def equ_199(char: CharacterProperty):
     施放技能时，向前方施放猛烈的连击。（冷却时间5秒）
     -猛烈连击伤害量：32400%
     """
+    char.equ_effect.append(EquEffect(name='威严怒击', icon='/equipment/icon/weapon/priest/totem/00281.png', cd=1,data=6000))
+    char.equ_effect.append(EquEffect(name='威严猛击', icon='/equipment/icon/weapon/priest/totem/00281.png', cd=5,data=32400))
+    char.SetSkillCD(1,100,0.2)
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3
@@ -3197,6 +3210,10 @@ def equ_200(char: CharacterProperty):
     施放无色小晶块技能时，发动威严痛击。（冷却时间10秒）
     -威严痛击伤害量：90000%
     """
+    char.equ_effect.append(EquEffect(name='威严怒击', icon='/equipment/icon/weapon/priest/totem/00282.png', cd=1,data=6000))
+    char.equ_effect.append(EquEffect(name='威严猛击', icon='/equipment/icon/weapon/priest/totem/00282.png', cd=5,data=32400))
+    char.equ_effect.append(EquEffect(name='威严痛击', icon='/equipment/icon/weapon/priest/totem/00282.png', cd=5,data=90000))
+    char.SetSkillCD(1,100,0.2)
     if char.buffer:
         char.AddSkillLv(1,100,2)
         char.BuffSkill.lv += 3

backend/core/equipment/version_0/jade.py

@@ -74,7 +74,7 @@ def jade_14(char: CharacterProperty = {}, value=0):
 
 def jade_15(char: CharacterProperty = {}, value=0):
     char.BuffSkill.ATKPLUS += value
-    char.SetStatus(Buffer=value/1000)
+    char.SetStatus(BufferP=value/200)
 
 def jade_16(char: CharacterProperty = {}, value=0):
     char.BuffSkill.ATKRatio *= 1 + value/100