dev

Co-authored-by: Copilot <copilot@github.com>

.gitignore

@@ -30,6 +30,7 @@ logs
 AutoRelease
 *.exe
 .venv
+.env
 .env.dev
 .env.prod
 ._*

backend/config/.env

@@ -1,8 +0,0 @@
-PORT=47173
-MCPPORT=47174
-DEBUG_MODE=True
-WORKERS=1
-REDIS_URL=redis://localhost:6379/1
-COLG_TOKEN="Bearer 7B8B817D9BC838B813A1E6B1A0CAFD5F"
-HELPER_TOKEN="ESc6Z2kW"
-HELPER_ID="706194702"

backend/core/equipment/version_0/enchant.py

@@ -46,6 +46,7 @@ def enchant_4(char: CharacterProperty):
         char.AddSkillLv(50, 50, 1, 1)
     pass
 
+
 @register
 def enchant_5(char: CharacterProperty):
     """
@@ -55,6 +56,7 @@ def enchant_5(char: CharacterProperty):
     char.SetStatus(三攻=20, 四维=75, 技攻=0.07)
     pass
 
+
 @register
 def enchant_6(char: CharacterProperty):
     """
@@ -136,6 +138,26 @@ def enchant_105(char: CharacterProperty):
     pass
 
 
+@register
+def enchant_115(char: CharacterProperty):
+    """
+    DCALC_REMOVE: enchant_115
+    四维(210)
+    """
+    char.SetStatus(四维=210)
+    pass
+
+
+@register
+def enchant_114(char: CharacterProperty):
+    """
+    DCALC_REMOVE: enchant_114
+    三攻(110)|力智(90)|技攻(3%)
+    """
+    char.SetStatus(三攻=110, 力智=90, 技攻=0.03)
+    pass
+
+
 # endregion
 # region 头肩
 
@@ -261,6 +283,7 @@ def enchant_202(char: CharacterProperty):
     char.SetStatus(三攻=110, 力智=90, 技攻=0.02)
     pass
 
+
 @register
 def enchant_203(char: CharacterProperty):
     """
@@ -270,6 +293,7 @@ def enchant_203(char: CharacterProperty):
     char.SetStatus(三攻=90, 力智=60)
     pass
 
+
 @register
 def enchant_204(char: CharacterProperty):
     """
@@ -324,6 +348,7 @@ def enchant_303(char: CharacterProperty):
     char.SetStatus(三攻=36, 技攻=0.05)
     pass
 
+
 @register
 def enchant_304(char: CharacterProperty):
     """
@@ -333,6 +358,7 @@ def enchant_304(char: CharacterProperty):
     char.SetStatus(四维=50, 三攻=15, 技攻=0.03)
     pass
 
+
 @register
 def enchant_305(char: CharacterProperty):
     """
@@ -344,6 +370,7 @@ def enchant_305(char: CharacterProperty):
         char.AddSkillLv(15, 15, 3, 0)
     pass
 
+
 @register
 def enchant_306(char: CharacterProperty):
     """
@@ -353,6 +380,7 @@ def enchant_306(char: CharacterProperty):
     char.SetStatus(三攻=10, 四维=40, 技攻=0.01)
     pass
 
+
 @register
 def enchant_307(char: CharacterProperty):
     """
@@ -364,6 +392,7 @@ def enchant_307(char: CharacterProperty):
         char.AddSkillLv(15, 15, 1, 0)
     pass
 
+
 @register
 def enchant_308(char: CharacterProperty):
     """
@@ -383,6 +412,7 @@ def enchant_309(char: CharacterProperty):
     char.SetStatus(三攻=36, 技攻=0.07)
     pass
 
+
 @register
 def enchant_310(char: CharacterProperty):
     """
@@ -394,6 +424,8 @@ def enchant_310(char: CharacterProperty):
     if char.buffer:
         char.SetStatus(增益量P=0.02)
     pass
+
+
 # endregion
 # region 武器
 
@@ -660,6 +692,7 @@ def enchant_608(char: CharacterProperty):
     char.SetStatus(技攻=0.01)
     pass
 
+
 @register
 def enchant_609(char: CharacterProperty):
     """
@@ -673,6 +706,7 @@ def enchant_609(char: CharacterProperty):
     char.SetStatus(技攻=0.02)
     pass
 
+
 @register
 def enchant_610(char: CharacterProperty):
     """
@@ -684,6 +718,7 @@ def enchant_610(char: CharacterProperty):
         char.AddSkillLv(15, 15, 1, 0)
     pass
 
+
 # endregion
 # region 辅助装备
 
@@ -761,6 +796,7 @@ def enchant_905(char: CharacterProperty):
     char.AddElementDB('暗', 15)
     pass
 
+
 @register
 def enchant_906(char: CharacterProperty):
     """
@@ -774,6 +810,7 @@ def enchant_906(char: CharacterProperty):
     char.AddElementDB('暗', 8)
     pass
 
+
 @register
 def enchant_907(char: CharacterProperty):
     """
@@ -787,6 +824,7 @@ def enchant_907(char: CharacterProperty):
     char.AddElementDB('暗', 12)
     pass
 
