From 02775f6356c26ae6b4664a20a6d417c489f1d9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Thu, 9 Jul 2026 00:20:59 +0800
Subject: [PATCH] fix

---
 .../core/equipment/version_0/oathSuitSkill.py | 258 +++++++++---------
 backend/dataFiles/dcalc_0.db                  | Bin 819200 -> 819200 bytes
 2 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/backend/core/equipment/version_0/oathSuitSkill.py b/backend/core/equipment/version_0/oathSuitSkill.py
index 63e881ea..4243befd 100644
--- a/backend/core/equipment/version_0/oathSuitSkill.py
+++ b/backend/core/equipment/version_0/oathSuitSkill.py
@@ -450,7 +450,7 @@ def oath_skill_2020101(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
     char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
     char.SetStatus(SpeedM=0.15)
-    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450)))
+    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450)))
     pass
 
 
@@ -460,7 +460,7 @@ def oath_skill_2020102(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
     char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
     char.SetStatus(SpeedM=0.15)
-    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450)))
+    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450)))
     pass
 
 
@@ -470,22 +470,22 @@ def oath_skill_2020103(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
     char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
     char.SetStatus(SpeedM=0.15)
-    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450)))
+    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450)))
     pass
 
 
 @register
 def oath_skill_2020201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800)))
+    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800)))
     if check_suit(char):
         # 原套装效果
-        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560)))
-        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320)))
-        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380)))
+        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560)))
+        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
+        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
         char.SetStatus(SpeedM=0.15)
-        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590)))
+        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
         # 誓约追加69300%伤害
-        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
+        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
         # 誓约效果
         char.SetStatus(SkillAttack=0.019)
     pass
@@ -495,10 +495,10 @@ def oath_skill_2020201(char: CharacterProperty, oathEffectDamage: list[float] =
 def oath_skill_2020202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     # 原套装效果
     char.SetStatus(SpeedM=0.15)
-    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 146318)))
+    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 0, 146318)))
     char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
     char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
-    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450)))
+    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450)))
     pass
 
 
@@ -510,22 +510,22 @@ def oath_skill_2020203(char: CharacterProperty, oathEffectDamage: list[float] =
     char.SetStatus(SpeedM=0.15)
     char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
     # 誓约
-    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200)))
+    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 0, 25200)))
     pass
 
 
 @register
 def oath_skill_2020301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800)))
+    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800)))
     if check_suit(char):
         # 原套装效果
-        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560)))
-        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320)))
-        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380)))
+        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560)))
+        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
+        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
         char.SetStatus(SpeedM=0.15)
-        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590)))
+        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
         # 誓约追加69300%伤害
-        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
+        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
         # 誓约效果
         char.SetStatus(SkillAttack=0.019)
     pass
@@ -536,9 +536,9 @@ def oath_skill_2020302(char: CharacterProperty, oathEffectDamage: list[float] =
     # 原套装效果
     char.SetStatus(SpeedM=0.15)
     # 誓约效果
-    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 196875)))
-    char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 29380)))
-    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 2, 346450)))
+    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 0, 196875)))
+    char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
+    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450)))
     pass
 
 
@@ -550,23 +550,23 @@ def oath_skill_2020303(char: CharacterProperty, oathEffectDamage: list[float] =
     char.SetStatus(SpeedM=0.15)
     char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
     # 誓约
-    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200)))
-    char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800)))
+    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 0, 25200)))
+    char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 1, 37800)))
     pass
 
 
 @register
 def oath_skill_2020401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800)))
+    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800)))
     if check_suit(char):
         # 原套装效果
-        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560)))
-        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320)))
-        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380)))
+        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560)))
+        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
+        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
         char.SetStatus(SpeedM=0.15)
-        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590)))
+        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
         # 誓约追加69300%伤害
-        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
+        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
         # 誓约效果
         char.SetStatus(SkillAttack=0.019)
     pass
@@ -577,8 +577,8 @@ def oath_skill_2020402(char: CharacterProperty, oathEffectDamage: list[float] =
     # 原套装效果
     char.SetStatus(SpeedM=0.15)
     # 誓约效果
-    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 261923)))
-    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 1, 346450)))
+    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 0, 261923)))
+    char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450)))
     pass
 
 
@@ -590,24 +590,24 @@ def oath_skill_2020403(char: CharacterProperty, oathEffectDamage: list[float] =
     char.SetStatus(SpeedM=0.15)
     char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
     # 誓约
-    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200)))
-    char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800)))
-    char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 1, 25200)))
+    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 0, 25200)))
+    char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 1, 37800)))
+    char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 2, 25200)))
     pass
 
 
 @register
 def oath_skill_2020501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800)))
+    char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800)))
     if check_suit(char):
         # 原套装效果
-        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560)))
-        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320)))
-        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380)))
+        char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560)))
+        char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320)))
+        char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380)))
         char.SetStatus(SpeedM=0.15)
-        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590)))
+        char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
         # 誓约追加69300%伤害
-        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
+        char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300)))
         # 誓约效果
         char.SetStatus(SkillAttack=0.019)
     pass
@@ -618,8 +618,8 @@ def oath_skill_2020502(char: CharacterProperty, oathEffectDamage: list[float] =
     # 原套装效果
     char.SetStatus(SpeedM=0.15)
     # 誓约效果
-    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 315000)))
-    char.equ_effect.append(EquEffect(name='心之女王', icon='/equipment/skill/130.png', cd=120, data=effect_damage(suitEffectDamage, 1, 1732500)))
+    char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 0, 315000)))
+    char.equ_effect.append(EquEffect(name='心之女王', icon='/equipment/skill/130.png', cd=120, data=effect_damage(oathEffectDamage, 1, 1732500)))
     pass
 
 
@@ -631,10 +631,10 @@ def oath_skill_2020503(char: CharacterProperty, oathEffectDamage: list[float] =
     char.SetStatus(SpeedM=0.15)
     char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590)))
     # 誓约
-    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200)))
-    char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800)))
-    char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 1, 25200)))
-    char.equ_effect.append(EquEffect(name='光灵卢切', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 2, 37800)))
+    char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 0, 25200)))
+    char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 1, 37800)))
+    char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 2, 25200)))
+    char.equ_effect.append(EquEffect(name='光灵卢切', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 3, 37800)))
     pass
 
 
@@ -846,7 +846,7 @@ def oath_skill_2030303(char: CharacterProperty, oathEffectDamage: list[float] =
     if reinforce >= 121:
         char.SetStatus(SkillAttack=0.1, SpeedA=0.23, SpeedM=0.23, SpeedR=0.23)
     if reinforce >= 121:
-        char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 0, 1400000)))
+        char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 0, 1400000)))
     pass
 
 
@@ -906,9 +906,9 @@ def oath_skill_2030403(char: CharacterProperty, oathEffectDamage: list[float] =
     if reinforce >= 121:
         char.SetStatus(SkillAttack=0.1, SpeedA=0.25, SpeedM=0.25, SpeedR=0.25)
     if reinforce >= 132:
-        char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 0, 1400000) + effect_damage(suitEffectDamage, 1, 3000000)))
+        char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 0, 1400000) + effect_damage(suitEffectDamage, 1, 3000000)))
     elif reinforce >= 121:
-        char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 2, 1400000)))
+        char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 0, 1400000)))
     pass
 
 
@@ -967,9 +967,9 @@ def oath_skill_2030503(char: CharacterProperty, oathEffectDamage: list[float] =
     if reinforce >= 121:
         char.SetStatus(SkillAttack=0.1, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
     if reinforce >= 132:
-        char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 0, 2000000)))
+        char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 1, 2000000)))
     elif reinforce >= 121:
-        char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 1, 1400000)))
+        char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 0, 1400000)))
     pass
 
 
@@ -1043,9 +1043,9 @@ def oath_skill_2040201(char: CharacterProperty, oathEffectDamage: list[float] =
 def oath_skill_2040202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
     char.SetStatus(SkillAttack=0.03)
-    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900)))
-    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950)))
-    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250)))
+    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900)))
+    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950)))
+    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250)))
     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:
@@ -1083,9 +1083,9 @@ def oath_skill_2040301(char: CharacterProperty, oathEffectDamage: list[float] =
 def oath_skill_2040302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
     char.SetStatus(SkillAttack=0.03)
-    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900)))
-    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950)))
-    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250)))
+    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900)))
+    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950)))
+    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250)))
     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:
