From a19fa51fdf4a246c6d5dc92e71cd72956a845cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Fri, 4 Sep 2026 14:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=B3=E6=AD=87=E5=B0=94?=
 =?UTF-8?q?=E9=98=B2=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/core/equipment/version_0/equ.py       |  58 ++++++++++++++++++
 backend/dataFiles/dcalc_0.db                  | Bin 864256 -> 868352 bytes
 .../EquipmentDictionary/formatData.ts         |  14 ++++-
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/backend/core/equipment/version_0/equ.py b/backend/core/equipment/version_0/equ.py
index 610ef17d..818d0a6a 100644
--- a/backend/core/equipment/version_0/equ.py
+++ b/backend/core/equipment/version_0/equ.py
@@ -15571,6 +15571,64 @@ def equ_1123(char: CharacterProperty,effectDamage: list[float] = []):
 
 # endregion
 
+# region 米歇尔套装
+@register
+def equ_1124(char: CharacterProperty,effectDamage: list[float] = []):
+    """
+    DCALC_REMOVE: equ_1124 - 米歇尔套装 - 上衣
+    生命值最大值 +15%
+    魔法值最大值 +15%
+    rarity: 史诗
+    """
+    equ_375(char, effectDamage)
+    pass
+
+
+@register
+def equ_1125(char: CharacterProperty,effectDamage: list[float] = []):
+    """
+    DCALC_REMOVE: equ_1125 - 米歇尔套装 - 下装
+    攻击速度 +40%
+    施放速度 +40%
+    rarity: 史诗
+    """
+    equ_378(char, effectDamage)
+    pass
+
+
+@register
+def equ_1126(char: CharacterProperty,effectDamage: list[float] = []):
+    """
+    DCALC_REMOVE: equ_1126 - 米歇尔套装 - 头肩
+    所受物理/魔法伤害 -10%
+    rarity: 史诗
+    """
+    equ_381(char, effectDamage)
+    pass
+
+
+@register
+def equ_1127(char: CharacterProperty,effectDamage: list[float] = []):
+    """
+    DCALC_REMOVE: equ_1127 - 米歇尔套装 - 腰带
+    物品栏负重上限 +3kg
+    所有异常状态抗性 +30.5%
+    rarity: 史诗
+    """
+    equ_384(char, effectDamage)
+    pass
+
+
+@register
+def equ_1128(char: CharacterProperty,effectDamage: list[float] = []):
+    """
+    DCALC_REMOVE: equ_1128 - 米歇尔套装 - 鞋子
+    移动速度 +44%
+    rarity: 史诗
+    """
+    equ_387(char, effectDamage)
+    pass
+
 
 # region 秘宝装备
 @register
diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db
index 1c91562cb921e72b1714b148943971d956e0d3da..e16645f075b1199339c397bc892d59cc9d08928a 100644
GIT binary patch
delta 829
zcmZp8VA9ZFIzgJXkAZ>V%0vZw#=eaSOYE5|c`YZiJG|oc=Do~o$?M9S%v;TScC%xE
z9gpa_{ve=Q|E745j{aaEd8Q+Ja-eT3^VyD!=9|9lH+>m_m<foPftUq|S%H`hh}nUd
z1Bf|+m<x!xx8L;T(N1FI+0MFw=LaVfGc(YN|4iHe?crf&Rs@>N%kY7L?=|mro~ztP
zxwde2aU`;Pu?e%>W^Q6KV)!s!Fpc@VzFkL#Bm;}Kq@=L6WutVeez`CZ@bmL4i;6R`
z{@j-Ibk5=z3wxgI=zP{N_vO6q=?m03<oPykezvy#>4qs!XD@m-XU%lOM~v~)1v)rH
zr%%7nA~Icpi(PiQ!Ezp52Qw1`ATTsFHngxbG_)`<V9#mt=|~4!XecQu39>NR5yiqE
zpWXm1e7>jU+4Kc3Ry0g66yT7auAs-ki`B{r^I3VO`%h=(m|jrFV+FEO$I;Bx&=LsD
zERpRD?MOqmGZ@uQ{cRvmE^d6fZsF68CDT8i=27Q=j?If;`{uZ@$xnCK$`k2eh{bm%
z9jQn*rShZL^gU-W$fkzYryIJSZfT!>poBvMm&Zh>8*;KLPM=WCq3eLnOU4~3NERid
zTJ&w@X^2J7nl?RaT0h;;kOQBW{CYSzr>h)iQvh2hjK#X`#V2`s*|yI-$|J(K{pD^R
zQO0Q#I9Rxt*)}k9zGvIOvu-=z1s-+g%>e<`%-f?5@z^tO-*Sv+KhySgcX)z=ryXEr
WVPj-#XJBgwrqEip?WUJ`Dmei*p(~~U

delta 249
zcmZo@Fl~5XGC`U(iGhLP@<auD#-xo2OYE5|c<m>%JG|n)%<IkT%A3qv&3ksUV}KhE
zzkgFaQ02M)U?6$6KX7uOZ!7bej+o|~zU?=C8G)Dyh?#+y1&CRJm<@>8ftUk`If0l9
zh`G1l^ySe`V&vV<x`F2hCllj4py96=x4%BeBg(k_-yR-jW=XcS44h0+46HNx{_(!!
zxy!wotBbRkZ3|NrP^kmc_6^r~?3uS;Kg%P+$PRQ02ycIXlV?BEcCX_+y=;8EKmjIZ
fQ)ZrZ%%*H^+xaf=s55VGH{-43+`jG(Pf#!b5jIsx

diff --git a/frontend/src/pages/Character/EquipmentDictionary/formatData.ts b/frontend/src/pages/Character/EquipmentDictionary/formatData.ts
index 903a1320..2446fb99 100644
--- a/frontend/src/pages/Character/EquipmentDictionary/formatData.ts
+++ b/frontend/src/pages/Character/EquipmentDictionary/formatData.ts
@@ -95,7 +95,7 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?:
   )
   raritiyList.forEach((rarity) => {
     const armor = item_suits.filter(
-      (item) => item.rarity === rarity && item.itemType === '防具' && !item.name.includes('侵蚀') && !item.name.includes('启圣'),
+      (item) => item.rarity === rarity && item.itemType === '防具' && !item.name.includes('侵蚀') && !item.name.includes('启圣') && !item.categorize.includes('米歇尔'),
     )
     if (armor.length > 0) {
       suits.push(...armor, undefined)
@@ -124,7 +124,7 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?:
       )
       suits.push(...Array(rowCount - (suits.length % rowCount)).fill(undefined))
     }
-
+    // 初步升级
     ['侵蚀', '启圣'].forEach((upgradeType) => {
       const upgradeItems = item_suits.filter(
         (item) => item.rarity === rarity && item.itemType === '防具' && item.name.includes(upgradeType),
@@ -136,6 +136,16 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?:
         suits.push(...Array(rowCount - (suits.length % rowCount)).fill(undefined))
       }
     })
+    // 米歇尔二次升级
+    const michelle = item_suits.filter(
+      (item) => item.rarity === rarity && item.itemType === '防具' && item.categorize.includes('米歇尔'),
+    )
+    if (michelle.length > 0) {
+      suits.push(...michelle)
+    }
+    if (suits.length % rowCount > 0) {
+      suits.push(...Array(rowCount - (suits.length % rowCount)).fill(undefined))
+    }
   })
   // 称号
   const item_title = total.filter((equip) => equip.itemDetailType == '称号')