diff --git a/apps/profile/ProfileChange.js b/apps/profile/ProfileChange.js index 6c6efdb1..840c198e 100644 --- a/apps/profile/ProfileChange.js +++ b/apps/profile/ProfileChange.js @@ -128,7 +128,7 @@ 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 = lodash.trim(wRet[7]) let weapon = Weapon.get(weaponName, game, ret.char.game) diff --git a/resources/meta-gs/artifact/artis-mark.js b/resources/meta-gs/artifact/artis-mark.js index 867ae5d4..564f7633 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 } } 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 , 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 ,