From a4374f300b779844f9e278f607e3654695f9762c Mon Sep 17 00:00:00 2001 From: zolay Date: Mon, 19 Feb 2024 11:02:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E6=B3=95=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=88=E5=BB=BA=E8=AE=AE=E4=B8=8B=E6=AC=A1=E6=8F=90?= =?UTF-8?q?PR=E5=85=88=E8=87=AA=E5=B7=B1=E6=B5=8B=E4=B8=80=E9=81=8D?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/character/香菱/calc.js | 6 ++--- .../meta-gs/character/香菱/calc_auto.js | 23 ++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/resources/meta-gs/character/香菱/calc.js b/resources/meta-gs/character/香菱/calc.js index 88ad4de7..c94dc5f1 100644 --- a/resources/meta-gs/character/香菱/calc.js +++ b/resources/meta-gs/character/香菱/calc.js @@ -6,11 +6,11 @@ export const details = [{ dmg: ({ talent }, dmg) => dmg(talent.e['喷火伤害'], 'e', 'vaporize') }, { title: '旋火轮单次伤害', - let i = 1, + params: { isQ: true}, dmg: ({ talent }, dmg) => dmg(talent.q['旋火轮伤害'], 'q') }, { title: '旋火轮单次蒸发', - let i = 1, + params: { isQ: true }, dmg: ({ talent }, dmg) => dmg(talent.q['旋火轮伤害'], 'q', 'vaporize') }] @@ -24,7 +24,7 @@ export const buffs = [{ kx: 15 } }, { - check: i !== 1, + check: ({ params }) => !params.isQ, title: '香菱6命:旋火轮持续期间获得15%火伤加成', cons: 6, data: { diff --git a/resources/meta-gs/character/香菱/calc_auto.js b/resources/meta-gs/character/香菱/calc_auto.js index a82b0118..f831e88a 100644 --- a/resources/meta-gs/character/香菱/calc_auto.js +++ b/resources/meta-gs/character/香菱/calc_auto.js @@ -8,20 +8,15 @@ export const details = [{ dmg: ({ talent }, dmg) => dmg(talent.e['喷火伤害'], 'e', 'vaporize') }, { title: ' 旋火轮单次伤害', - let i = 1, - params: { team: false }, + params: { team: false, isQ: true }, dmg: ({ talent }, dmg) => dmg(talent.q['旋火轮伤害'], 'q') }, { title: '雷国旋火轮单次蒸发', - let i = 1, - let x = 2, - params: { team: true }, + params: { team: true, isQ: true, x: 2 }, dmg: ({ talent }, dmg) => dmg(talent.q['旋火轮伤害'], 'q', 'vaporize') },{ title: '万达旋火轮单次蒸发', - let i = 1, - let x = 1, - params: { team: true }, + params: { team: true, isQ: true, x: 1 }, dmg: ({ talent }, dmg) => dmg(talent.q['旋火轮伤害'], 'q', 'vaporize') }] @@ -39,7 +34,7 @@ export const buffs = [{ kx: 15 } }, { - check: i !== 1, + check: ({ params }) => !params.isQ, title: '香菱6命:旋火轮持续期间获得15%火伤加成', cons: 6, data: { @@ -52,19 +47,19 @@ export const buffs = [{ atkPlus: 1202.35 } }, { - check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 , + check: ({ params , artis }) => params.team === true && artis['昔日宗室之仪'] !== 4 , title: '班尼特-昔日宗室之仪:增加攻击[atkPct]%', data: { atkPct: 20 } }, { - check: x == 2, + check: ({ params }) => params.x === 2, title: '雷电将军增伤:获得[qDmg]%元素爆发增伤', data: { qDmg: 24 } },{ - check: ({ cons, params }) => cons <= 1 && params.team === true && x == 1, + check: ({ cons, params }) => cons <= 1 && params.team === true && params.x === 1, title: '精1苍古0命万叶:获得[dmg]%增伤(苍古普攻16增伤),增加[atkPct]%攻击,减抗[kx]%', data: { aDmg: 16, @@ -75,7 +70,7 @@ export const buffs = [{ kx: 40 } }, { - check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true && x == 1), + check: ({ cons, params }) => ((cons < 6 && cons > 1) && params.team === true && params.x === 1), title: '精1苍古2命万叶:获得[dmg]%增伤(苍古普攻16增伤),增加[atkPct]%攻击,减抗[kx]%,精通[mastery]', data: { aDmg: 16, @@ -87,7 +82,7 @@ export const buffs = [{ mastery: 200 } }, { - check: ({ cons, params }) => (cons >= 6 && params.team === true && x == 1), + check: ({ cons, params }) => (cons >= 6 && params.team === true && params.x === 1), title: '精5苍古6命万叶:获得[dmg]%增伤(苍古普攻32增伤),增加[atkPct]%攻击,减抗[kx]%,精通[mastery]', data: { aDmg: 32,