dev

backend/core/basic/equipment.py

@@ -234,6 +234,21 @@ class Equipments:
         with Session(self.engine) as session:
             db_list = session.query(OathSuitData).all()
             db_skills_list = session.query(OathSuitSkillData).all()
+        skill_list = []
+        for item in db_skills_list:
+            lvs = len(item.SkillAttack.split(','))
+            skills = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
+            for i in range(1, lvs + 1):
+                skill = {k: v for k, v in skills.items()}
+                skillAttacks = parse_to_number_list(skill['SkillAttack'], [0])
+                skill['SkillAttack'] = 0 if i - 1 >= len(skillAttacks) else skillAttacks[i - 1]
+                attacks = parse_to_number_list(skill['Attack'], [0])
+                skill['Attack'] = 0 if i - 1 >= len(attacks) else attacks[i - 1]
+                buffers = parse_to_number_list(skill['Buffer'], [0])
+                skill['Buffer'] = 0 if i - 1 >= len(buffers) else buffers[i - 1]
+                skill['level'] = i
+                skill_obj = OathSuitSkill(**skill)
+                skill_list.append(skill_obj)
         for item in db_list:
             lvs = len(item.point.split(','))
             suits = {k: v for k, v in item.__dict__.items() if not k.startswith('_')}
@@ -241,7 +256,7 @@ class Equipments:
                 suit = {k: v for k, v in suits.items()}
                 suit['points'] = suit['point']
                 suit['point'] = int(suit['point'].split(',')[i - 1])
-                skills = [x for x in db_skills_list if x.suitId == suit['suitId'] and x.key == suit['key']]
+                skills = [x for x in skill_list if x.suitId == suit['suitId'] and x.key == suit['key'] and x.level == i]
                 suit['level'] = i
                 skillAttaks = parse_to_number_list(suit['SkillAttack'], [0])
                 suit['SkillAttack'] = (0 if len(skillAttaks) == 0 else skillAttaks[0]) if i - 1 >= len(skillAttaks) else skillAttaks[i - 1]
@@ -371,6 +386,7 @@ class OathSuitSkill:
     Buffer: float
     value: str
     bufferValue: str
+    level: int
 
     def __init__(self, **kwargs):
         for key in ['SkillAttack', 'Attack', 'Buffer']: