dev

backend/core/basic/character/calc_equip.py

@@ -166,7 +166,8 @@ class CalcEquipMixin(CharacterBase):
         self.oathSkillInfo = []
         # 当套装点数达到太初时，誓约技能生效
         if self.max_point >= 2550:
-            for oathSuit in oathSuitList:
+            oathSuit = next((x for x in oathSuitList if x.suitId == max_point_oath_suit), None)
+            if oathSuit is not None:
                 skills = list(filter(lambda x: x.suitId == oathSuit.suitId, oathSuit.skills))
                 skill = next((x for x in oathSuit.skills if str(x.skillId) == str(self.charOathSkillId)), None)
                 # 誓约套装效果生效
@@ -205,7 +206,7 @@ class CalcEquipMixin(CharacterBase):
         # 誓约积分
         if self.oath_max_point >= 1200:
             self.SetSkillCD(1, 100, 0.185)
-        SkillAttack, Buffer = equs.funs.oathPointEffect(self.oath_max_point)
+        SkillAttack, Buffer = equs.funs.execture('oathPointEffect')(self.oath_max_point)
         self.SetStatus(SkillAttack=SkillAttack, Buffer=Buffer)
         return res
 
@@ -357,6 +358,15 @@ class CalcEquipMixin(CharacterBase):
     def calc_sundry(self, sundry: dict):
         """计算杂项效果"""
         funs = get_equipment(self.equVersion).funs
+        primer = next((x for x in self.charOathInfo if x.id == '2000500'), None)
+        if primer:
+            fog = sundry.get('fog', 0)
+            stats, Point, SkillAttack, Attack, Buffer = funs.execture('fog_oath_info')(fog)
+            primer.oathInfo.STR = primer.oathInfo.INT = primer.oathInfo.Vitality = primer.oathInfo.Spirit = stats
+            primer.oathInfo.Point = Point
+            primer.oathInfo.SkillAttack = SkillAttack
+            primer.oathInfo.Attack = Attack
+            primer.oathInfo.Buffer = Buffer
         # funs.execture('sundry_0')(
         #     self,
         #     sundry.get('medal_rarity', 0),

backend/core/basic/equipment.py

@@ -372,6 +372,7 @@ class Oath:
         return Oath(**temp)
 
 
+
 class OathSuitSkill:
     id: int
     key: str