From 7397d8bc085995806c14a1b95bd51c7d19832747 Mon Sep 17 00:00:00 2001 From: Aluxes <39981645+AshenAshes@users.noreply.github.com> Date: Wed, 31 Jan 2024 06:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=A4=E5=AE=B3=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/character/嘉明/calc.js | 21 +++--- resources/meta-gs/character/闲云/calc.js | 73 +++++++++----------- resources/meta-gs/character/闲云/data.json | 6 +- resources/meta-gs/weapon/desc.js | 3 +- 4 files changed, 47 insertions(+), 56 deletions(-) diff --git a/resources/meta-gs/character/嘉明/calc.js b/resources/meta-gs/character/嘉明/calc.js index af104518..2de3e99d 100644 --- a/resources/meta-gs/character/嘉明/calc.js +++ b/resources/meta-gs/character/嘉明/calc.js @@ -1,40 +1,39 @@ export const details = [{ title: '下落攻击·踏云献瑞伤害', dmg: ({ talent }, dmg) => dmg(talent.e['下落攻击·踏云献瑞伤害'], 'a3') -},{ +}, { title: '下落攻击·踏云献瑞蒸发', dmg: ({ talent }, dmg) => dmg(talent.e['下落攻击·踏云献瑞伤害'], 'a3', 'vaporize') -},{ +}, { title: '猊兽·文仔砸击伤害', dmg: ({ talent }, dmg) => dmg(talent.q['猊兽·文仔砸击伤害'], 'q') -},{ +}, { title: '猊兽·文仔砸击蒸发', dmg: ({ talent }, dmg) => dmg(talent.q['猊兽·文仔砸击伤害'], 'q', 'vaporize') }] export const defDmgIdx = 1 -export const mainAttr = 'atk,cpct,cdmg' +export const mainAttr = 'atk,cpct,cdmg,mastery' export const buffs = [{ - title: '嘉明天赋:生命值低于50%时,获得[healInc]%受治疗加成。生命值高于或等于50%时,下落攻击·踏云献瑞造成的伤害提升[a3Dmg]%。', + title: '嘉明天赋:生命值低于50%时,获得[heal]%受治疗加成。生命值高于或等于50%时,下落攻击·踏云献瑞造成的伤害提升[a3Dmg]%。', data: { - healInc: 20, + heal: 20, a3Dmg: 20 } -},{ +}, { title: '嘉明2命:受到治疗溢出,攻击力提升[atkPct]%', - sort: 1, cons: 2, data: { atkPct: 20 } -},{ +}, { title: '嘉明6命:下落攻击·踏云献瑞的暴击率提升[a3Cpct]%,暴击伤害提升[a3Cdmg]%', cons: 6, data: { a3Cpct: 20, a3Cdmg: 40 } -}] +}, 'vaporize'] -export const createdBy = 'liangshi' \ No newline at end of file +export const createdBy = 'liangshi' diff --git a/resources/meta-gs/character/闲云/calc.js b/resources/meta-gs/character/闲云/calc.js index 3aaa9ea9..41bb6342 100644 --- a/resources/meta-gs/character/闲云/calc.js +++ b/resources/meta-gs/character/闲云/calc.js @@ -1,68 +1,59 @@ export const details = [{ title: '仙力助推下落攻击伤害提升值', - dmg: ({ calc, attr, cons }) => { - let cons2 = cons * 1 >= 2 ? ( Math.min( calc(attr.atk) * 136 / 100 , 6800 ) ) : 0 + dmg: ({ attr, cons }) => { return { - avg: Math.min( calc(attr.atk) * 170 / 100 , 8500 ) + cons2 + avg: cons < 2 ? Math.min(attr.atk * 2, 9000) : Math.min(attr.atk * 4, 18000) } } -},{ - title: '步天梯伤害', - dmg: ({ talent }, dmg) => dmg(talent.e['仙人姿态路径伤害'], 'e') -},{ - title: '一段跳冲击波伤害', +}, { + title: 'E释放伤害', + dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e') +}, { + title: 'E一段跳冲击波伤害', params: { btt: 1 }, - dmg: ({ talent }, dmg) => dmg(talent.e['一段跳 · 鹤形追击伤害'], 'a3') -},{ - title: '二段跳冲击波伤害', + dmg: ({ talent }, dmg) => dmg(talent.e['闲云冲击波伤害'][0], 'a3') +}, { + title: 'E二段跳冲击波伤害', params: { btt: 2 }, - dmg: ({ talent }, dmg) => dmg(talent.e['二段跳 · 鹤形追击伤害'], 'a3') -},{ - title: '三段跳冲击波伤害', + dmg: ({ talent }, dmg) => dmg(talent.e['闲云冲击波伤害'][1], 'a3') +}, { + title: 'E三段跳冲击波伤害', params: { btt: 3 }, - dmg: ({ talent }, dmg) => dmg(talent.e['三段跳 · 鹤形追击伤害'], 'a3') -},{ - title: '暮集竹星释放伤害', - dmg: ({ talent }, dmg) => dmg(talent.q['施放瞬间伤害'], 'q') -},{ - title: '暮集竹星释放治疗', - dmg: ({ attr, calc, talent, cons }, { heal }) => { - let xz = talent.q['施放瞬间治疗2'][0] * calc(attr.atk) / 100 + talent.q['施放瞬间治疗2'][1] * 1 - return heal(xz) - } + dmg: ({ talent }, dmg) => dmg(talent.e['闲云冲击波伤害'][2], 'a3') +}, { + title: 'Q释放伤害', + dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q') +}, { + title: 'Q释放治疗量', + dmg: ({ attr, talent }, { heal }) => heal(talent.q['治疗量2'][0] * attr.atk / 100 + talent.q['治疗量2'][1]) +}, { + title: 'Q持续治疗量', + dmg: ({ attr, talent }, { heal }) => heal(talent.q['持续治疗量2'][0] * attr.atk / 100 + talent.q['持续治疗量2'][1]) }] export const defDmgIdx = 0 -export const mainAttr = 'atk,cpct,cdmg' +export const mainAttr = 'atk,cpct,cdmg,heal' export const buffs = [{ title: '闲云天赋:Q后下落攻击坠地冲击造成的伤害提升[a3Plus]', sort: 9, data: { - a3Plus: ({ attr, calc }) => Math.min( calc(attr.atk) * 136 / 100 , 8500 ) + a3Plus: ({ attr, cons }) => cons < 2 ? Math.min(attr.atk * 2, 9000) : Math.min(attr.atk * 4, 18000) } -},{ - title: '闲云2命:施放朝起鹤云后,攻击力提升[atkPct]%', - sort: 1, +}, { + title: '闲云2命:施放E后,攻击力提升[atkPct]%', cons: 2, data: { atkPct: 20 } -},{ - title: '闲云2命:Q后下落攻击坠地冲击造成的伤害额外提升[a3Plus]', - sort: 9, - cons: 2, - data: { - a3Plus: ({ attr, calc }) => Math.min( calc(attr.atk) * 170 / 100 , 6800 ) - } -},{ - check: ({ params }) => params.btt !== undefined , +}, { + check: ({ params }) => params.btt !== undefined, title: '闲云6命:施展了[buffCount]次步天梯,闲云冲击波的暴击伤害提升[a3Cdmg]%', cons: 6, data: { - buffCount: ({ params }) => params.btt , - a3Cdmg: ({ params }) => 15 + Math.floor( params.btt / 2 ) * 20 + Math.floor( params.btt / 3 ) * 35 + buffCount: ({ params }) => params.btt, + a3Cdmg: ({ params }) => 15 + Math.floor(params.btt / 2) * 20 + Math.floor(params.btt / 3) * 35 } }] -export const createdBy = 'liangshi' \ No newline at end of file +export const createdBy = 'liangshi' diff --git a/resources/meta-gs/character/闲云/data.json b/resources/meta-gs/character/闲云/data.json index bcb501a3..975ac059 100644 --- a/resources/meta-gs/character/闲云/data.json +++ b/resources/meta-gs/character/闲云/data.json @@ -370,8 +370,8 @@ "·初始拥有8层仙力助推。拥有仙力助推时,将提升队伍中附近的当前场上角色的跳跃高度。", "·当前场上角色完成下落攻击时,竹星将消耗一层仙力助推,造成风元素范围伤害。", "场上至多存在一个竹星。", - "这是继机关烹饪神机、追风滑雪神机、杂务扫理神机、流木运物神机、花羽叶月神机之后的新发明,属于「星月造化」系列。该系列是用来送给欣赏的人类小辈的,所以并没有某位半仙的份。只可惜面对这件竹星时,某女徒弟面无表情地说了:「不要。」", - "留云只好把竹星留在身边。" + "这是继机关烹饪神机、追风滑雪神机、杂务扫理神机、流木运物神机、花羽叶月神机之后的新发明,属于「星月造化」系列。该系列是用来送给欣赏的人类小辈的,所以并没有某位半仙的份。只可惜面对这件竹星时,某女徒弟面无表情地说了:「不要。」", + "留云只好把竹星留在身边。" ], "tables": [ { @@ -1171,7 +1171,7 @@ "1": { "name": "借风洗尘缘", "desc": [ - "

朝起鹤云的可用次数增加1次。

" + "朝起鹤云的可用次数增加1次。" ] }, "2": { diff --git a/resources/meta-gs/weapon/desc.js b/resources/meta-gs/weapon/desc.js index 56d62651..f458cfca 100644 --- a/resources/meta-gs/weapon/desc.js +++ b/resources/meta-gs/weapon/desc.js @@ -11,6 +11,7 @@ export const descFix = { 神乐之真意: '施放战技时获得神乐舞效果,持续16秒,至多叠加3层。每层使角色的战技伤害提高$[0]。3层时,角色获得$[1]元素伤害加成。', 盈满之实: '触发元素反应后,获得效果:每层精通提升$[0]点,攻击力降低5%,至多5层,处于后台时也能触发。未触发元素反应时将每6秒失去一层。', 流浪的晚星: '每10秒基于精通的$[0]提升攻击力,并基于该提升的30%为其他角色提升攻击力,持续12秒,处于后台时也能触发,多件同名武器可叠加。', + 鹤鸣余音: '下落攻击命中敌人后,所有角色下落攻击造成的伤害提高$[0],持续20秒。队伍中角色下落攻击命中敌人时,装备者恢复$[1]点能量,每0.7秒只能触发一次,处于后台时也生效。', // 单手剑 降临之剑: '普通攻击与重击命中敌人后有50%概率在小范围内造成200%攻击力的伤害。该效果每10秒只能触发一次;
此外,旅行者装备降临之剑时,攻击力提升66点。', @@ -36,7 +37,7 @@ export const descFix = { 玛海菈的水色: '每10秒基于精通的$[0]提升攻击力,并基于该提升的30%为其他角色提升攻击力,持续12秒。处于后台时也能触发,多件同名武器可叠加。', 雪葬的星银: '普攻与重击命中敌人时,有$[0]概率造成$[1]攻击力的范围伤害。若敌人处于冰元素影响下,则造成$[2]攻击力的伤害。每10秒至多一次。', 裁断: '攻击力提升$[0];获取结晶晶片时,为装备者赋予1枚约印,使下一个战技伤害提升$[1],约印持续15秒,至多持有2枚。', - 苇海信标:'战技命中敌人提升$[0]攻击力;受到伤害提升$[1]攻击力,各持续8秒,后台也能触发。无护盾时,生命值上限提高$[2]。', + 苇海信标: '战技命中敌人提升$[0]攻击力;受到伤害提升$[1]攻击力,各持续8秒,后台也能触发。无护盾时,生命值上限提高$[2]。', // 长柄武器 勘探钻机: '受到或进行治疗时,获得标记,最多3层,处于后台也能获得。施放战技或爆发时,消耗标记:每枚标记提高$[0]攻击力与$[1]元素伤害加成。',