dev

backend/core/basic/character.py

@@ -449,6 +449,8 @@ class Character:
         suits = []
         stones = []
         for i in equInfos.equs:
+            if i.itemType == '武器' and i.itemDetailType not in self.武器选项:
+                continue
             equs.append(i.__dict__)
         for i in equInfos.suits:
             suits.append(i.__dict__)
@@ -460,6 +462,7 @@ class Character:
         info['enchants'] = equInfos.enchants
         info['emblems'] = equInfos.emblems
         info["avatar"] = equInfos.funs.get_dress_list(skill_clothes)
+        info['jades'] = equInfos.jades
         for skill in platinum:
             info['emblems'].append({
                 'id': skill,
@@ -726,6 +729,7 @@ class Character:
         # 角色基础属性
         self.SetBaseStatus()
         # 辟邪玉计算
+        self.calc_jade(setInfo.get('jades', []))
         # 时装计算
         self.calc_avatar(setInfo.get('avatar', {}))
         # 精通、增幅、强化计算

backend/core/basic/equipment.py

@@ -73,6 +73,7 @@ class Equipments:
         self.funs = self.init_func()
         self.equ_dict: dict[str, Equ] = {}
         self.stone_dict: dict[str, Equ] = {}
+        self.jades = []
         self.enchants = []
         self.emblems = []
         self.suits: list[Suit] = []
@@ -82,6 +83,7 @@ class Equipments:
         self.init_enchants()
         self.init_stones()
         self.init_emblem()
+        self.init_jades()
         self.engine.dispose()
 
     def init_equs(self):
@@ -170,9 +172,6 @@ class Equipments:
             db_list = session.query(JadeData).all()
         for item in db_list:
             jade = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
-            jade['position'] = [] if jade['itemType'] is None else jade['itemType'].split(',')
-            jade['categorize'] = [] if jade['categorize'] is None else jade['categorize'].split(',')
-            del jade['itemType']
             self.jades.append(jade)
             pass
         pass