fix

backend/core/basic/character/calc_equip.py

@@ -282,18 +282,9 @@ class CalcEquipMixin(CharacterBase):
             pass
         pass
 
-    def calc_oaths(self):
+    def calc_oath_upgrade(self):
         """计算装备基础效果"""
-        effects = get_equipment(self.equVersion).funs
         for item in self.charOathInfo:
-            oath = item.oathInfo
-            if oath is None:
-                continue
-            fun = effects.execture(f'oath_{oath.id}')
-            if fun is None:
-                continue
-            apply_uppercase_attrs(self, oath)
-            fun(self)
             # 誓约升级效果
             if item.oathInfo and item.oathInfo.itemDetailType == '誓约':
                 for upgrade in item.upgrade:
@@ -313,6 +304,19 @@ class CalcEquipMixin(CharacterBase):
                     pass
         pass
 
+    def calc_oaths(self):
+        """计算装备基础效果"""
+        effects = get_equipment(self.equVersion).funs
+        for item in self.charOathInfo:
+            oath = item.oathInfo
+            if oath is None:
+                continue
+            fun = effects.execture(f'oath_{oath.id}')
+            if fun is None:
+                continue
+            apply_uppercase_attrs(self, oath)
+            fun(self)
+
     def calc_avatar(self, avatar: dict):
         """计算时装效果"""
         equ = get_equipment(self.equVersion)
@@ -433,9 +437,10 @@ class CalcEquipMixin(CharacterBase):
         self.calc_basic()
         self.calc_sundry(config.get('sundry', {}))
         self.calc_emblems()
+        self.calc_oath_upgrade()
+        suit = self.calc_suits()
         self.calc_equs()
         self.calc_oaths()
-        suit = self.calc_suits()
         skillInfos = []
         if self.buffer:
             skillInfos = self.calc_buffer_skills()