+
 # endregion
 # region 魔法石
 
@@ -854,6 +892,29 @@ def enchant_1004(char: CharacterProperty):
     pass
 
 
+@register
+def enchant_1005(char: CharacterProperty):
+    """
+    DCALC_REMOVE: enchant_1005
+    全属强(45)
+    """
+    char.AddElementDB('火', 45)
+    char.AddElementDB('冰', 45)
+    char.AddElementDB('光', 45)
+    char.AddElementDB('暗', 45)
+    pass
+
+
+@register
+def enchant_1006(char: CharacterProperty):
+    """
+    DCALC_REMOVE: enchant_1006
+    四维(190)
+    """
+    char.SetStatus(四维=190)
+    pass
+
+
 # endregion
 # region 耳环
 
@@ -905,6 +966,7 @@ def enchant_1103(char: CharacterProperty):
     char.SetStatus(四维=200)
     pass
 
+
 @register
 def enchant_1104(char: CharacterProperty):
     """
@@ -918,6 +980,7 @@ def enchant_1104(char: CharacterProperty):
     char.SetStatus(四维=100)
     pass
 
+
 @register
 def enchant_1105(char: CharacterProperty):
     """
@@ -927,6 +990,7 @@ def enchant_1105(char: CharacterProperty):
     char.SetStatus(四维=250)
     pass
 
+
 # endregion
 # region 称号
 
@@ -971,7 +1035,7 @@ def enchant_1202(char: CharacterProperty):
     char.AddElementDB('冰', 15)
     char.AddElementDB('光', 15)
     char.AddElementDB('暗', 15)
