From 76cda544431b6b0f92fb9f79fd42e47f8a291c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Tue, 28 Apr 2026 15:55:20 +0800
Subject: [PATCH] dev

Co-authored-by: Copilot <copilot@github.com>
---
 .gitignore                                  |   1 +
 backend/config/.env                         |   8 --
 backend/core/equipment/version_0/enchant.py | 110 ++++++++++++++++----
 backend/core/open/helper.py                 |  18 ++--
 backend/dataFiles/dcalc_0.db                | Bin 860160 -> 860160 bytes
 backend/openapi                             |   2 +-
 6 files changed, 98 insertions(+), 41 deletions(-)
 delete mode 100644 backend/config/.env

diff --git a/.gitignore b/.gitignore
index e4c98abb..1d30a9ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ logs
 AutoRelease
 *.exe
 .venv
+.env
 .env.dev
 .env.prod
 ._*
diff --git a/backend/config/.env b/backend/config/.env
deleted file mode 100644
index 802cba66..00000000
--- a/backend/config/.env
+++ /dev/null
@@ -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"
\ No newline at end of file
diff --git a/backend/core/equipment/version_0/enchant.py b/backend/core/equipment/version_0/enchant.py
index 5d08a332..6ecfc6d3 100644
--- a/backend/core/equipment/version_0/enchant.py
+++ b/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 武器
 
@@ -542,7 +574,7 @@ def enchant_512(char: CharacterProperty):
     DCALC_REMOVE: enchant_512
     三攻(50)|力智(50)|全属强(16)|属性攻击
     """
-    char.SetStatus(三攻=50,力智=50)
+    char.SetStatus(三攻=50, 力智=50)
     char.AddElementDB('火', 16)
     char.AddElementDB('冰', 16)
     char.AddElementDB('光', 16)
@@ -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
 
 
@@ -1284,7 +1348,7 @@ def enchant_2000(char: CharacterProperty):
     DCALC_REMOVE: enchant_2000
     Lv1~95+1|攻击强化(12%)|增益量(7%)
     """
-    char.SetStatus(攻击强化P=0.12,增益量P=0.07)
+    char.SetStatus(攻击强化P=0.12, 增益量P=0.07)
     char.AddSkillLv(1, 95, 1)
     pass
 
@@ -1295,7 +1359,7 @@ def enchant_2001(char: CharacterProperty):
     DCALC_REMOVE: enchant_2001
     Lv1~95+1|攻击强化(7%)|增益量(5%)
     """
-    char.SetStatus(攻击强化P=0.07,增益量P=0.05)
+    char.SetStatus(攻击强化P=0.07, 增益量P=0.05)
     char.AddSkillLv(1, 95, 1)
     pass
 
@@ -1306,7 +1370,7 @@ def enchant_2002(char: CharacterProperty):
     DCALC_REMOVE: enchant_2002
     Lv1~35+1|攻击强化(5%)|增益量(3%)
     """
-    char.SetStatus(攻击强化P=0.05,增益量P=0.03)
+    char.SetStatus(攻击强化P=0.05, 增益量P=0.03)
     char.AddSkillLv(1, 35, 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
diff --git a/backend/core/open/helper.py b/backend/core/open/helper.py
index a8c62fee..d41b7f21 100644
--- a/backend/core/open/helper.py
+++ b/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
-            'emblem_0': 0,
-            # 徽章2
-            'emblem_1': 0,
+            # # 徽章1
+            # 'emblem_0': 0,
+            # # 徽章2
+            # '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_1'] = emblems[1] if len(emblems) > 1 else 0
+        # info['emblem_0'] = emblems[0] if len(emblems) > 0 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_1': '',
+            # 'emblem_0': '',
+            # 'emblem_1': '',
         }
         list = basicAvatars.get(item.get('posName', ''), [])
         if len(list) > 0:
diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db
index 3b872e05a3f147bb18b60adf872b15e7bb735fa3..46f6b3baadf1400c2d681309cb381fd224070df5 100644
GIT binary patch
delta 429
zcmZoTVA62FWP&tf%S0Jx#+Ho<GweAgN-!`msJA3FIkY)2ZgXH_RA6J~XRu?sKAk;*
zNt1=?I<v)eg9N5P(I}=yCR@gzj2jr!80{Fv816D`W!Sp;p@S_GlUdR9{kcr4qQ<J4
zFZNA-+P>?_j;<FA7XuYBFlbJG=%A{kP|VJtEGfyv@O1X<=exIP7#SJ>m9{?ZS_xCS
zJt~<gh=cLN_O;neAuOuQGa2ldy&2dvS%0!_Wvyg2W%<amf+dc{jD?T+D)U<Y<IIK3
z-qX1XnBu0l6fkLR{@^f|DM-0J4`huz+!{kmm^ClgPI<O@>ht-V89u1C=dv@XgH^Sz
zc)D@k(>=R1OiZCJhpPiSUS#{y1g33F+k?xPHgcM1u$3}!U*(?2?aR%{b(Cv1R|c0E
z=MT;eoEe-795*<YaujnoaPYEUW}nF(!7k4Bgl#ih>2{6=CR?`c>k62bu(nI~Faa?$
e5VHU=h|dPZ>_E%`#GF9P1;pIjC3|?DPX+){y_M4d

delta 225
zcmZoTVA62FWP&tf(L@<%#-fc0GweC0=rJ%bsJCY~IkY)2ZgXH_RA2)Ncra|8&Yr-e
zIo%|IDNx*ynUQHPQzMft<4?v7jA@K^jA9IT8MaPzl-<6zm}wc)_UL4$Kn})B+t+3@
zg|Kjf^{->#KR#WpfGJLfjgR#dYa6Q*%RiPYEDKrkSqzz9GB0F~WENz)H@&5RNo#v)
z8`Bcj?LlQsn>bkncqAFNTQo4)vTgq0aD}y9vWE$XnSq!Eh(UZdAZ7<*4j|?PVlE)&
L-Y(h0^L#P@eZxYM

diff --git a/backend/openapi b/backend/openapi
index 33785f2a..c7957c50 160000
--- a/backend/openapi
+++ b/backend/openapi
@@ -1 +1 @@
-Subproject commit 33785f2a502f9d975f431ee0c32a602f390141fb
+Subproject commit c7957c50ebe9d7fb7e84123429f61f675a5fa7b0