From a02c25acf6234cf65250bbab3e77c0b8d273dbdc Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Mon, 19 Feb 2024 18:21:52 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AE=9D=E5=91=BD?= =?UTF-8?q?=E9=95=BF=E5=AD=98=E7=9A=84=E8=8E=B3=E8=80=85=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E6=95=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-sr/artifact/calc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/meta-sr/artifact/calc.js b/resources/meta-sr/artifact/calc.js index 8a62987f..49e8b093 100644 --- a/resources/meta-sr/artifact/calc.js +++ b/resources/meta-sr/artifact/calc.js @@ -93,9 +93,9 @@ export default { 宝命长存的莳者: { 2: attr('hpPct', 12), 4: { - title: '消耗生命2层提高暴击率12%', + title: '消耗生命2层提高暴击率16%', data: { - cpct: 12 + cpct: 16 } } }, From eda7d3162e7c4dbc455a7582a92e940eed76a49b Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Mon, 19 Feb 2024 18:27:06 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=9C=89=E4=B9=90=E5=BE=A1=E7=B0=BE?= =?UTF-8?q?=E5=88=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/weapon/sword/calc.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/meta-gs/weapon/sword/calc.js b/resources/meta-gs/weapon/sword/calc.js index 4a086e65..5cf1d6b8 100644 --- a/resources/meta-gs/weapon/sword/calc.js +++ b/resources/meta-gs/weapon/sword/calc.js @@ -247,6 +247,13 @@ export default function (step, staticStep) { refine: { hpPct: step(14 * 2) } + }], + 有乐御簾切: [staticStep('defPct', 20),{ + title: '附近的角色在场上造成岩元素伤害后，普通攻击伤害提升[aDmg]%，元素战伤害提升[eDmg]%；', + refine: { + aDmg: step(16), + eDmg: step(24) + } }] } } From e4a6dc3c5de454e7a3dfcfc05f985fae8d53025e Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Mon, 19 Feb 2024 18:49:03 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8D=83=E7=BB=87=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/character/千织/calc.js | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 resources/meta-gs/character/千织/calc.js diff --git a/resources/meta-gs/character/千织/calc.js b/resources/meta-gs/character/千织/calc.js new file mode 100644 index 00000000..37d0b1e6 --- /dev/null +++ b/resources/meta-gs/character/千织/calc.js @@ -0,0 +1,42 @@ +export const details = [ +{ + title: 'E后普攻一段', + dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a') +}, +{ + title: 'E突刺伤害', + dmg: ({ talent, attr }, { basic }) => basic(talent.e['上挑攻击伤害2'][0] * attr.atk / 100 + talent.e['上挑攻击伤害2'][1] * attr.def / 100 , 'e') +}, +{ + title: 'E人偶伤害', + dmg: ({ talent, attr }, { basic }) => basic(talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def / 100 , 'e') +}, +{ + title: '2命人偶切斩伤害', + check: ({ cons }) => cons >= 2, + dmg: ({ talent, attr }, { basic }) => basic( ( talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def / 100 ) * 1.7 , 'e') +}, +{ + title: 'Q伤害', + dmg: ({ talent, attr }, { basic }) => basic(talent.q['技能伤害2'][0] * attr.atk / 100 + talent.q['技能伤害2'][1] * attr.def / 100 , 'q') +}] + +export const defDmgIdx = 2 +export const mainAttr = 'atk,def,cpct,cdmg,dmg' + +export const buffs = [ +{ + title: '千织天赋：队伍中角色创造岩造物时，获得[dmg]%岩伤加成', + data: { + dmg: 20 + } +}, +{ + title: '千织6命：普攻造成的伤害提升[aPlus]', + cons: 6, + data: { + aPlus: ({ attr }) => attr.def * 235 / 100 + } +}] + +export const createdBy = 'liangshi' From f06164abb9ac0d9aadb91f82ca8ee36989b58419 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Mon, 19 Feb 2024 19:44:55 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8D=83=E7=BB=87=E9=98=9F=E4=BC=8D?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/character/千织/calc.js | 22 ++---- .../meta-gs/character/千织/calc_auto.js | 73 +++++++++++++++++++ 2 files changed, 81 insertions(+), 14 deletions(-) create mode 100644 resources/meta-gs/character/千织/calc_auto.js diff --git a/resources/meta-gs/character/千织/calc.js b/resources/meta-gs/character/千织/calc.js index 37d0b1e6..440898ee 100644 --- a/resources/meta-gs/character/千织/calc.js +++ b/resources/meta-gs/character/千织/calc.js @@ -1,22 +1,17 @@ -export const details = [ -{ +export const details = [{ title: 'E后普攻一段', dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a') -}, -{ +},{ title: 'E突刺伤害', dmg: ({ talent, attr }, { basic }) => basic(talent.e['上挑攻击伤害2'][0] * attr.atk / 100 + talent.e['上挑攻击伤害2'][1] * attr.def / 100 , 'e') -}, -{ +},{ title: 'E人偶伤害', dmg: ({ talent, attr }, { basic }) => basic(talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def / 100 , 'e') -}, -{ +},{ title: '2命人偶切斩伤害', check: ({ cons }) => cons >= 2, dmg: ({ talent, attr }, { basic }) => basic( ( talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def / 100 ) * 1.7 , 'e') -}, -{ +},{ title: 'Q伤害', dmg: ({ talent, attr }, { basic }) => basic(talent.q['技能伤害2'][0] * attr.atk / 100 + talent.q['技能伤害2'][1] * attr.def / 100 , 'q') }] @@ -24,15 +19,14 @@ export const details = [ export const defDmgIdx = 2 export const mainAttr = 'atk,def,cpct,cdmg,dmg' -export const buffs = [ -{ +export const buffs = [{ title: '千织天赋：队伍中角色创造岩造物时，获得[dmg]%岩伤加成', data: { dmg: 20 } -}, -{ +},{ title: '千织6命：普攻造成的伤害提升[aPlus]', + sort: 9, cons: 6, data: { aPlus: ({ attr }) => attr.def * 235 / 100 diff --git a/resources/meta-gs/character/千织/calc_auto.js b/resources/meta-gs/character/千织/calc_auto.js new file mode 100644 index 00000000..4b35f6c7 --- /dev/null +++ b/resources/meta-gs/character/千织/calc_auto.js @@ -0,0 +1,73 @@ +export const details = [{ + title: 'E后普攻一段', + dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a') +},{ + title: 'E突刺伤害', + dmg: ({ talent, attr }, { basic }) => basic(talent.e['上挑攻击伤害2'][0] * attr.atk / 100 + talent.e['上挑攻击伤害2'][1] * attr.def / 100 , 'e') +},{ + title: 'E人偶伤害', + dmg: ({ talent, attr }, { basic }) => basic(talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def / 100 , 'e') +},{ + title: '2命人偶切斩伤害', + check: ({ cons }) => cons >= 2, + dmg: ({ talent, attr }, { basic }) => basic( ( talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def / 100 ) * 1.7 , 'e') +},{ + title: 'Q伤害', + dmg: ({ talent, attr }, { basic }) => basic(talent.q['技能伤害2'][0] * attr.atk / 100 + talent.q['技能伤害2'][1] * attr.def / 100 , 'q') +},{ + title: '一五千钟 E切后台10斩2协', + check: ({ cons }) => cons < 4, + params: { team: true }, + dmg: ({ talent, attr, cons }, { basic }) => { + let e1 = basic(talent.e['上挑攻击伤害2'][0] * attr.atk / 100 + talent.e['上挑攻击伤害2'][1] * attr.def/ 100 , 'e') + let e2 = basic(talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def/ 100 , 'e') + return { + dmg: e1.dmg * 3 + e2.dmg * 10, + avg: e1.avg * 3 + e2.avg * 10 + } + } +},{ + title: '一五千钟 E切后台10斩2协3绢', + check: ({ cons }) => cons >= 4, + params: { team: true }, + dmg: ({ talent, attr, cons }, { basic }) => { + let e1 = basic(talent.e['上挑攻击伤害2'][0] * attr.atk / 100 + talent.e['上挑攻击伤害2'][1] * attr.def / 100, 'e') + let e2 = basic(talent.e['袖伤害2'][0] * attr.atk / 100 + talent.e['袖伤害2'][1] * attr.def / 100, 'e') + return { + dmg: e1.dmg * 3 + e2.dmg * 10 + e2.dmg * 3 * 1.7, + avg: e1.avg * 3 + e2.avg * 10 + e2.avg * 3 * 1.7 + } + } +}] + +export const defDmgIdx = 2 +export const mainAttr = 'atk,def,cpct,cdmg,dmg' + +export const buffs = [{ + title: '千织天赋：队伍中角色创造岩造物时，获得[dmg]%岩伤加成', + data: { + dmg: 20 + } +},{ + title: '千织6命：普攻造成的伤害提升[aPlus]', + sort: 9, + cons: 6, + data: { + aPlus: ({ attr }) => attr.def * 235 / 100 + } +}, { + check: ({ params }) => params.team === true, + title: '6命五郎：增加[defPct]%防御力，增加[cdmg]%暴击伤害', + data: { + cdmg: 40, + defPct: 25 + } +}, { + check: ({ params }) => params.team === true, + title: '钟离：降低敌人[kx]%全抗', + data: { + kx: 20 + } +}] + +export const createdBy = 'liangshi' From c0bdf36badac302e154396c221342bcbdf6044c9 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Mon, 19 Feb 2024 19:57:53 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=A1=A5=E4=B8=80=E4=B8=8B=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E5=85=B1=E9=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/character/千织/calc_auto.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/meta-gs/character/千织/calc_auto.js b/resources/meta-gs/character/千织/calc_auto.js index 4b35f6c7..26af610f 100644 --- a/resources/meta-gs/character/千织/calc_auto.js +++ b/resources/meta-gs/character/千织/calc_auto.js @@ -55,19 +55,26 @@ export const buffs = [{ data: { aPlus: ({ attr }) => attr.def * 235 / 100 } -}, { +},{ check: ({ params }) => params.team === true, title: '6命五郎：增加[defPct]%防御力，增加[cdmg]%暴击伤害', data: { cdmg: 40, defPct: 25 } -}, { +},{ check: ({ params }) => params.team === true, title: '钟离：降低敌人[kx]%全抗', data: { kx: 20 } +},{ + check: ({ params }) => params.team === true, + title: '坚定之岩：造成的伤害提升[dmg]%，降低敌人[kx]%岩元素抗性', + data: { + dmg: 15, + kx: 20 + } }] export const createdBy = 'liangshi' From baf2e88e640c2ae285313a566817ebf75369adbe Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Mon, 19 Feb 2024 20:06:54 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=AD=A6=E5=99=A8=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/weapon/sword/calc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/meta-gs/weapon/sword/calc.js b/resources/meta-gs/weapon/sword/calc.js index 5cf1d6b8..523d5cc3 100644 --- a/resources/meta-gs/weapon/sword/calc.js +++ b/resources/meta-gs/weapon/sword/calc.js @@ -251,8 +251,8 @@ export default function (step, staticStep) { 有乐御簾切: [staticStep('defPct', 20),{ title: '附近的角色在场上造成岩元素伤害后，普通攻击伤害提升[aDmg]%，元素战伤害提升[eDmg]%；', refine: { - aDmg: step(16), - eDmg: step(24) + aDmg: step(16 * 2), + eDmg: step(24 * 2) } }] } From 4ab862c72b986907abacffeb3f8568fb1a40e36e Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Tue, 20 Feb 2024 00:27:51 +0000 Subject: [PATCH 07/11] =?UTF-8?q?=E9=B9=A4=E9=B8=A3=E4=BD=99=E9=9F=B3?= =?UTF-8?q?=E5=8A=A0=E6=88=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangshi <1142607614@qq.com> --- resources/meta-gs/weapon/catalyst/calc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta-gs/weapon/catalyst/calc.js b/resources/meta-gs/weapon/catalyst/calc.js index 410302c9..4b70da4b 100644 --- a/resources/meta-gs/weapon/catalyst/calc.js +++ b/resources/meta-gs/weapon/catalyst/calc.js @@ -209,7 +209,7 @@ export default function (step, staticStep) { 鹤鸣余音: [{ title: '下落攻击命中敌人后，下落攻击造成的伤害提高[a3Dmg]%', refine: { - a3Dmg: step(28) + a3Dmg: step(28, 13) } }] } From 564c6f2f9043f3f8838e42f61bddfd6f6f61d10e Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Thu, 22 Feb 2024 01:18:24 +0000 Subject: [PATCH 08/11] =?UTF-8?q?update=20resources/meta-gs/character/?= =?UTF-8?q?=E9=97=B2=E4=BA=91/calc.js.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liangshi <1142607614@qq.com> --- resources/meta-gs/character/闲云/calc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta-gs/character/闲云/calc.js b/resources/meta-gs/character/闲云/calc.js index 41bb6342..40c1518c 100644 --- a/resources/meta-gs/character/闲云/calc.js +++ b/resources/meta-gs/character/闲云/calc.js @@ -52,7 +52,7 @@ export const buffs = [{ cons: 6, data: { buffCount: ({ params }) => params.btt, - a3Cdmg: ({ params }) => 15 + Math.floor(params.btt / 2) * 20 + Math.floor(params.btt / 3) * 35 + a3Cdmg: ({ params }) => (5 / 3) * Math.pow(params.btt, 3) - (5 / 2) * Math.pow(params.btt, 2) + (95 / 6) * params.btt } }] From 625a44065ad948a2dcf6ad97f2449181083bf9ca Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Sat, 2 Mar 2024 15:06:11 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BD=BF=E8=A7=92=E8=89=B2=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E7=B2=BE=E9=80=9A=E4=B8=BA0=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E5=8F=8D=E5=BA=94=E5=8A=A0=E6=88=90=E6=88=96?= =?UTF-8?q?=E5=8A=A0=E6=88=90=E4=B8=BA0=E7=9A=84buff=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E5=8A=A0=E6=88=90=E6=95=B0?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/dmg/DmgAttr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/dmg/DmgAttr.js b/models/dmg/DmgAttr.js index 28338fc0..5f6a310a 100644 --- a/models/dmg/DmgAttr.js +++ b/models/dmg/DmgAttr.js @@ -185,7 +185,7 @@ let DmgAttr = { if (lodash.isFunction(val)) { val = val(ds) } - if (!val) { + if (!val && val !== 0) { return } From 83e4123c5b9a0e0be25f3e7c7fc469363ae5afce Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Tue, 5 Mar 2024 23:41:26 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=B0=86=20=E7=89=87=E5=88=BB=EF=BC=8C?= =?UTF-8?q?=E7=95=99=E5=9C=A8=E7=9C=BC=E5=BA=95=20=E7=9A=84=E7=89=B9?= =?UTF-8?q?=E6=95=88=E8=AE=BE=E5=AE=9A=E4=B8=BA=E4=BB=85=E7=BB=88=E7=BB=93?= =?UTF-8?q?=E6=8A=80=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-sr/weapon/智识/calc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/meta-sr/weapon/智识/calc.js b/resources/meta-sr/weapon/智识/calc.js index 9b945895..83c4f06c 100644 --- a/resources/meta-sr/weapon/智识/calc.js +++ b/resources/meta-sr/weapon/智识/calc.js @@ -63,9 +63,9 @@ export default function (staticIdx, keyIdx) { staticIdx(1, 'cdmg'), (tables) => { return { - title: '根据装备者的能量上限提高伤害[dmg]%', + title: '根据装备者的能量上限提高伤害[qDmg]%', data: { - dmg: ({ attr }) => tables[2] * Math.min(attr.sp, 180) + qDmg: ({ attr }) => tables[2] * Math.min(attr.sp, 180) } } } From d48ae24e6a75b138ba7d0c2d9a106941290e7711 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Tue, 5 Mar 2024 23:45:44 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E6=B5=B7=E6=B8=8A?= =?UTF-8?q?=E7=BB=88=E6=9B=B2=20=E6=8F=8F=E8=BF=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/weapon/desc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta-gs/weapon/desc.js b/resources/meta-gs/weapon/desc.js index f458cfca..4e6cd137 100644 --- a/resources/meta-gs/weapon/desc.js +++ b/resources/meta-gs/weapon/desc.js @@ -27,7 +27,7 @@ export const descFix = { 西福斯的月光: '每10秒基于精通的$[0]提升充能效率，并基于该提升的30%为其他角色提升充能效率，持续12秒。处于后台时也能触发，多件同名武器可叠加。', 东花坊时雨: '攻击命中敌人后，为命中的一名敌人施加状态，对该状态敌人造成的伤害提升$[0]。状态持续10秒，每15秒至多一次；敌人被击败时清除CD。', 船坞长剑: '受到或进行治疗时，获得标记，最多3层，处于后台也能获得。施放战技或爆发时，消耗标记：每枚标记提高$[0]点精通，恢复$[1]点能量。每15秒至多一次。', - 海渊终曲: '施放战技时，攻击力提升$[0]，持续12秒，获得24%生命值上限的生命之契，吸收治疗满后移除。基于清除值的$[1]提升至多$[2]点攻击力，持续12秒。', + 海渊终曲: '施放战技时，攻击力提升$[0]，持续12秒，获得25%生命值上限的生命之契，吸收治疗满后移除。基于清除值的$[1]提升至多$[2]点攻击力，持续12秒。', 水仙十字之剑: '装备者不具备「始基力」时：普攻、重击、下落攻击命中时，释放芒性或荒性的能量冲击，造成$[0]攻击力的伤害。每12秒至多一次。', // 双手剑