From 5682e92b08b6209fb2e066ad764f0661a5135a6d Mon Sep 17 00:00:00 2001
From: liangshi <1142607614@qq.com>
Date: Wed, 20 Nov 2024 14:16:15 +0800
Subject: [PATCH] =?UTF-8?q?5.2=E5=86=85=E5=AE=B9=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/ProfileDmg.js                      |  1 +
 models/dmg/DmgCalcMeta.js                 |  8 +++---
 resources/meta-gs/weapon/bow/calc.js      | 32 ++++++++++++++++++++---
 resources/meta-gs/weapon/catalyst/calc.js |  6 +++++
 resources/meta-gs/weapon/sword/calc.js    | 14 ++++++++--
 5 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/models/ProfileDmg.js b/models/ProfileDmg.js
index 9e92fe53..f83b1e12 100644
--- a/models/ProfileDmg.js
+++ b/models/ProfileDmg.js
@@ -128,6 +128,7 @@ export default class ProfileDmg extends Base {
     let talent = this.talent()
 
     let meta = {
+      characterName: this.char?.name,
       level: profile.level,
       cons: profile.cons * 1,
       talent,
diff --git a/models/dmg/DmgCalcMeta.js b/models/dmg/DmgCalcMeta.js
index 498e4a1a..3df6f256 100644
--- a/models/dmg/DmgCalcMeta.js
+++ b/models/dmg/DmgCalcMeta.js
@@ -9,11 +9,11 @@ export const erType = {
   crystallize: { type: 'shield', num: () => 1, title: '结晶' },
   // 剧变反应
   burning: { type: 'fusion', num: () => 1, title: '燃烧' },
-  superConduct: { type: 'fusion', num: () => 2, title: '超导' },
+  superConduct: { type: 'fusion', num: () => 6, title: '超导' },
   swirl: { type: 'fusion', num: () => 2.4, title: '扩散' },
-  electroCharged: { type: 'fusion', num: () => 4.8, title: '感电' },
-  shatter: { type: 'fusion', num: () => 6, title: '碎冰' },
-  overloaded: { type: 'fusion', num: () => 8, title: '超载' },
+  electroCharged: { type: 'fusion', num: () => 8, title: '感电' },
+  shatter: { type: 'fusion', num: () => 12, title: '碎冰' },
+  overloaded: { type: 'fusion', num: () => 11, title: '超载' },
   bloom: { type: 'fusion', num: () => 8, title: '绽放' },
   burgeon: { type: 'fusion', num: () => 12, title: '烈绽放' },
   hyperBloom: { type: 'fusion', num: () => 12, title: '超绽放' },
diff --git a/resources/meta-gs/weapon/bow/calc.js b/resources/meta-gs/weapon/bow/calc.js
index 9b9cf431..3ea64e3d 100644
--- a/resources/meta-gs/weapon/bow/calc.js
+++ b/resources/meta-gs/weapon/bow/calc.js
@@ -124,14 +124,19 @@ export default function (step, staticStep) {
       }
     },
 
-    掠食者: {
+    掠食者: [{
       check: ({ element }) => element === '冰',
-      title: '满Buff普攻与重击伤害提高[aDmg]%，埃洛伊攻击力提升66',
+      title: '满Buff普攻与重击伤害提高[aDmg]%',
+      refine: {
+        aDmg: [20]
+      }
+    }, {
+      check: ({ characterName }) => characterName === '埃洛伊',
+      title: '攻击力提升66点',
       refine: {
-        aDmg: [20],
         atkPlus: 66
       }
-    },
+    }],
 
     曚云之月: {
       title: '满层元素爆发伤害提高[qDmg]%',
@@ -276,6 +281,25 @@ export default function (step, staticStep) {
         atkPct: [4.8 * 3, 6 * 3, 7.2 * 3, 8.4 * 3, 9.6 * 3],
         mastery: step(24)
       }
+    },
+    星鹫赤羽: [{
+      check: ({ element }) => !['草', '岩'].includes(element),
+      title: '触发扩散反应后，攻击力提高[atkPct]%',
+      refine: {
+        atkPct: step(24)
+      }
+    }, {
+      title: '存在至少2名元素类型不同的角色，重击造成的伤害提高[a2Dmg]%,元素爆发伤害提高[qDmg]%',
+      refine: {
+        a2Dmg: step(48),
+        qDmg: step(24)
+      }
+    }],
+    缀花之翎: {
+      title: '重击造成的伤害提升[a2Dmg]%',
+      refine: {
+        a2Dmg: step(6 * 6)
+      }
     }
   }
 }
diff --git a/resources/meta-gs/weapon/catalyst/calc.js b/resources/meta-gs/weapon/catalyst/calc.js
index c9c63aa3..0c3fd6e7 100644
--- a/resources/meta-gs/weapon/catalyst/calc.js
+++ b/resources/meta-gs/weapon/catalyst/calc.js
@@ -206,6 +206,12 @@ export default function (step, staticStep) {
       data: {
         aDmg: ({ attr, calc, refine }) => Math.min(Math.floor(calc(attr.hp) / 1000) * step(0.6, 0.1)[refine], step(16)[refine])
       }
+    },
+    乘浪的回旋: {
+      title: '施放元素战技后，生命值上限提升[hpPct]%',
+      refine: {
+        hpPct: step(44)
+      }
     }
   }
 }
diff --git a/resources/meta-gs/weapon/sword/calc.js b/resources/meta-gs/weapon/sword/calc.js
index 7acb73b6..00a2b12d 100644
--- a/resources/meta-gs/weapon/sword/calc.js
+++ b/resources/meta-gs/weapon/sword/calc.js
@@ -15,7 +15,8 @@ export default function (step, staticStep) {
       }
     },
     降临之剑: {
-      title: '旅行者攻击力提高[atkPlus]',
+      check: ({ characterName }) => ['空', '荧'].includes(characterName),
+      title: '攻击力提高[atkPlus]点',
       data: {
         atkPlus: 66
       }
@@ -285,6 +286,15 @@ export default function (step, staticStep) {
       data: {
         dmg: ({ attr, calc, refine }) => Math.min(calc(attr.def) / 1000 * step(8)[refine], step(25.6)[refine])
       }
-    }]
+    }],
+    厄水之祸: {
+      title: '处于护盾庇护下,普攻和重击造成伤害提升[aDmg]%暴击率提升[aCpct]%',
+      refine: {
+        aDmg: step(20),
+        a2Dmg: step(20),
+        aCpct: step(8),
+        a2Cpct: step(8)
+      }
+    }
   }
 }