diff --git a/CHANGELOG.md b/CHANGELOG.md index d9f7e632..cb6ce3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 2.2.1 + +* 增加瑶瑶伤害计算 +* 为群排名人数、圣遗物列表展示数增加`#喵喵设置`的配置 **@SmallK111407** +* 可通过`#喵喵设置`配置`#面板练度统计`替换Yunzai`#练度统计`功能 **@SmallK111407** + # 2.2.0 * 增加面板替换功能,可通过命令更换面板的圣遗物、武器、天赋命座等,用于伤害计算 diff --git a/models/profile-lib/ArtisMark.js b/models/profile-lib/ArtisMark.js index 2008bda4..19fc36c7 100644 --- a/models/profile-lib/ArtisMark.js +++ b/models/profile-lib/ArtisMark.js @@ -154,7 +154,7 @@ let ArtisMark = { // 获取评分档位 getMarkClass (mark) { let pct = mark - let scoreMap = [['D', 10], ['C', 16.5], ['B', 23.1], ['A', 29.7], ['S', 36.3], ['SS', 42.9], ['SSS', 49.5], ['ACE', 56.1], ['ACE²', 66]] + let scoreMap = [['D', 10], ['C', 16.5], ['B', 23.1], ['A', 29.7], ['S', 36.3], ['SS', 42.9], ['SSS', 49.5], ['ACE', 56.1], ['ACE²', 66.1]] for (let idx = 0; idx < scoreMap.length; idx++) { if (pct < scoreMap[idx][1]) { return scoreMap[idx][0] diff --git a/resources/meta/character/艾尔海森/calc.js b/resources/meta/character/艾尔海森/calc.js index f00795e6..e4a5495d 100644 --- a/resources/meta/character/艾尔海森/calc.js +++ b/resources/meta/character/艾尔海森/calc.js @@ -1,8 +1,8 @@ export const details = [{ - title: '附魔普攻第一段激化伤害', + title: 'E普攻第一段激化', dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a', '超激化') -},{ - title: 'E突进激化伤害', +}, { + title: 'E突进激化', params: { e: true, q: false }, dmg: ({ talent, calc, attr }, { basic }) => { const td = talent.e['突进攻击伤害2'] @@ -11,20 +11,20 @@ export const details = [{ return basic(td[0] * atk / 100 + td[1] * em / 100, 'e', 'spread') } }, { -title: '3枚光幕单段伤害', + title: '3枚光幕单段', dmg: ({ talent, calc, attr }, { basic }) => { const td = talent.e['1枚光幕攻击伤害2'] const em = calc(attr.mastery) const atk = calc(attr.atk) - return basic(td[0] * atk / 100 + td[1] * em / 100, 'e') + return basic(td[0] * atk / 100 + td[1] * em / 100, 'e') } }, { - title: '3枚光幕单段激化伤害', + title: '3枚光幕单段激化', dmg: ({ talent, calc, attr }, { basic }) => { const td = talent.e['1枚光幕攻击伤害2'] const em = calc(attr.mastery) const atk = calc(attr.atk) - return basic(td[0] * atk / 100 + td[1] * em / 100, 'e', 'spread') + return basic(td[0] * atk / 100 + td[1] * em / 100, 'e', 'spread') } }, { title: 'Q激化总伤-4段', @@ -60,33 +60,35 @@ export const defDmgIdx = 3 export const mainAttr = 'atk,cpct,cdmg,mastery' export const defParams = { - q: false, - e:true + q: false, + e: true } -export const buffs = [ { +export const buffs = [{ title: '艾尔海森被动:基于元素精通提升EQ伤害[eDmg]%', data: { - eDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery) ) * 0.1), - qDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery) ) * 0.1), + eDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery)) * 0.1), + qDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery)) * 0.1) } -},{ - title: '艾尔海森二命:每1枚产生的琢光镜将使元素精通提升50点,默认3层', +}, { + title: '海森2命:每1枚产生的琢光镜将使元素精通提升50点,默认3层', cons: 2, data: { mastery: 150 } -},{check: ({ params }) => params.q === false, - title: '艾尔海森四命:每1枚产生的琢光镜将使草元素伤害提升10%,默认3层,不加成Q', +}, { + check: ({ params }) => params.q === false, + title: '海森4命:每1枚产生的琢光镜将使草元素伤害提升10%,默认3层,不加成Q', cons: 4, data: { dmg: 30 } -},{check: ({ params }) => params.q === false, +}, { + check: ({ params }) => params.q === false, title: '艾尔海森六命:暴击率提升10%,暴击伤害提升70%,不加成Q', cons: 6, data: { cpct: 10, - cdmg:70 + cdmg: 70 } }] diff --git a/resources/meta/character/迪希雅/detail.json b/resources/meta/character/迪希雅/detail.json index ca51f349..05f2b06e 100644 --- a/resources/meta/character/迪希雅/detail.json +++ b/resources/meta/character/迪希雅/detail.json @@ -928,7 +928,8 @@ "3": { "name": "怒势疾迅如焚掠地", "desc": [ - "炎啸狮子咬的技能等级提高3级。至多提升至15级。" + "炎啸狮子咬的技能等级提高3级。", + "至多提升至15级。" ] }, "4": { @@ -940,7 +941,8 @@ "5": { "name": "猎兽魁首卓荦不羁", "desc": [ - "熔铁流狱的技能等级提高3级。至多提升至15级。" + "熔铁流狱的技能等级提高3级。", + "至多提升至15级。" ] }, "6": { diff --git a/resources/meta/weapon/sword/calc.js b/resources/meta/weapon/sword/calc.js index 2f69d402..32d5a549 100644 --- a/resources/meta/weapon/sword/calc.js +++ b/resources/meta/weapon/sword/calc.js @@ -148,8 +148,13 @@ export default function (step, staticStep) { } }], - 裁叶萃光: [staticStep('cpct', 4), { - title: '普攻与元素战技造成的伤害值提高[aPlus]', + 裁叶萃光: [{ + title: '暴击率提升[cpct]%', + refine: { + cpct: step(4) + } + }, { + title: '暴击率提升4%,普攻与元素战技造成的伤害值提高[aPlus]', data: { aPlus: ({ attr, calc, refine }) => calc(attr.mastery) * step(120)[refine] / 100, ePlus: ({ attr, calc, refine }) => calc(attr.mastery) * step(120)[refine] / 100