From 53327f583329f28bffd3a7c6fbcdc0e6f1161e92 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 03:14:02 +0000 Subject: [PATCH 1/9] =?UTF-8?q?=E9=98=BF=E8=95=BE=E5=A5=87=E8=AF=BA?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E5=85=85=E8=83=BD=E5=88=86?= 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/artifact/artis-mark.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta-gs/artifact/artis-mark.js b/resources/meta-gs/artifact/artis-mark.js index 327e23df..0b23bcde 100644 --- a/resources/meta-gs/artifact/artis-mark.js +++ b/resources/meta-gs/artifact/artis-mark.js @@ -83,5 +83,5 @@ export const usefulAttr = { 闲云: { hp: 0, atk: 100, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 100 }, 嘉明: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 }, 千织: { hp: 0, atk: 50, def: 75, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 }, - 阿蕾奇诺: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 } + 阿蕾奇诺: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 35, heal: 0 } } From ba1d4944f7aece062dd6543f0860dc287992b399 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 07:10:50 +0000 Subject: [PATCH 2/9] =?UTF-8?q?update=20resources/meta-gs/character/?= =?UTF-8?q?=E9=98=BF=E8=95=BE=E5=A5=87=E8=AF=BA/calc=5Fauto.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_auto.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/meta-gs/character/阿蕾奇诺/calc_auto.js b/resources/meta-gs/character/阿蕾奇诺/calc_auto.js index 3ded60f7..60494fe0 100644 --- a/resources/meta-gs/character/阿蕾奇诺/calc_auto.js +++ b/resources/meta-gs/character/阿蕾奇诺/calc_auto.js @@ -37,7 +37,7 @@ export const buffs = [ title: '阿蕾奇诺天赋：[buffCount]%最大生命值的生命之契,普通攻击伤害提升[aPlus]', data: { buffCount: ({ params , weapon }) => Math.min(params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0), 200), - aPlus: ({ talent , attr , params , cons , weapon }) => attr.atk * ((Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 )) + aPlus: ({ talent , attr , params , cons , weapon }) => attr.atk * ((Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 )) } }, { @@ -50,7 +50,7 @@ export const buffs = [ title: '阿蕾奇诺6命：Q造成的伤害提高[qPlus],且释放后普通攻击与元素爆发的暴击率提高[aCpct]%,暴击伤害提高[aCdmg]%', cons: 6, data: { - qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * (700 / 100), + qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * (700 / 100), aCpct: 10 , aCdmg: 70 , qCpct: 10 , From d20179774c25900a3a2ba33d8150f6dd6d5d9443 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 07:13:27 +0000 Subject: [PATCH 3/9] =?UTF-8?q?update=20resources/meta-gs/character/?= =?UTF-8?q?=E9=98=BF=E8=95=BE=E5=A5=87=E8=AF=BA/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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/meta-gs/character/阿蕾奇诺/calc.js b/resources/meta-gs/character/阿蕾奇诺/calc.js index 85e96eb9..36245157 100644 --- a/resources/meta-gs/character/阿蕾奇诺/calc.js +++ b/resources/meta-gs/character/阿蕾奇诺/calc.js @@ -29,7 +29,7 @@ export const buffs = [ title: '阿蕾奇诺天赋：[buffCount]%最大生命值的生命之契,普通攻击伤害提升[aPlus]', data: { buffCount: ({ params , weapon }) => Math.min(params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0), 200), - aPlus: ({ talent , attr , params , cons , weapon }) => attr.atk * ((Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 )) + aPlus: ({ talent , attr , params , cons , weapon }) => attr.atk * ((Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 )) } }, { @@ -42,7 +42,7 @@ export const buffs = [ title: '阿蕾奇诺6命：Q造成的伤害提高[qPlus],且释放后普通攻击与元素爆发的暴击率提高[aCpct]%,暴击伤害提高[aCdmg]%', cons: 6, data: { - qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 200) * (700 / 100), + qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * (700 / 100), aCpct: 10 , aCdmg: 70 , qCpct: 10 , From e3da1112204090f972ab8685c60aa859ba5d5572 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 07:23:50 +0000 Subject: [PATCH 4/9] update apps/profile/ProfileChange.js. Signed-off-by: liangshi <1142607614@qq.com> --- apps/profile/ProfileChange.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/profile/ProfileChange.js b/apps/profile/ProfileChange.js index 6c6efdb1..630e9639 100644 --- a/apps/profile/ProfileChange.js +++ b/apps/profile/ProfileChange.js @@ -127,8 +127,8 @@ const ProfileChange = { return true } - // 匹配武器 - let wRet = /^(?:等?级?([1-9][0-9])?级?)?\s*(?:([1-5一二三四五满])?(?:(精炼?)|(叠影?))?([1-5一二三四五])?)?\s*(?:等?级?([1-9][0-9])?级?)?\s*(.*)$/.exec(txt) + // 匹配武器 + let wRet = /^(?:等?级?([1-9][0-9])?级?)?\s*(?:([1-5一二三四五满])?(?:(精炼?)|(叠影?))([1-5一二三四五])?)?\s*(?:等?级?([1-9][0-9])?级?)?\s*(.*)$/.exec(txt) if (wRet && wRet[7]) { let weaponName = lodash.trim(wRet[7]) let weapon = Weapon.get(weaponName, game, ret.char.game) From 123405f4d45cc46d83d51c2ec8c5f8fdc37e9a17 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 07:36:10 +0000 Subject: [PATCH 5/9] XD Signed-off-by: liangshi <1142607614@qq.com> --- resources/meta-gs/weapon/alias.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta-gs/weapon/alias.js b/resources/meta-gs/weapon/alias.js index ef85594c..372b82a0 100644 --- a/resources/meta-gs/weapon/alias.js +++ b/resources/meta-gs/weapon/alias.js @@ -140,7 +140,7 @@ export const alias = { 赤月之形: '赤月,镰刀', // 法器 - 四风原典: '四风,四风书,四风法器', + 四风原典: '四风,四风书,四风法器,风原典', 天空之卷: '天空书,厕纸,天空法器', 尘世之锁: '尘世锁,尘世,盾书,锁', 神乐之真意: '神乐,真意,果盘', From 389215fbaf97997bbb31286c0ce0511e33f70794 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 07:51:04 +0000 Subject: [PATCH 6/9] Revert "XD" This reverts commit 123405f4d45cc46d83d51c2ec8c5f8fdc37e9a17. --- resources/meta-gs/weapon/alias.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta-gs/weapon/alias.js b/resources/meta-gs/weapon/alias.js index 372b82a0..ef85594c 100644 --- a/resources/meta-gs/weapon/alias.js +++ b/resources/meta-gs/weapon/alias.js @@ -140,7 +140,7 @@ export const alias = { 赤月之形: '赤月,镰刀', // 法器 - 四风原典: '四风,四风书,四风法器,风原典', + 四风原典: '四风,四风书,四风法器', 天空之卷: '天空书,厕纸,天空法器', 尘世之锁: '尘世锁,尘世,盾书,锁', 神乐之真意: '神乐,真意,果盘', From d00936d692ee4609565beb2fa3ae1130b32fd613 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 08:07:22 +0000 Subject: [PATCH 7/9] update apps/profile/ProfileChange.js. Signed-off-by: liangshi <1142607614@qq.com> --- apps/profile/ProfileChange.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/profile/ProfileChange.js b/apps/profile/ProfileChange.js index 630e9639..d98736e6 100644 --- a/apps/profile/ProfileChange.js +++ b/apps/profile/ProfileChange.js @@ -130,7 +130,7 @@ const ProfileChange = { // 匹配武器 let wRet = /^(?:等?级?([1-9][0-9])?级?)?\s*(?:([1-5一二三四五满])?(?:(精炼?)|(叠影?))([1-5一二三四五])?)?\s*(?:等?级?([1-9][0-9])?级?)?\s*(.*)$/.exec(txt) if (wRet && wRet[7]) { - let weaponName = lodash.trim(wRet[7]) + let weaponName = wRet[2] ? lodash.trim(wRet[5]+wRet[7]) : lodash.trim(wRet[7]) let weapon = Weapon.get(weaponName, game, ret.char.game) if (weapon || weaponName === '武器' || Weapon.isWeaponSet(weaponName)) { let affix = wRet[2] || wRet[5] From 9cd43d48526a45d33007668b40f51edba4ffa035 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 08:57:50 +0000 Subject: [PATCH 8/9] update apps/profile/ProfileChange.js. Signed-off-by: liangshi <1142607614@qq.com> --- apps/profile/ProfileChange.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/profile/ProfileChange.js b/apps/profile/ProfileChange.js index d98736e6..c44a846c 100644 --- a/apps/profile/ProfileChange.js +++ b/apps/profile/ProfileChange.js @@ -128,9 +128,9 @@ const ProfileChange = { } // 匹配武器 - let wRet = /^(?:等?级?([1-9][0-9])?级?)?\s*(?:([1-5一二三四五满])?(?:(精炼?)|(叠影?))([1-5一二三四五])?)?\s*(?:等?级?([1-9][0-9])?级?)?\s*(.*)$/.exec(txt) + let wRet = /^(?:等?级?([1-9][0-9])?级?)?\s*(?:([1-5一二三四五满])(精炼?|叠影?)|(精炼?|叠影?)([1-5一二三四五]))?\s*(?:等?级?([1-9][0-9])?级?)?\s*(.*)$/.exec(txt) if (wRet && wRet[7]) { - let weaponName = wRet[2] ? lodash.trim(wRet[5]+wRet[7]) : lodash.trim(wRet[7]) + let weaponName = lodash.trim(wRet[7]) let weapon = Weapon.get(weaponName, game, ret.char.game) if (weapon || weaponName === '武器' || Weapon.isWeaponSet(weaponName)) { let affix = wRet[2] || wRet[5] From a53f53e2fd6ea96cdbb2fad8c2f3ed777bd4ed47 Mon Sep 17 00:00:00 2001 From: liangshi <1142607614@qq.com> Date: Wed, 17 Apr 2024 08:59:05 +0000 Subject: [PATCH 9/9] - Signed-off-by: liangshi <1142607614@qq.com> --- apps/profile/ProfileChange.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/profile/ProfileChange.js b/apps/profile/ProfileChange.js index c44a846c..840c198e 100644 --- a/apps/profile/ProfileChange.js +++ b/apps/profile/ProfileChange.js @@ -127,10 +127,10 @@ const ProfileChange = { return true } - // 匹配武器 + // 匹配武器 let wRet = /^(?:等?级?([1-9][0-9])?级?)?\s*(?:([1-5一二三四五满])(精炼?|叠影?)|(精炼?|叠影?)([1-5一二三四五]))?\s*(?:等?级?([1-9][0-9])?级?)?\s*(.*)$/.exec(txt) if (wRet && wRet[7]) { - let weaponName = lodash.trim(wRet[7]) + let weaponName = lodash.trim(wRet[7]) let weapon = Weapon.get(weaponName, game, ret.char.game) if (weapon || weaponName === '武器' || Weapon.isWeaponSet(weaponName)) { let affix = wRet[2] || wRet[5]