-    char.AddSkillLv(40, 40, 2, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(40, 40, 2, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     pass
 
 
@@ -986,7 +1050,7 @@ def enchant_1203(char: CharacterProperty):
     char.AddElementDB('冰', 15)
     char.AddElementDB('光', 15)
     char.AddElementDB('暗', 15)
-    char.AddSkillLv(45, 45, 2, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(45, 45, 2, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     pass
 
 
@@ -1001,7 +1065,7 @@ def enchant_1204(char: CharacterProperty):
     char.AddElementDB('冰', 15)
     char.AddElementDB('光', 15)
     char.AddElementDB('暗', 15)
-    char.AddSkillLv(60, 60, 2, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(60, 60, 2, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     pass
 
 
@@ -1016,7 +1080,7 @@ def enchant_1205(char: CharacterProperty):
     char.AddElementDB('冰', 15)
     char.AddElementDB('光', 15)
     char.AddElementDB('暗', 15)
-    char.AddSkillLv(70, 70, 2, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(70, 70, 2, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     pass
 
 
@@ -1031,7 +1095,7 @@ def enchant_1206(char: CharacterProperty):
     char.AddElementDB('冰', 15)
     char.AddElementDB('光', 15)
     char.AddElementDB('暗', 15)
-    char.AddSkillLv(75, 75, 2, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(75, 75, 2, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     pass
 
 
@@ -1046,7 +1110,7 @@ def enchant_1207(char: CharacterProperty):
     char.AddElementDB('冰', 15)
     char.AddElementDB('光', 15)
     char.AddElementDB('暗', 15)
-    char.AddSkillLv(80, 80, 2, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(80, 80, 2, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     pass
 
 
@@ -1321,7 +1385,7 @@ def enchant_2100(char: CharacterProperty):
     DCALC_REMOVE: enchant_2100
     Lv40主动+1|四维(55)
     """
-    char.AddSkillLv(40, 40, 1, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(40, 40, 1, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     pass
 
@@ -1332,7 +1396,7 @@ def enchant_2101(char: CharacterProperty):
     DCALC_REMOVE: enchant_2101
     Lv45主动+1|四维(55)
     """
-    char.AddSkillLv(45, 45, 1, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(45, 45, 1, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     pass
 
@@ -1343,7 +1407,7 @@ def enchant_2102(char: CharacterProperty):
     DCALC_REMOVE: enchant_2102
     Lv60主动+1|四维(55)
     """
-    char.AddSkillLv(60, 60, 1, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(60, 60, 1, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     pass
 
@@ -1354,7 +1418,7 @@ def enchant_2103(char: CharacterProperty):
     DCALC_REMOVE: enchant_2103
     Lv70主动+1|四维(55)
     """
-    char.AddSkillLv(70, 70, 1, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(70, 70, 1, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     pass
 
@@ -1365,7 +1429,7 @@ def enchant_2104(char: CharacterProperty):
     DCALC_REMOVE: enchant_2104
     Lv75主动+1|四维(55)
     """
-    char.AddSkillLv(75, 75, 1, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(75, 75, 1, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     pass
 
@@ -1376,7 +1440,7 @@ def enchant_2105(char: CharacterProperty):
     DCALC_REMOVE: enchant_2105
     Lv80主动+1|四维(55)
     """
-    char.AddSkillLv(80, 80, 1, 1,["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(80, 80, 1, 1, ['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     pass
 
@@ -1390,6 +1454,7 @@ def enchant_2106(char: CharacterProperty):
     char.SetStatus(四维=65, 技攻=0.03, 增益量P=0.01)
     pass
 
+
 # endregion
 # region 皮肤
 
@@ -1400,7 +1465,7 @@ def enchant_2200(char: CharacterProperty):
     DCALC_REMOVE: enchant_2200
     Lv40主动+1|全属强(12)|四维(55)
     """
-    char.AddSkillLv(40, 40, 1, 1, exceptSkills=["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(40, 40, 1, 1, exceptSkills=['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     char.AddElementDB('火', 12)
     char.AddElementDB('冰', 12)
@@ -1415,7 +1480,7 @@ def enchant_2201(char: CharacterProperty):
     DCALC_REMOVE: enchant_2201
     Lv45主动+1|全属强(12)|四维(55)
     """
-    char.AddSkillLv(45, 45, 1, 1, exceptSkills=["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(45, 45, 1, 1, exceptSkills=['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     char.AddElementDB('火', 12)
     char.AddElementDB('冰', 12)
@@ -1430,7 +1495,7 @@ def enchant_2202(char: CharacterProperty):
     DCALC_REMOVE: enchant_2202
     Lv60主动+1|全属强(12)|四维(55)
     """
-    char.AddSkillLv(60, 60, 1, 1, exceptSkills=["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(60, 60, 1, 1, exceptSkills=['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     char.AddElementDB('火', 12)
     char.AddElementDB('冰', 12)
@@ -1445,7 +1510,7 @@ def enchant_2203(char: CharacterProperty):
     DCALC_REMOVE: enchant_2203
     Lv70主动+1|全属强(12)|四维(55)
     """
-    char.AddSkillLv(70, 70, 1, 1, exceptSkills=["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(70, 70, 1, 1, exceptSkills=['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     char.AddElementDB('火', 12)
     char.AddElementDB('冰', 12)
@@ -1460,7 +1525,7 @@ def enchant_2204(char: CharacterProperty):
     DCALC_REMOVE: enchant_2204
     Lv75主动+1|全属强(12)|四维(55)
     """
-    char.AddSkillLv(75, 75, 1, 1, exceptSkills=["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(75, 75, 1, 1, exceptSkills=['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     char.AddElementDB('火', 12)
     char.AddElementDB('冰', 12)
@@ -1475,7 +1540,7 @@ def enchant_2205(char: CharacterProperty):
     DCALC_REMOVE: enchant_2205
     Lv80主动+1|全属强(12)|四维(55)
     """
-    char.AddSkillLv(80, 80, 1, 1 , exceptSkills=["念兽 : 龙虎啸", "风雷啸", "圣灵符文", "神圣之光"])
+    char.AddSkillLv(80, 80, 1, 1, exceptSkills=['念兽 : 龙虎啸', '风雷啸', '圣灵符文', '神圣之光'])
     char.SetStatus(四维=55)
     char.AddElementDB('火', 12)
     char.AddElementDB('冰', 12)
@@ -1889,5 +1954,4 @@ def enchant_2709(char: CharacterProperty):
     pass
 
 
-
 # endregion

backend/core/open/helper.py

@@ -108,12 +108,12 @@ def trans_to_dcalc_set(detail, alter: AltersDep):
             'reinforceType': equ.get('enhance', {}).get('reinforceType', 0),
             # 附魔
             'enchant': 0,
-            # 徽章1
+            # # 徽章1
-            'emblem_0': 0,
+            # 'emblem_0': 0,
-            # 徽章2
+            # # 徽章2
-            'emblem_1': 0,
+            # 'emblem_1': 0,
             # 贴膜
-            'fusion': 0,
+            # 'fusion': 0,
             # 锻造等级
             'refine': equ.get('enhance', {}).get('refine', 0),
             # 调试等级
@@ -131,8 +131,8 @@ def trans_to_dcalc_set(detail, alter: AltersDep):
         #     info['fusion'] = dcalcEquFusion.id
         info['enchant'] = getEnchatIdByName(equ.get('enchant', ''), equ.get('posName', ''), basic.enchants)
         emblems = [getEmblemIdByName(i.get('detail', ''), i.get('categorize', ''), i.get('rarity', ''), basic.emblems) for i in equ.get('emblems', [])]
-        info['emblem_0'] = emblems[0] if len(emblems) > 0 else 0
+        # info['emblem_0'] = emblems[0] if len(emblems) > 0 else 0
-        info['emblem_1'] = emblems[1] if len(emblems) > 1 else 0
+        # info['emblem_1'] = emblems[1] if len(emblems) > 1 else 0
         equips[equ['posName']] = info
     avatars = detail.get('avatars', [])
     for item in avatars:
@@ -140,8 +140,8 @@ def trans_to_dcalc_set(detail, alter: AltersDep):
             'id': '',
             'option': '',
             'enchant': '',
-            'emblem_0': '',
+            # 'emblem_0': '',
-            'emblem_1': '',
+            # 'emblem_1': '',
         }
         list = basicAvatars.get(item.get('posName', ''), [])
         if len(list) > 0: