From 07ca630736586e0af61ec35e7973b09cdfd57896 Mon Sep 17 00:00:00 2001 From: 1umine Date: Thu, 4 Jul 2024 18:50:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=20#753=20,=20=E6=97=85=E8=A1=8C?= =?UTF-8?q?=E8=80=85=E8=AF=84=E5=88=86=E8=A7=84=E5=88=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/character/CharCfg.js | 3 ++- resources/meta-gs/character/index.js | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/models/character/CharCfg.js b/models/character/CharCfg.js index aedeac77..996680b4 100644 --- a/models/character/CharCfg.js +++ b/models/character/CharCfg.js @@ -64,7 +64,8 @@ let CharCfg = { }, getArtisCfg (char) { if (char.game !== 'sr') { - let charName = char.isTraveler ? `旅行者/${char.elem}` : char.name + // 评分规则在 旅行者 下而非 旅行者/elem 下 + let charName = char.isTraveler ? `旅行者` : char.name return cfgMapGs.char[charName]?.artis || false } else { return cfgMapSr.char[char.name]?.artis || false diff --git a/resources/meta-gs/character/index.js b/resources/meta-gs/character/index.js index 0701be7d..1868343e 100644 --- a/resources/meta-gs/character/index.js +++ b/resources/meta-gs/character/index.js @@ -9,6 +9,15 @@ let meta = Meta.create('gs', 'char') meta.addData(data) meta.addAlias(alias) +// 导入主角天赋对应元素，以据此判断主角元素 +let travelers = ["荧", "空", "旅行者"] +travelers.forEach(name => { + meta.addDataItem( + meta.getId(name), + Data.readJSON(`resources/meta-gs/character/${name}/data.json`, 'miao') + ) +}) + // 添加自定义角色 lodash.forEach(extraChars, (alias, char) => { meta.addDataItem(char, { From 2a4fd8304218100055d41eeb9cb6eba344d9dd48 Mon Sep 17 00:00:00 2001 From: 1umine Date: Thu, 4 Jul 2024 18:51:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B0=B4=E5=85=83?= =?UTF-8?q?=E7=B4=A0=E4=B8=BB=E8=A7=92=E5=A4=A9=E8=B5=8BID=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta-gs/character/旅行者/data.json | 9 +++++++-- resources/meta-gs/character/空/data.json | 9 +++++++-- resources/meta-gs/character/荧/data.json | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/resources/meta-gs/character/旅行者/data.json b/resources/meta-gs/character/旅行者/data.json index af3dcb3a..e9b12811 100644 --- a/resources/meta-gs/character/旅行者/data.json +++ b/resources/meta-gs/character/旅行者/data.json @@ -32,10 +32,13 @@ "10118": "q", "10602": "e", "10605": "q", + "10087": "e", + "10088": "q", "100553": "a", "100555": "a", "100556": "a", - "100557": "a" + "100557": "a", + "100552": "a" }, "talentElem": { "10067": "anemo", @@ -45,7 +48,9 @@ "10117": "dendro", "10118": "dendro", "10602": "electro", - "10605": "electro" + "10605": "electro", + "10087": "hydro", + "10088": "hydro" }, "talentCons": { "e": 5, diff --git a/resources/meta-gs/character/空/data.json b/resources/meta-gs/character/空/data.json index 8e9a0c1a..5ab59851 100644 --- a/resources/meta-gs/character/空/data.json +++ b/resources/meta-gs/character/空/data.json @@ -32,10 +32,13 @@ "10118": "q", "10602": "e", "10605": "q", + "10087": "e", + "10088": "q", "100543": "a", "100545": "a", "100546": "a", - "100547": "a" + "100547": "a", + "100548": "a" }, "talentElem": { "10067": "anemo", @@ -45,7 +48,9 @@ "10117": "dendro", "10118": "dendro", "10602": "electro", - "10605": "electro" + "10605": "electro", + "10087": "hydro", + "10088": "hydro" }, "talentCons": { "e": 5, diff --git a/resources/meta-gs/character/荧/data.json b/resources/meta-gs/character/荧/data.json index 3c538847..b98b512e 100644 --- a/resources/meta-gs/character/荧/data.json +++ b/resources/meta-gs/character/荧/data.json @@ -32,10 +32,13 @@ "10118": "q", "10602": "e", "10605": "q", + "10087": "e", + "10088": "q", "100553": "a", "100555": "a", "100556": "a", - "100557": "a" + "100557": "a", + "100552": "a" }, "talentElem": { "10067": "anemo", @@ -45,7 +48,9 @@ "10117": "dendro", "10118": "dendro", "10602": "electro", - "10605": "electro" + "10605": "electro", + "10087": "hydro", + "10088": "hydro" }, "talentCons": { "e": 5, From 8e384994460dbf5762940a968ad3afbddd720dcf Mon Sep 17 00:00:00 2001 From: 1umine Date: Thu, 4 Jul 2024 19:00:50 +0800 Subject: [PATCH 3/5] fix #757 --- resources/meta-gs/character/枫原万叶/artis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta-gs/character/枫原万叶/artis.js b/resources/meta-gs/character/枫原万叶/artis.js index e30abaea..5b6ae92a 100644 --- a/resources/meta-gs/character/枫原万叶/artis.js +++ b/resources/meta-gs/character/枫原万叶/artis.js @@ -1,6 +1,6 @@ export default function ({ cons, rule, def }) { if (cons === 6) { - return rule('万叶-满命', { atk: 75, cpct: 100, cdmg: 100, mastery: 30, dmg: 100, recharge: 55 }) + return rule('万叶-满命', { atk: 75, cpct: 100, cdmg: 100, mastery: 100, dmg: 100, recharge: 55 }) } return def({ hp: 0, atk: 75, def: 0, cpct: 50, cdmg: 50, mastery: 100, dmg: 100, phy: 0, recharge: 55, heal: 0 }) } \ No newline at end of file From 3c669cd78058b91818284882b22e66d24821c2eb Mon Sep 17 00:00:00 2001 From: 1umine Date: Thu, 4 Jul 2024 19:24:32 +0800 Subject: [PATCH 4/5] fix #745 --- apps/profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/profile.js b/apps/profile.js index 2afbb36b..ce7d1237 100644 --- a/apps/profile.js +++ b/apps/profile.js @@ -80,7 +80,7 @@ app.reg({ talentStat: { name: '天赋统计', fn: ProfileStat.stat, - rule: /^#*(我的)*(今日|今天|明日|明天|周.*)?(五|四|5|4|星)?(技能|天赋)+(汇总|统计|列表)?[ |0-9]*$/ + rule: /^#*(我的)?(今日|今天|明日|明天|周.*)?([五四54]星)?(技能|天赋)+(汇总|统计|列表)?[ |0-9]*$/ }, avatarList: { From 43599bcf6666a52244c64c0d0f80197d36dbc750 Mon Sep 17 00:00:00 2001 From: 1umine Date: Thu, 4 Jul 2024 21:22:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=B0=E7=B3=BB?= =?UTF-8?q?=E5=B8=A6=E5=86=B0=E5=A5=97=E6=89=93=E8=9E=8D=E5=8C=96=E8=83=BD?= =?UTF-8?q?=E5=90=83=E5=88=B0=E5=9B=9B=E4=BB=B6=E5=A5=97=E6=95=88=E6=9E=9C?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/dmg/DmgAttr.js | 5 ++++- resources/meta-gs/artifact/calc.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/models/dmg/DmgAttr.js b/models/dmg/DmgAttr.js index d0df56de..65b102e9 100644 --- a/models/dmg/DmgAttr.js +++ b/models/dmg/DmgAttr.js @@ -129,7 +129,10 @@ let DmgAttr = { let aCfg = attrMap[reduceAttr] attr[reduceAttr][aCfg.calc] -= aCfg.value } - + + lodash.forEach(buffs, (buff) => { + meta.mastery = meta.mastery || buff.mastery // 先反应 + }) lodash.forEach(buffs, (buff) => { let ds = DmgAttr.getDs(attr, meta, params) diff --git a/resources/meta-gs/artifact/calc.js b/resources/meta-gs/artifact/calc.js index ac9fb678..98feb7fb 100644 --- a/resources/meta-gs/artifact/calc.js +++ b/resources/meta-gs/artifact/calc.js @@ -122,7 +122,7 @@ const buffs = { 冰风迷途的勇士: { 2: attr('dmg', 15, '冰'), 4: { - check: ({ element }) => element === '冰', + check: ({ element, mastery }) => element === '冰' && mastery != 'melt', title: '攻击处于冰元素影响下的敌人时，暴击率提高20%', data: { cpct: 20