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 1c91562c..e16645f0 100644 Binary files a/backend/dataFiles/dcalc_0.db and b/backend/dataFiles/dcalc_0.db differ 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 == '称号')