@@ -1123,9 +1123,9 @@ def oath_skill_2040401(char: CharacterProperty, oathEffectDamage: list[float] =
 def oath_skill_2040402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
     char.SetStatus(SkillAttack=0.03)
-    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900)))
-    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950)))
-    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250)))
+    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900)))
+    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950)))
+    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250)))
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
     char.SetStatus(SkillAttack=0.1)
     char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 680400)))
@@ -1162,9 +1162,9 @@ def oath_skill_2040501(char: CharacterProperty, oathEffectDamage: list[float] =
 def oath_skill_2040502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
     char.SetStatus(SkillAttack=0.03)
-    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900)))
-    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950)))
-    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250)))
+    char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900)))
+    char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950)))
+    char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250)))
     char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3)
     char.SetStatus(SkillAttack=0.1)
     char.equ_effect.append(EquEffect(name='应龙降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 1020600)))
@@ -1600,7 +1600,7 @@ def oath_skill_2070201(char: CharacterProperty, oathEffectDamage: list[float] =
         for item in char.skills:
             if item.learnLv == 100:
                 cd = item.getSkillCD()
-        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630)))
+        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630)))
         # 誓约追加
         char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065)
     pass
@@ -1622,7 +1622,7 @@ def oath_skill_2070202(char: CharacterProperty, oathEffectDamage: list[float] =
         if item.learnLv == 100:
             cd = item.getSkillCD()
             item.skillDamage *= 1.4
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 1.4))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 1.4))
     pass
 
 
@@ -1639,7 +1639,7 @@ def oath_skill_2070203(char: CharacterProperty, oathEffectDamage: list[float] =
     for item in char.skills:
         if item.learnLv == 85:
             cd = item.getSkillCD()
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880)))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880)))
     pass
 
 
@@ -1663,7 +1663,7 @@ def oath_skill_2070301(char: CharacterProperty, oathEffectDamage: list[float] =
         for item in char.skills:
             if item.learnLv == 100:
                 cd = item.getSkillCD()
-        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630)))
+        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630)))
         # 誓约追加
         char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065)
     pass
@@ -1685,7 +1685,7 @@ def oath_skill_2070302(char: CharacterProperty, oathEffectDamage: list[float] =
         if item.learnLv == 100:
             cd = item.getSkillCD()
             item.skillDamage *= 1.55
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 1.55))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 1.55))
     pass
 
 
@@ -1702,7 +1702,7 @@ def oath_skill_2070303(char: CharacterProperty, oathEffectDamage: list[float] =
     for item in char.skills:
         if item.learnLv == 85:
             cd = item.getSkillCD()
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880)))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880)))
     pass
 
 
@@ -1729,7 +1729,7 @@ def oath_skill_2070401(char: CharacterProperty, oathEffectDamage: list[float] =
         for item in char.skills:
             if item.learnLv == 100:
                 cd = item.getSkillCD()
-        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630)))
+        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630)))
         # 誓约追加
         char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065)
     pass
@@ -1751,7 +1751,7 @@ def oath_skill_2070402(char: CharacterProperty, oathEffectDamage: list[float] =
         if item.learnLv == 100:
             cd = item.getSkillCD()
             item.skillDamage *= 2
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 2))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 2))
     pass
 
 
@@ -1770,7 +1770,7 @@ def oath_skill_2070403(char: CharacterProperty, oathEffectDamage: list[float] =
     for item in char.skills:
         if item.learnLv == 85:
             cd = item.getSkillCD()
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880)))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880)))
     pass
 
 
@@ -1798,7 +1798,7 @@ def oath_skill_2070501(char: CharacterProperty, oathEffectDamage: list[float] =
         for item in char.skills:
             if item.learnLv == 100:
                 cd = item.getSkillCD()
-        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630)))
+        char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630)))
         # 誓约追加
         char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065)
     pass
@@ -1820,7 +1820,7 @@ def oath_skill_2070502(char: CharacterProperty, oathEffectDamage: list[float] =
         if item.learnLv == 100:
             cd = item.getSkillCD()
             item.skillDamage *= 2 * 1.2
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 1.2 * 2))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 1.2 * 2))
     pass
 
 
