Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kokomi 2023-01-31 01:12:02 +08:00
commit a019f8de8c
4 changed files with 10 additions and 10 deletions

View File

@ -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) {

View File

@ -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) {

View File

@ -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',

View File

@ -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
}
}],
斫峰之刃: [{