feat:添加米歇尔相关

backend/config/main.py

@@ -8,7 +8,7 @@ BACKEND_DIR = Path(__file__).resolve().parents[1]
 class Config(BaseSettings):
     DEBUG_MODE: bool = True
     WORKERS: int = 1
-    PORT: int = 27173
+    PORT: int = 47173
     MCPPORT: int = 27174
     REDIS_URL: str = 'redis://localhost:6379/1'
     COLG_TOKEN: str = ''

backend/core/equipment/version_0/oathSuitSkill.py

@@ -1049,14 +1049,14 @@ def oath_skill_2040202(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 510300)))
     for skill in char.skills:
         if skill.cube > 0:
-            skill.skillDamage *= 1.07
+            skill.skillDamage *= 1.06
     pass
 
 
 @register
 def oath_skill_2040203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
-    char.SetStatus(SkillAttack=0.015 * 10)
+    char.SetStatus(SkillAttack=0.015 * 10 + 0.01)
     pass
 
 
@@ -1089,14 +1089,14 @@ def oath_skill_2040302(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 510300)))
     for skill in char.skills:
         if skill.cube > 0:
-            skill.skillDamage *= 1.1
+            skill.skillDamage *= 1.06
     pass
 
 
 @register
 def oath_skill_2040303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
-    char.SetStatus(SkillAttack=0.025 * 7)
+    char.SetStatus(SkillAttack=0.025 * 7 + 0.01)
     pass
 
 
@@ -1135,7 +1135,7 @@ def oath_skill_2040402(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2040403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
-    char.SetStatus(SkillAttack=0.035 * 7)
+    char.SetStatus(SkillAttack=0.035 * 7 + 0.01)
     pass
 
 
@@ -1174,7 +1174,7 @@ def oath_skill_2040502(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2040503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
-    char.SetStatus(SkillAttack=0.06 * 5)
+    char.SetStatus(SkillAttack=0.06 * 5 + 0.01)
     pass
 
 
@@ -1245,7 +1245,7 @@ def oath_skill_2050202(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2050203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetSkillCD(cd=-0.1)
-    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42)
+    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.49)
     pass
 
 
@@ -1275,7 +1275,7 @@ def oath_skill_2050302(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2050303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetSkillCD(cd=-0.1)
-    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42)
+    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.49)
     pass
 
 
@@ -1305,7 +1305,7 @@ def oath_skill_2050402(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2050403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetSkillCD(cd=-0.1)
-    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42)
+    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.49)
     pass
 
 
@@ -1335,7 +1335,7 @@ def oath_skill_2050502(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2050503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetSkillCD(cd=-0.1)
-    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42)
+    char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.49)
     pass
 
 
@@ -1645,6 +1645,8 @@ def oath_skill_2070203(char: CharacterProperty, oathEffectDamage: list[float] =
 
 @register
 def oath_skill_2070301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
+    if not char.buffer:
+        char.SetSkillCD(50, 50, 0.5, [])
     char.SetSkillRation(100, 100, 0.1)
     char.SetSkillRation(85, 85, 0.1)
     char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1)
@@ -1709,7 +1711,7 @@ def oath_skill_2070303(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2070401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     if not char.buffer:
-        char.SetSkillCD(50, 50, 0.1, [])
+        char.SetSkillCD(50, 50, 0.6, [])
         char.SetSkillCD(85, 85, 0.2, [])
     char.SetSkillRation(100, 100, 0.15)
     char.SetSkillRation(85, 85, 0.1)
@@ -1777,7 +1779,7 @@ def oath_skill_2070403(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2070501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     if not char.buffer:
-        char.SetSkillCD(50, 50, 0.1, [])
+        char.SetSkillCD(50, 50, 0.7, [])
         char.SetSkillCD(85, 85, 0.2, [])
     char.SetSkillRation(100, 100, 0.20)
     char.SetSkillRation(85, 85, 0.15)
@@ -1893,7 +1895,8 @@ def oath_skill_2080201(char: CharacterProperty, oathEffectDamage: list[float] =
 
 @register
 def oath_skill_2080202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
+    char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
+    char.SetStatus(SkillAttack=0.03)
     pass
 
 
@@ -1920,7 +1923,8 @@ def oath_skill_2080301(char: CharacterProperty, oathEffectDamage: list[float] =
 
 @register
 def oath_skill_2080302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
+    char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
+    char.SetStatus(SkillAttack=0.03)
     pass
 
 
@@ -1947,7 +1951,8 @@ def oath_skill_2080401(char: CharacterProperty, oathEffectDamage: list[float] =
 
 @register
 def oath_skill_2080402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
+    char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
+    char.SetStatus(SkillAttack=0.03)
     pass
 
 
@@ -1975,8 +1980,9 @@ def oath_skill_2080501(char: CharacterProperty, oathEffectDamage: list[float] =
 @register
 def oath_skill_2080502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     # 原套装效果
-    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
+    char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
     char.SetStatus(SpeedM=0.1 + 0.1, SpeedA=0.1 + 0.1, SpeedR=0.1 + 0.1)
+    char.SetStatus(SkillAttack=0.03)
     pass
 
 

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) => item.rarity === rarity && item.itemType === '防具' && !item.name.includes('侵蚀') && !item.name.includes('启圣'),
     )
     if (armor.length > 0) {
       suits.push(...armor, undefined)
@@ -125,16 +125,17 @@ export const formatEqu = (total: IEquipment[], subweapons?: string[], curSuit?:
       suits.push(...Array(rowCount - (suits.length % rowCount)).fill(undefined))
     }
 
-    const armorUpgrade = item_suits.filter(
-      (item) => item.rarity === rarity && item.itemType === '防具' && item.name.includes('侵蚀'),
-    )
-    if (armorUpgrade.length > 0) {
-      suits.push(...armorUpgrade)
-    }
-
-    if (suits.length % rowCount > 0) {
-      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),
+      )
+      if (upgradeItems.length > 0) {
+        suits.push(...upgradeItems)
+      }
+      if (suits.length % rowCount > 0) {
+        suits.push(...Array(rowCount - (suits.length % rowCount)).fill(undefined))
+      }
+    })
   })
   // 称号
   const item_title = total.filter((equip) => equip.itemDetailType == '称号')