@@ -1845,7 +1845,7 @@ def oath_skill_2070503(char: CharacterProperty, oathEffectDamage: list[float] =
         if item.learnLv == 100:
             cd = item.getSkillCD()
             # item.skillDamage *= 2
-    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880)))
+    char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880)))
     pass
 
 
@@ -1856,35 +1856,35 @@ def oath_skill_2070503(char: CharacterProperty, oathEffectDamage: list[float] =
 
 @register
 def oath_skill_2080101(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, 0, 305500)))
-    char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 1, 98350)))
+    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, SpeedA=0.1, SpeedR=0.1)
     pass
 
 
 @register
 def oath_skill_2080102(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, 0, 305500)))
-    char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 1, 98350)))
+    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, SpeedA=0.1, SpeedR=0.1)
     pass
 
 
 @register
 def oath_skill_2080103(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, 0, 305500)))
-    char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 1, 98350)))
+    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, SpeedA=0.1, SpeedR=0.1)
     pass
 
 
 @register
 def oath_skill_2080201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 17010)))
+    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 17010)))
     if check_suit(char):
         # 原套装效果
         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(oathEffectDamage, 0, 98350)))
+        char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
         char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
         # 誓约追加
         char.SetStatus(SkillAttack=0.035)
@@ -1893,25 +1893,25 @@ 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, 0, 305500)))
+    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
     pass
 
 
 @register
 def oath_skill_2080203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 170100)))
-    char.equ_effect.append(EquEffect(name='地壳裂痕', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 132300)))
+    char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 170100)))
+    char.equ_effect.append(EquEffect(name='地壳裂痕', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 132300)))
     char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
     pass
 
 
 @register
 def oath_skill_2080301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 22680)))
+    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 22680)))
     if check_suit(char):
         # 原套装效果
         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(oathEffectDamage, 0, 98350)))
+        char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
         char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
         # 誓约追加
         char.SetStatus(SkillAttack=0.035)
@@ -1920,25 +1920,25 @@ 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, 0, 305500)))
+    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
     pass
 
 
 @register
 def oath_skill_2080303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 255150)))
-    char.equ_effect.append(EquEffect(name='地壳爆裂', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 198450)))
+    char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 255150)))
+    char.equ_effect.append(EquEffect(name='地壳爆裂', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 198450)))
     char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
     pass
 
 
 @register
 def oath_skill_2080401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 28350)))
+    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 28350)))
     if check_suit(char):
         # 原套装效果
         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(oathEffectDamage, 0, 98350)))
+        char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
         char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
         # 誓约追加
         char.SetStatus(SkillAttack=0.035)
@@ -1947,25 +1947,25 @@ 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, 0, 305500)))
+    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
     pass
 
 
 @register
 def oath_skill_2080403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 340200)))
-    char.equ_effect.append(EquEffect(name='大地震', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 264600)))
+    char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 340200)))
+    char.equ_effect.append(EquEffect(name='大地震', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 264600)))
     char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
     pass
 
 
 @register
 def oath_skill_2080501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 34020)))
+    char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 34020)))
     if check_suit(char):
         # 原套装效果
         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(oathEffectDamage, 0, 98350)))
+        char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350)))
         char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
         # 誓约追加
         char.SetStatus(SkillAttack=0.035)
@@ -1975,15 +1975,15 @@ 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, 0, 305500)))
+    char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500)))
     char.SetStatus(SpeedM=0.1 + 0.1, SpeedA=0.1 + 0.1, SpeedR=0.1 + 0.1)
     pass
 
 
 @register
 def oath_skill_2080503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='巨型陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 425250)))
-    char.equ_effect.append(EquEffect(name='熔岩爆炸', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 330750)))
+    char.equ_effect.append(EquEffect(name='巨型陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 425250)))
+    char.equ_effect.append(EquEffect(name='熔岩爆炸', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 330750)))
     char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1)
     pass
 
@@ -2048,19 +2048,19 @@ def oath_skill_2090203(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
     char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
     # 誓约追加
-    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200)))
+    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 0, 25200)))
     pass
 
 
 @register
 def oath_skill_2090301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 0, 183330)))
