From f1fabd00ac7e9c5bc57be832220cb46ef60a129b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B6=E5=AE=9E=E9=9B=A8=E5=BE=88=E5=A5=BD?= <2122840028@qq.com> Date: Thu, 5 Sep 2024 10:23:50 +0800 Subject: [PATCH] =?UTF-8?q?res:=20=E8=A1=A5=E5=85=85=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E5=8F=8A5.0=E5=9B=9B=E6=98=9F=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E8=AE=A1=E7=AE=97=20(#792)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * res: 补充资源别名及5.0四星武器计算 * 删个逗号 --- resources/meta-gs/material/abbr.js | 6 +++++- resources/meta-gs/material/daily.js | 12 ++++++------ resources/meta-gs/material/data.json | 6 ------ resources/meta-gs/weapon/alias.js | 12 +++++++++++- resources/meta-gs/weapon/bow/calc.js | 7 +++++++ resources/meta-gs/weapon/catalyst/calc.js | 9 ++++++++- resources/meta-gs/weapon/claymore/calc.js | 9 ++++++++- resources/meta-gs/weapon/polearm/calc.js | 8 +++++++- resources/meta-gs/weapon/sword/calc.js | 8 +++++++- 9 files changed, 59 insertions(+), 18 deletions(-) diff --git a/resources/meta-gs/material/abbr.js b/resources/meta-gs/material/abbr.js index 9cf449e5..f23bd3c8 100644 --- a/resources/meta-gs/material/abbr.js +++ b/resources/meta-gs/material/abbr.js @@ -35,5 +35,9 @@ export const abbr = { // 枫丹武器 无垢之海的金杯: '无垢之海', 悠古弦音的回响: '悠古弦音', - 纯圣露滴的真粹: '纯圣露滴' + 纯圣露滴的真粹: '纯圣露滴', + // 纳塔武器 + 贡祭炽心的荣膺: '贡祭炽心', + 谵妄圣主的神面: '谵妄圣主', + 神合秘烟的启示: '神合秘烟' } diff --git a/resources/meta-gs/material/daily.js b/resources/meta-gs/material/daily.js index e0ccc2d9..df5a7b07 100644 --- a/resources/meta-gs/material/daily.js +++ b/resources/meta-gs/material/daily.js @@ -1,12 +1,12 @@ export default { talent: { - 1: ['自由', '繁荣', '浮世', '诤言', '公平'], - 2: ['抗争', '勤劳', '风雅', '巧思', '正义'], - 3: ['诗文', '黄金', '天光', '笃行', '秩序'] + 1: ['自由', '繁荣', '浮世', '诤言', '公平', '角逐'], + 2: ['抗争', '勤劳', '风雅', '巧思', '正义', '焚燔'], + 3: ['诗文', '黄金', '天光', '笃行', '秩序', '纷争'] }, weapon: { - 1: ['高塔孤王', '孤云寒林', '远海夷地', '谧林涓露', '悠古弦音'], - 2: ['凛风奔狼', '雾海云间', '鸣神御灵', '绿洲花园', '纯圣露滴'], - 3: ['狮牙斗士', '漆黑陨铁', '今昔剧画', '烈日威权', '无垢之海'] + 1: ['高塔孤王', '孤云寒林', '远海夷地', '谧林涓露', '悠古弦音', '贡祭炽心'], + 2: ['凛风奔狼', '雾海云间', '鸣神御灵', '绿洲花园', '纯圣露滴', '谵妄圣主'], + 3: ['狮牙斗士', '漆黑陨铁', '今昔剧画', '烈日威权', '无垢之海', '神合秘烟'] } } diff --git a/resources/meta-gs/material/data.json b/resources/meta-gs/material/data.json index 2b9465b1..b2619c3c 100644 --- a/resources/meta-gs/material/data.json +++ b/resources/meta-gs/material/data.json @@ -1273,12 +1273,6 @@ "type": "boss", "star": 4 }, - "？？？": { - "id": "n113060", - "name": "？？？", - "type": "weekly", - "star": 5 - }, "傀儡的悬丝": { "id": "n113041", "name": "傀儡的悬丝", diff --git a/resources/meta-gs/weapon/alias.js b/resources/meta-gs/weapon/alias.js index e2fe4821..445944c3 100644 --- a/resources/meta-gs/weapon/alias.js +++ b/resources/meta-gs/weapon/alias.js @@ -82,6 +82,8 @@ export const alias = { 静水流涌之辉: '静水,水神专武,净水,净水流涌之辉,静水涌流之辉', 水仙十字之剑: '水仙十字,水仙剑,水仙之剑,水仙十字圣剑,圣剑', 有乐御簾切: '有乐,有乐切,御簾切', + 赦罪: '赦罪', + 息燧之笛: '息燧', // 大剑 天空之傲: '天空大剑', @@ -109,6 +111,8 @@ export const alias = { 便携动力锯: '便携锯,动力锯,锯子', '「究极霸王超级魔剑」': '霸王超级魔剑,究极霸王超级魔剑,霸王剑,超级魔剑,霸王魔剑,究极魔剑,魔剑,极霸剑', 裁断: '斧头', + 撼地者: '撼地者', + 山王长牙: '山王,长牙', // 枪 天空之脊: '天空枪,薄荷枪', @@ -139,6 +143,7 @@ export const alias = { 沙中伟贤的对答: '沙中,沙中对答,沙中伟贤', 赤月之形: '赤月,镰刀', 柔灯挽歌: '柔灯,挽歌', + 虹的行迹: '虹之迹', // 法器 四风原典: '四风,四风书,四风法器', @@ -172,6 +177,8 @@ export const alias = { 无垠蔚蓝之歌: '无垠蔚蓝,无垠之歌', 金流监督: '金流', 鹤鸣余音: '鹤鸣,扇子,仙扇,鹤扇,玉扇,玉板', + 木棉之环: '木棉,木棉环', + 冲浪时光: '冲浪', // 弓 天空之翼: '天空弓', @@ -202,5 +209,8 @@ export const alias = { 弓藏: '弓藏', 静谧之曲: '静谧,静谧弓,枫丹锻造弓', 烈阳之嗣: '烈阳,烈阳弓', - 测距规: '测距,测距弓' + 测距规: '测距,测距弓', + 筑云: '筑云', + 白雨心弦: '白雨', + 碎链: '碎链' } diff --git a/resources/meta-gs/weapon/bow/calc.js b/resources/meta-gs/weapon/bow/calc.js index 1c4e381c..9b9cf431 100644 --- a/resources/meta-gs/weapon/bow/calc.js +++ b/resources/meta-gs/weapon/bow/calc.js @@ -269,6 +269,13 @@ export default function (step, staticStep) { hpPct: step(40, 10), qCpct: step(28) } + }, + 碎链: { + title: '三名与装备者元素类型不同的角色，攻击力提升[atkPct]%，元素精通提升[mastery]点', + refine: { + atkPct: [4.8 * 3, 6 * 3, 7.2 * 3, 8.4 * 3, 9.6 * 3], + mastery: step(24) + } } } } diff --git a/resources/meta-gs/weapon/catalyst/calc.js b/resources/meta-gs/weapon/catalyst/calc.js index 8b0ecd65..c9c63aa3 100644 --- a/resources/meta-gs/weapon/catalyst/calc.js +++ b/resources/meta-gs/weapon/catalyst/calc.js @@ -199,6 +199,13 @@ export default function (step, staticStep) { refine: { dmg: step(12 * 4) } - }] + }], + 木棉之环: { + title: '施放元素战技时，基于生命值提升普攻造成的伤害[aDmg]%', + sort: 9, + data: { + aDmg: ({ attr, calc, refine }) => Math.min(Math.floor(calc(attr.hp) / 1000) * step(0.6, 0.1)[refine], step(16)[refine]) + } + } } } diff --git a/resources/meta-gs/weapon/claymore/calc.js b/resources/meta-gs/weapon/claymore/calc.js index 08f23010..1f3e5c11 100644 --- a/resources/meta-gs/weapon/claymore/calc.js +++ b/resources/meta-gs/weapon/claymore/calc.js @@ -203,6 +203,13 @@ export default function (step, staticStep) { eDmg: step(10 * 6), qDmg: step(10 * 6) } - }] + }], + 撼地者: { + check: ({ element }) => [ '火' ].includes(element), + title: '触发火元素相关反应，元素战技造成的伤害提升[eDmg]%', + refine: { + eDmg: step(16) + } + } } } diff --git a/resources/meta-gs/weapon/polearm/calc.js b/resources/meta-gs/weapon/polearm/calc.js index 01a2e81a..d697f007 100644 --- a/resources/meta-gs/weapon/polearm/calc.js +++ b/resources/meta-gs/weapon/polearm/calc.js @@ -164,6 +164,12 @@ export default function (step, staticStep) { dmg: ({ refine }) => step(18, 5)[refine] * 2 } }], - 公义的酬报: false + 公义的酬报: false, + 虹的行迹: { + title: '施放元素战技时，防御力提升[defPct]%', + refine: { + defPct: step(16) + } + } } } diff --git a/resources/meta-gs/weapon/sword/calc.js b/resources/meta-gs/weapon/sword/calc.js index b750eddf..af63ec9f 100644 --- a/resources/meta-gs/weapon/sword/calc.js +++ b/resources/meta-gs/weapon/sword/calc.js @@ -260,6 +260,12 @@ export default function (step, staticStep) { refine: { dmg: step(16 * 3) } - }] + }], + 息燧之笛: { + title: "施放元素战技时，防御力提升[defPct]%", + refine: { + defPct: step(16) + } + } } }