From ee530c0725287c92a40700fe230c4f6992775ed9 Mon Sep 17 00:00:00 2001 From: panganqi Date: Thu, 19 Jan 2023 07:24:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=89=BE=E5=B0=94?= =?UTF-8?q?=E6=B5=B7=E6=A3=AE=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97=20(#408)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta/character/艾尔海森/calc.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/meta/character/艾尔海森/calc.js b/resources/meta/character/艾尔海森/calc.js index 349b6ee2..f00795e6 100644 --- a/resources/meta/character/艾尔海森/calc.js +++ b/resources/meta/character/艾尔海森/calc.js @@ -16,7 +16,7 @@ title: '3枚光幕单段伤害', const td = talent.e['1枚光幕攻击伤害2'] const em = calc(attr.mastery) const atk = calc(attr.atk) - return basic(td[0] * 0.5558 * atk / 100 + td[1] * 0.5558 * em / 100, 'e') + return basic(td[0] * atk / 100 + td[1] * em / 100, 'e') } }, { title: '3枚光幕单段激化伤害', @@ -24,7 +24,7 @@ title: '3枚光幕单段伤害', const td = talent.e['1枚光幕攻击伤害2'] const em = calc(attr.mastery) const atk = calc(attr.atk) - return basic(td[0] * 0.5558 * atk / 100 + td[1] * 0.5558 * em / 100, 'e', 'spread') + return basic(td[0] * atk / 100 + td[1] * em / 100, 'e', 'spread') } }, { title: 'Q激化总伤-4段', @@ -67,14 +67,14 @@ export const defParams = { export const buffs = [ { title: '艾尔海森被动：基于元素精通提升EQ伤害[eDmg]%', data: { - eDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery) ) * 0.12), - qDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery) ) * 0.12), + eDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery) ) * 0.1), + qDmg: ({ calc, attr }) => Math.min(100, (calc(attr.mastery) ) * 0.1), } },{ - title: '艾尔海森二命：每1枚产生的琢光镜将使元素精通提升40点，默认3层', + title: '艾尔海森二命：每1枚产生的琢光镜将使元素精通提升50点，默认3层', cons: 2, data: { - mastery: 120 + mastery: 150 } },{check: ({ params }) => params.q === false, title: '艾尔海森四命：每1枚产生的琢光镜将使草元素伤害提升10%，默认3层,不加成Q', From b3097ad58fea06e898fe1bb30d88aab1e7e6a61e Mon Sep 17 00:00:00 2001 From: SanqianQVQ <66824135+SanQianQVQ@users.noreply.github.com> Date: Sat, 21 Jan 2023 13:06:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=BA=20#=E5=8E=9F=E5=9B=BE=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A2=9E=E5=8A=A030s=E5=90=8E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=20(#412)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/profile/ProfileUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/profile/ProfileUtils.js b/apps/profile/ProfileUtils.js index 9ecb9e9c..469f9872 100644 --- a/apps/profile/ProfileUtils.js +++ b/apps/profile/ProfileUtils.js @@ -24,7 +24,7 @@ export async function getOriginalPicture (e) { if (source) { let imgPath = await redis.get(`miao:original-picture:${source.message_id}`) if (imgPath) { - e.reply([segment.image(process.cwd() + '/plugins/miao-plugin/resources/' + decodeURIComponent(imgPath))]) + e.reply([segment.image(process.cwd() + '/plugins/miao-plugin/resources/' + decodeURIComponent(imgPath))], false, { recallMsg: 30 }) return true } if (source.time) { From a69de3f9683cca14e54a4e37d952216ccea8e78d Mon Sep 17 00:00:00 2001 From: panganqi Date: Sat, 21 Jan 2023 13:06:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=B7=E5=93=A5?= =?UTF-8?q?=E4=B8=93=E6=AD=A6=E8=AE=A1=E7=AE=97=E5=B9=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97=E5=AF=B9=E5=85=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20(#414)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/profile-lib/DmgCalc.js | 2 +- resources/meta/weapon/sword/calc.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/profile-lib/DmgCalc.js b/models/profile-lib/DmgCalc.js index 53092896..5ce06b79 100644 --- a/models/profile-lib/DmgCalc.js +++ b/models/profile-lib/DmgCalc.js @@ -89,7 +89,7 @@ let DmgCalc = { // 反应区 let eleNum = isEle ? DmgMastery.getBasePct(ele, attr.element) : 1 let eleBase = isEle ? 1 + attr[ele] / 100 + DmgMastery.getMultiple(ele, calc(attr.mastery)) : 1 - let dmgBase = (mode === 'basic') ? basicNum : atkNum * pctNum * (1 + multiNum) + plusNum + let dmgBase = (mode === 'basic') ? basicNum + plusNum : atkNum * pctNum * (1 + multiNum) + plusNum let ret = {} switch (ele) { diff --git a/resources/meta/weapon/sword/calc.js b/resources/meta/weapon/sword/calc.js index d2407ec3..2f69d402 100644 --- a/resources/meta/weapon/sword/calc.js +++ b/resources/meta/weapon/sword/calc.js @@ -151,8 +151,8 @@ export default function (step, staticStep) { 裁叶萃光: [staticStep('cpct', 4), { title: '普攻与元素战技造成的伤害值提高[aPlus]', data: { - aPlus: ({ attr, calc, refine }) => calc(attr.mastery) * [200, 230, 260, 290, 320][refine] / 100, - ePlus: ({ attr, calc, refine }) => calc(attr.mastery) * [200, 230, 260, 290, 320][refine] / 100 + aPlus: ({ attr, calc, refine }) => calc(attr.mastery) * step(120)[refine] / 100, + ePlus: ({ attr, calc, refine }) => calc(attr.mastery) * step(120)[refine] / 100 } }], 斫峰之刃: [{