+    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 183330)))
     if check_suit(char):
         # 原套装效果
-        char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 1, 12900)))
-        char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 2, 24050)))
-        char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 3, 416700)))
-        char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 295370)))
+        char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
+        char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
+        char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 2, 416700)))
+        char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 3, 295370)))
         # 誓约追加
         char.SetStatus(SkillAttack=0.03)
     pass
@@ -2081,20 +2081,20 @@ def oath_skill_2090303(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
     char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
     # 誓约追加
-    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200)))
-    char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(suitEffectDamage, 3, 94500)))
+    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 0, 25200)))
+    char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500)))
     pass
 
 
 @register
 def oath_skill_2090401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 0, 183330)))
+    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 183330)))
     if check_suit(char):
         # 原套装效果
-        char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 1, 12900)))
-        char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 2, 24050)))
-        char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 3, 416700)))
-        char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 295370)))
+        char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
+        char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
+        char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 2, 416700)))
+        char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 3, 295370)))
         # 誓约追加
         char.SetStatus(SkillAttack=0.03)
     pass
@@ -2115,21 +2115,21 @@ def oath_skill_2090403(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
     char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
     # 誓约追加
-    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200)))
-    char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(suitEffectDamage, 3, 94500)))
-    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 0, 315000)))
+    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 0, 25200)))
+    char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500)))
+    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 2, 315000)))
     pass
 
 
 @register
 def oath_skill_2090501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
-    char.equ_effect.append(EquEffect(name='真：天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 0, 281100)))
+    char.equ_effect.append(EquEffect(name='真：天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 281100)))
     if check_suit(char):
         # 原套装效果
-        char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 1, 12900)))
-        char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 2, 24050)))
-        char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 3, 416700)))
-        char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 295370)))
+        char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
+        char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
+        char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 2, 416700)))
+        char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 3, 295370)))
         # 誓约追加
         char.SetStatus(SkillAttack=0.03)
     pass
@@ -2140,7 +2140,7 @@ def oath_skill_2090502(char: CharacterProperty, oathEffectDamage: list[float] =
     char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
     char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
     char.SetStatus(SpeedA=0.2, SpeedM=0.2, SpeedR=0.2)
-    char.equ_effect.append(EquEffect(name='末日黄昏', icon='/equipment/skill/117.png', cd=140, data=effect_damage(suitEffectDamage, 2, 992250)))
+    char.equ_effect.append(EquEffect(name='末日黄昏', icon='/equipment/skill/117.png', cd=140, data=effect_damage(oathEffectDamage, 0, 992250)))
     pass
 
 
@@ -2148,13 +2148,13 @@ def oath_skill_2090502(char: CharacterProperty, oathEffectDamage: list[float] =
 def oath_skill_2090503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []):
     char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900)))
     char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050)))
-    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200)))
-    char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(suitEffectDamage, 3, 94500)))
-    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 0, 315000)))
+    char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 0, 25200)))
+    char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500)))
+    char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 2, 315000)))
 
-    char.equ_effect.append(EquEffect(name='一击[超越]', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 1, 25200) + effect_damage(oathEffectDamage, 2, 11340)))
-    char.equ_effect.append(EquEffect(name='审判[超越]', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 3, 94500) + effect_damage(oathEffectDamage, 4, 42525)))
-    char.equ_effect.append(EquEffect(name='天罚[超越]', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 5, 315000) + effect_damage(oathEffectDamage, 6, 141750)))
+    char.equ_effect.append(EquEffect(name='一击[超越]', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 0, 25200) + effect_damage(oathEffectDamage, 2, 11340)))
+    char.equ_effect.append(EquEffect(name='审判[超越]', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500) + effect_damage(oathEffectDamage, 4, 42525)))
+    char.equ_effect.append(EquEffect(name='天罚[超越]', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 2, 315000) + effect_damage(oathEffectDamage, 6, 141750)))
     pass
 
 
diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db
index 2ca8c7c3e3eec803b8b8469ee58b31937bd84825..7334f1023d46851af02de448dafacad4e6b34796 100644
GIT binary patch
delta 12588
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%0D_
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

delta 11823
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
MFYW86dm#IN0P%>RDgXcg