dev

backend/core/basic/character.py

@@ -612,6 +612,8 @@ class Character:
         effects = get_equipment(self.equVersion).funs
         for detail in [(item.equInfo, item.fusionInfo, item.enchant, item.emblem_0, item.emblem_1) for item in filter(lambda x: x.equInfo is not None, self.charEquipInfo.values())]:
             equ = detail[0]
+            if equ is None or equ.itemType == '副武器':
+                return
             fusion = detail[1]
             enchat = detail[2]
             if equ is None:

backend/core/basic/roleinfo.py

@@ -38,8 +38,10 @@ class CharacterEquipInfo:
         self.__dict__.update(info)
         equ = get_equipment(equVerison).equ_dict.get(self.id, None)
         fusion = get_equipment(equVerison).stone_dict.get(self.fusion, None)
-        if equ is not None and (equ.itemType == part or equ.itemDetailType == part):
+        if equ is not None and (equ.itemType == part or equ.itemDetailType == part or (equ.itemType == '武器' and part == '副武器')):
             self.equInfo = equ.adapt(self.adaptation)
+            if part == '副武器' and equ.itemType == '武器':
+                self.equInfo.itemType = "副武器"
         else:
             self.equInfo = None
         if fusion is not None and (fusion.itemType == part or fusion.itemDetailType == part):