diff --git a/apps/stat/AbyssSummary.js b/apps/stat/AbyssSummary.js
index 91d3f113..33565f01 100644
--- a/apps/stat/AbyssSummary.js
+++ b/apps/stat/AbyssSummary.js
@@ -82,13 +82,13 @@ export async function AbyssSummary (e) {
msg.push({
title: '少于',
value: (Math.max(0.1, 100 - percent * 100)).toFixed(1),
- name: name
+ name
})
} else {
msg.push({
title: '超过',
value: (Math.min(99.9, percent * 100)).toFixed(1),
- name: name
+ name
})
}
}
diff --git a/models/serv/api/EnkaApi.js b/models/serv/api/EnkaApi.js
index b46ad848..52f37b4e 100644
--- a/models/serv/api/EnkaApi.js
+++ b/models/serv/api/EnkaApi.js
@@ -18,7 +18,7 @@ export default {
HttpsProxyAgent = await import('https-proxy-agent').catch((err) => {
logger.error(err)
})
- HttpsProxyAgent = HttpsProxyAgent ? HttpsProxyAgent.HttpsProxyAgent : undefined
+ HttpsProxyAgent = HttpsProxyAgent ? HttpsProxyAgent.default : undefined
}
if (HttpsProxyAgent) {
params.agent = new HttpsProxyAgent(proxy)
diff --git a/resources/meta-gs/artifact/artis-mark.js b/resources/meta-gs/artifact/artis-mark.js
index 564f7633..46c8d0ed 100644
--- a/resources/meta-gs/artifact/artis-mark.js
+++ b/resources/meta-gs/artifact/artis-mark.js
@@ -12,7 +12,7 @@ export const usefulAttr = {
云堇: { hp: 0, atk: 75, def: 100, cpct: 80, cdmg: 80, mastery: 0, dmg: 80, phy: 0, recharge: 80, heal: 0 },
荒泷一斗: { hp: 0, atk: 50, def: 100, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 30, heal: 0 },
五郎: { hp: 0, atk: 75, def: 100, cpct: 50, cdmg: 50, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 0 },
- 班尼特: { hp: 100, atk: 50, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 80, phy: 0, recharge: 55, heal: 100 },
+ 班尼特: { hp: 100, atk: 50, def: 0, cpct: 50, cdmg: 50, mastery: 0, dmg: 80, phy: 0, recharge: 75, heal: 100 },
枫原万叶: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 100, dmg: 100, phy: 0, recharge: 55, heal: 0 },
行秋: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 0 },
钟离: { hp: 80, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 50, recharge: 55, heal: 0 },
@@ -23,7 +23,7 @@ export const usefulAttr = {
珊瑚宫心海: { hp: 100, atk: 50, def: 0, cpct: 0, cdmg: 0, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 100 },
莫娜: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 0 },
阿贝多: { hp: 0, atk: 0, def: 100, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 0, heal: 0 },
- 迪奥娜: { hp: 100, atk: 50, def: 0, cpct: 50, cdmg: 50, mastery: 0, dmg: 100, phy: 0, recharge: 90, heal: 100 },
+ 迪奥娜: { hp: 100, atk: 50, def: 0, cpct: 50, cdmg: 50, mastery: 0, dmg: 80, phy: 0, recharge: 90, heal: 100 },
优菈: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 40, phy: 100, recharge: 55, heal: 0 },
达达利亚: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 },
魈: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
@@ -60,8 +60,8 @@ export const usefulAttr = {
坎蒂丝: { hp: 75, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
妮露: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 80, dmg: 100, phy: 0, recharge: 30, heal: 0 },
纳西妲: { hp: 0, atk: 55, def: 0, cpct: 100, cdmg: 100, mastery: 100, dmg: 100, phy: 0, recharge: 55, heal: 0 },
- 多莉: { hp: 75, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 75, phy: 0, recharge: 55, heal: 100 },
- 莱依拉: { hp: 100, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 35 },
+ 多莉: { hp: 100, atk: 50, def: 0, cpct: 50, cdmg: 50, mastery: 0, dmg: 80, phy: 0, recharge: 75, heal: 100 },
+ 莱依拉: { hp: 100, atk: 0, def: 0, cpct: 50, cdmg: 50, mastery: 0, dmg: 80, phy: 0, recharge: 35 },
流浪者: { hp: 0, atk: 80, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 35, heal: 0 },
珐露珊: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 0 },
瑶瑶: { hp: 100, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 75, heal: 100 },
@@ -77,11 +77,11 @@ export const usefulAttr = {
那维莱特: { hp: 100, atk: 0, def: 0, 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: 55, heal: 0 },
芙宁娜: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 45, 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: 75, heal: 100 },
+ 夏洛蒂: { hp: 0, atk: 75, def: 0, cpct: 50, cdmg: 50, mastery: 0, dmg: 80, phy: 0, recharge: 75, heal: 100 },
娜维娅: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
- 夏沃蕾: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 100 },
+ 夏沃蕾: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 100 },
闲云: { 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: 35, heal: 0 }
+ 阿蕾奇诺: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 }
}
diff --git a/resources/meta-gs/artifact/calc.js b/resources/meta-gs/artifact/calc.js
index 776f4055..58871f01 100644
--- a/resources/meta-gs/artifact/calc.js
+++ b/resources/meta-gs/artifact/calc.js
@@ -357,7 +357,7 @@ const buffs = {
title: '触发提高普攻[aPlus]伤害',
sort: 9,
data: {
- aPlus: ({ attr }) => (attr.atk.base + attr.atk.plus + attr.atk.pct * attr.atk.base / 100) * 0.35
+ aPlus: ({ attr }) => attr.atk * 0.35
}
}
},
@@ -487,7 +487,7 @@ const buffs = {
},
谐律异想断章: {
- 2: attr('atkPct', 18 ),
+ 2: attr('atkPct', 18),
4: {
title: '生命之契的数值提升或降低时，角色造成的伤害提升[dmg]%',
data: {
@@ -497,7 +497,7 @@ const buffs = {
},
未竟的遐思: {
- 2: attr('atkPct', 18 ),
+ 2: attr('atkPct', 18),
4: {
title: '存在处于燃烧状态下的敌人时，伤害提升[dmg]%',
data: {
diff --git a/resources/meta-gs/character/alias.js b/resources/meta-gs/character/alias.js
index 6abd23df..6f849348 100644
--- a/resources/meta-gs/character/alias.js
+++ b/resources/meta-gs/character/alias.js
@@ -88,7 +88,7 @@ export const alias = {
嘉明: 'Gaming,jiaming,佳明,嘉铭,家明,镖师,舞狮少年,舞狮',
闲云: 'Xianyun,流云,刘云,留云,野鹤,那个女人,留云借风,留云借风真君,很会聊天,很会聊天真君',
千织: 'Chiori,千只,设计师,裁缝,千织屋老板',
- 阿蕾奇诺: '阿蕾奇诺,阿雷奇诺,仆人,黑优菈,黑暗优菈,父亲',
+ 阿蕾奇诺: 'Arlecchino,阿雷奇诺,仆人,黑优菈,黑暗优菈,父亲,佩露薇利'
希格雯: 'Sigewinne,希格文',
赛索斯: 'Sethos',
克洛琳德: 'Clorinde,科洛琳德,克洛林德'
diff --git a/resources/meta-gs/character/data.json b/resources/meta-gs/character/data.json
index 14784544..de580de8 100644
--- a/resources/meta-gs/character/data.json
+++ b/resources/meta-gs/character/data.json
@@ -1448,7 +1448,7 @@
"10000096": {
"id": 10000096,
"name": "阿蕾奇诺",
- "abbr": "阿蕾奇诺",
+ "abbr": "仆人",
"star": 5,
"elem": "pyro",
"weapon": "polearm",
diff --git a/resources/meta-gs/character/index.js b/resources/meta-gs/character/index.js
index c6997ac7..0701be7d 100644
--- a/resources/meta-gs/character/index.js
+++ b/resources/meta-gs/character/index.js
@@ -21,6 +21,8 @@ meta.addAlias(extraChars)
// 添加老婆设置
let wifeData = {}
+let { diyCfg } = await Data.importCfg('character')
+let diyWifeData = diyCfg.wifeData || {}
lodash.forEach(wifeCfg, (txt, type) => {
wifeData[type] = wifeData[type] || {}
Data.eachStr(txt, (name) => {
@@ -30,4 +32,13 @@ lodash.forEach(wifeCfg, (txt, type) => {
}
})
})
+lodash.forEach(diyWifeData, (txt, type) => {
+ wifeData[type] = wifeData[type] || {}
+ Data.eachStr(txt, (name) => {
+ let id = meta.getId(name)
+ if (id) {
+ wifeData[type][id] = true
+ }
+ })
+})
meta.addMeta({ wifeData })
diff --git a/resources/meta-gs/character/云堇/calc.js b/resources/meta-gs/character/云堇/calc.js
index f48c7d57..40b06b1c 100644
--- a/resources/meta-gs/character/云堇/calc.js
+++ b/resources/meta-gs/character/云堇/calc.js
@@ -1,14 +1,14 @@
export const details = [{
title: 'Q提供普攻基础伤害',
- dmg: ({ talent, attr, calc }) => {
+ dmg: ({ talent, attr }) => {
return {
- avg: (talent.q['伤害值提升'] / 100 + 0.115) * calc(attr.def)
+ avg: (talent.q['伤害值提升'] / 100 + 0.115) * attr.def
}
}
}, {
title: '二段蓄力E伤害',
- dmg: ({ talent, attr, calc }, { basic }) => {
- let ret = talent.e['二段蓄力伤害'] * calc(attr.def) / 100 + (attr.e.plus || 0)
+ dmg: ({ talent, attr }, { basic }) => {
+ let ret = talent.e['二段蓄力伤害'] / 100 * attr.def
return basic(ret, 'e')
}
}]
@@ -19,8 +19,8 @@ export const buffs = [{
title: '云堇被动：队伍存在4元素类型角色时，Q提供的普攻伤害提高[_q]',
sort: 9,
data: {
- _q: ({ attr, calc }) => {
- return calc(attr.def) * 0.115
+ _q: ({ attr }) => {
+ return attr.def * 0.115
}
}
}]
diff --git a/resources/meta-gs/character/五郎/calc.js b/resources/meta-gs/character/五郎/calc.js
index 70909117..028969c6 100644
--- a/resources/meta-gs/character/五郎/calc.js
+++ b/resources/meta-gs/character/五郎/calc.js
@@ -3,20 +3,20 @@ export const details = [{
dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
}, {
title: '三岩Q伤害',
- dmg: ({ talent, attr, calc }, { basic }) => {
- let ret = talent.q['技能伤害'] * calc(attr.def) / 100 + attr.q.plus * 1
+ dmg: ({ talent, attr }, { basic }) => {
+ let ret = talent.q['技能伤害'] / 100 * attr.def
return basic(ret, 'q')
}
}, {
title: '三岩Q每跳伤害',
- dmg: ({ talent, attr, calc }, { basic }) => {
- let ret = talent.q['岩晶崩破伤害'] * calc(attr.def) / 100 + attr.q.plus * 1
+ dmg: ({ talent, attr }, { basic }) => {
+ let ret = talent.q['岩晶崩破伤害'] / 100 * attr.def
return basic(ret, 'q')
}
}, {
title: 'Q每跳治疗',
cons: 4,
- dmg: ({ attr, calc }, { heal }) => heal(0.5 * calc(attr.def))
+ dmg: ({ attr }, { heal }) => heal(0.5 * attr.def)
}]
export const mainAttr = 'atk,def,cpct,cdmg'
@@ -27,6 +27,13 @@ export const buffs = [{
defPlus: ({ talent }) => talent.e['防御力提升'] * 1,
dmg: 15
}
+}, {
+ title: '天赋-报恩之守：基于防御力，提高E伤害[ePlus]，提高Q伤害[qPlus]',
+ sort: 9,
+ data: {
+ ePlus: ({ attr }) => 1.56 * attr.def,
+ qPlus: ({ attr }) => 0.156 * attr.def
+ }
}, {
title: '五郎被动：释放E后防御力提高25%',
data: {
diff --git a/resources/meta-gs/character/北斗/calc.js b/resources/meta-gs/character/北斗/calc.js
index ebb04289..79946a09 100644
--- a/resources/meta-gs/character/北斗/calc.js
+++ b/resources/meta-gs/character/北斗/calc.js
@@ -1,3 +1,5 @@
+import { Format } from '#miao'
+
export const details = [{
title: 'E伤害',
dmg: ({ talent }, dmg) => dmg(talent.e['基础伤害'], 'e')
@@ -8,6 +10,21 @@ export const details = [{
title: 'Q每跳伤害',
params: { q: true },
dmg: ({ talent }, dmg) => dmg(talent.q['闪雷伤害'], 'q')
+}, {
+ title: 'E弹反护盾量',
+ dmg: ({ talent, attr }, { shield }) => shield(talent.e['护盾吸收量2'][0] / 100 * attr.hp + talent.e['护盾吸收量2'][1])
+}, {
+ title: 'Q护盾量',
+ check: ({ cons }) => cons >= 1,
+ dmg: ({ attr }, { shield }) => shield(0.16 * attr.hp)
+}, {
+ title: 'Q伤害减免',
+ dmg: ({ talent }) => {
+ return {
+ avg: Format.percent(talent.q['伤害减免'] / 100),
+ type: 'text'
+ }
+ }
}]
export const mainAttr = 'atk,cpct,cdmg'
diff --git a/resources/meta-gs/character/妮露/calc.js b/resources/meta-gs/character/妮露/calc.js
index df3097cc..ce32accc 100644
--- a/resources/meta-gs/character/妮露/calc.js
+++ b/resources/meta-gs/character/妮露/calc.js
@@ -11,10 +11,11 @@ export const details = [{
dmg: ({ talent, calc, attr, cons }, { basic }) => {
let pct = talent.e['剑舞步/旋舞步一段伤害2'][0] * 1 + talent.e['剑舞步/旋舞步二段伤害2'][0] * 1
let ret1 = basic(calc(attr.hp) * pct / 100, 'e')
+ let dynamicDmg = 0
if (cons >= 1) {
- attr.e.dmg += 65
+ dynamicDmg = 65
}
- let ret2 = basic(calc(attr.hp) * talent.e['水月/水轮伤害2'][0] / 100, 'e')
+ let ret2 = basic(calc(attr.hp) * talent.e['水月/水轮伤害2'][0] / 100, 'e', false, { dynamicDmg })
return {
dmg: ret1.dmg + ret2.dmg,
avg: ret2.avg + ret2.avg
diff --git a/resources/meta-gs/character/妮露/calc_auto.js b/resources/meta-gs/character/妮露/calc_auto.js
index 9190c515..64a228ae 100644
--- a/resources/meta-gs/character/妮露/calc_auto.js
+++ b/resources/meta-gs/character/妮露/calc_auto.js
@@ -15,10 +15,11 @@ export const details = [{
dmg: ({ talent, calc, attr, cons }, { basic }) => {
let pct = talent.e['剑舞步/旋舞步一段伤害2'][0] * 1 + talent.e['剑舞步/旋舞步二段伤害2'][0] * 1
let ret1 = basic(calc(attr.hp) * pct / 100, 'e')
+ let dynamicDmg = 0
if (cons >= 1) {
- attr.e.dmg += 65
+ dynamicDmg = 65
}
- let ret2 = basic(calc(attr.hp) * talent.e['水月/水轮伤害2'][0] / 100, 'e')
+ let ret2 = basic(calc(attr.hp) * talent.e['水月/水轮伤害2'][0] / 100, 'e', false, { dynamicDmg })
return {
dmg: ret1.dmg + ret2.dmg,
avg: ret2.avg + ret2.avg
diff --git a/resources/meta-gs/character/胡桃/calc.js b/resources/meta-gs/character/胡桃/calc.js
index f78ad05d..9d55a354 100644
--- a/resources/meta-gs/character/胡桃/calc.js
+++ b/resources/meta-gs/character/胡桃/calc.js
@@ -16,8 +16,8 @@ export const buffs = [{
title: '蝶引来生：开E获得[atkPlus]点攻击力加成',
sort: 9,
data: {
- atkPlus: ({ talent, attr, calc }) => {
- return Math.min(talent.e['攻击力提高'] * calc(attr.hp) / 100, attr.atk.base * 4)
+ atkPlus: ({ talent, attr }) => {
+ return Math.min(talent.e['攻击力提高'] * attr.hp / 100, attr.atk.base * 4)
}
}
}, {
diff --git a/resources/meta-gs/character/胡桃/calc_auto.js b/resources/meta-gs/character/胡桃/calc_auto.js
index 36e7e6a1..7c88d2ba 100644
--- a/resources/meta-gs/character/胡桃/calc_auto.js
+++ b/resources/meta-gs/character/胡桃/calc_auto.js
@@ -1,62 +1,61 @@
export const details = [{
- title: '半血开E重击',
- params: { team: false },
- dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2')
- }, {
- title: '半血开E重击蒸发',
- params: { team: false },
- dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2', 'vaporize')
- }, {
- title: '胡桃双水半血重击蒸发',
- params: { team: true},
- dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2', 'vaporize')
- }, {
- title: '半血开E后Q蒸发',
- params: { team: false },
- dmg: ({ talent }, dmg) => dmg(talent.q['低血量时技能伤害'], 'q', 'vaporize')
- }, {
- title: '胡桃双水半血Q蒸发',
- params: { team: true},
- dmg: ({ talent }, dmg) => dmg(talent.q['低血量时技能伤害'], 'q', 'vaporize')
- }]
-
- export const defDmgIdx = 2
- export const mainAttr = 'hp,atk,cpct,cdmg,mastery'
-
- export const defParams = {
- team: true
+ title: '半血开E重击',
+ params: { team: false },
+ dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2')
+}, {
+ title: '半血开E重击蒸发',
+ params: { team: false },
+ dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2', 'vaporize')
+}, {
+ title: '胡桃双水半血重击蒸发',
+ params: { team: true },
+ dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2', 'vaporize')
+}, {
+ title: '半血开E后Q蒸发',
+ params: { team: false },
+ dmg: ({ talent }, dmg) => dmg(talent.q['低血量时技能伤害'], 'q', 'vaporize')
+}, {
+ title: '胡桃双水半血Q蒸发',
+ params: { team: true },
+ dmg: ({ talent }, dmg) => dmg(talent.q['低血量时技能伤害'], 'q', 'vaporize')
+}]
+
+export const defDmgIdx = 2
+export const mainAttr = 'hp,atk,cpct,cdmg,mastery'
+
+export const defParams = {
+ team: true
+}
+
+export const buffs = [{
+ check: ({ params }) => params.team === true,
+ title: '双水共鸣：获得[hpPct]%生命值',
+ data: {
+ hpPct: 25
}
-
- export const buffs = [{
- check: ({ params }) => params.team === true,
- title: '双水共鸣：获得[hpPct]%生命值',
- data: {
- hpPct: 25
+}, {
+ title: '蝶引来生：开E获得[atkPlus]点攻击力加成',
+ sort: 9,
+ data: {
+ atkPlus: ({ talent, attr }) => {
+ return Math.min(talent.e['攻击力提高'] * attr.hp / 100, attr.atk.base * 4)
}
- },{
- title: '蝶引来生：开E获得[atkPlus]点攻击力加成',
- sort: 9,
- data: {
- atkPlus: ({ talent, attr, calc }) => {
- return Math.min(talent.e['攻击力提高'] * calc(attr.hp) / 100, attr.atk.base * 4)
- }
- }
- }, {
- title: '胡桃被动：半血获得33%火伤加成',
- data: {
- dmg: 33
- }
- },{
- check: ({ params }) => params.team === true,
- title: '夜兰：获得平均[dmg]%增伤',
- data: {
- dmg: 35
- }
- },{
- check: ({ params }) => params.team === true,
- title: '钟离：降低敌人[kx]%全抗',
- data: {
- kx: 20
- }
- },'vaporize']
-
\ No newline at end of file
+ }
+}, {
+ title: '胡桃被动：半血获得33%火伤加成',
+ data: {
+ dmg: 33
+ }
+}, {
+ check: ({ params }) => params.team === true,
+ title: '夜兰：获得平均[dmg]%增伤',
+ data: {
+ dmg: 35
+ }
+}, {
+ check: ({ params }) => params.team === true,
+ title: '钟离：降低敌人[kx]%全抗',
+ data: {
+ kx: 20
+ }
+}, 'vaporize']
diff --git a/resources/meta-gs/character/阿蕾奇诺/calc.js b/resources/meta-gs/character/阿蕾奇诺/calc.js
index 36245157..8c9ac1b5 100644
--- a/resources/meta-gs/character/阿蕾奇诺/calc.js
+++ b/resources/meta-gs/character/阿蕾奇诺/calc.js
@@ -1,53 +1,50 @@
export const details = [{
title: 'E后普攻一段伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.a['一段伤害'], 'a')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a')
+}, {
check: ({ cons }) => cons >= 2,
title: '血偿勒令回收伤害',
dmg: ({ attr }, { basic }) => basic(attr.atk * 900 / 100, 'e')
-},{
+}, {
title: 'E切斩伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.e['切斩伤害'], 'e')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.e['切斩伤害'], 'e')
+}, {
title: 'Q伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
+}, {
title: 'Q蒸发伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q', 'vaporize')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q', 'vaporize')
+}, {
title: 'Q治疗量',
params: { BondOfLife: 145 },
- dmg: ({ talent, attr, weapon }, { heal }) => heal(150 / 100 * ((weapon.name === '赤月之形' ? 170 : 145) / 100) * attr.hp + 150 / 100 * attr.atk)
+ dmg: ({ attr, weapon }, { heal }) => heal(150 / 100 * ((weapon.name === '赤月之形' ? 170 : 145) / 100) * attr.hp + 150 / 100 * attr.atk)
}]
export const defDmgIdx = 0
export const mainAttr = 'atk,cpct,cdmg,mastery'
-export const defParams = { BondOfLife: 130 }//生命之契在此调整,请勿超过200
+export const defParams = { BondOfLife: 130 }// 生命之契在此调整,请勿超过200
-export const buffs = [
-{
+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) / 100) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 ))
+ 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) / 100) * ((cons >= 1 ? (talent.a['红死之宴提升'] + 100) : talent.a['红死之宴提升']) / 100))
}
-},
-{
+}, {
title: '阿蕾奇诺天赋：在战斗状态下获得[dmg]%伤害加成',
data: {
dmg: 40
}
-},
-{
+}, {
title: '阿蕾奇诺6命：Q造成的伤害提高[qPlus],且释放后普通攻击与元素爆发的暴击率提高[aCpct]%,暴击伤害提高[aCdmg]%',
cons: 6,
data: {
- qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * (700 / 100),
- aCpct: 10 ,
- aCdmg: 70 ,
- qCpct: 10 ,
+ qPlus: ({ attr, params, weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * (700 / 100),
+ aCpct: 10,
+ aCdmg: 70,
+ qCpct: 10,
qCdmg: 70
}
}, 'vaporize']
-export const createdBy = 'liangshi'
\ No newline at end of file
+export const createdBy = 'liangshi'
diff --git a/resources/meta-gs/character/阿蕾奇诺/calc_auto.js b/resources/meta-gs/character/阿蕾奇诺/calc_auto.js
index 60494fe0..4997fa4c 100644
--- a/resources/meta-gs/character/阿蕾奇诺/calc_auto.js
+++ b/resources/meta-gs/character/阿蕾奇诺/calc_auto.js
@@ -1,59 +1,56 @@
export const details = [{
title: 'E后普攻一段伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.a['一段伤害'], 'a')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.a['一段伤害'], 'a')
+}, {
check: ({ cons }) => cons >= 2,
title: '血偿勒令回收伤害',
dmg: ({ attr }, { basic }) => basic(attr.atk * 900 / 100, 'e')
-},{
+}, {
title: 'E切斩伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.e['切斩伤害'], 'e')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.e['切斩伤害'], 'e')
+}, {
title: 'Q伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
+}, {
title: 'Q蒸发伤害',
- dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q', 'vaporize')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q', 'vaporize')
+}, {
title: '仆万香班 普攻尾段',
params: { team: true, Kazuha: true, BondOfLife: 200 },
- dmg: ({ talent }, dmg ) => dmg(talent.a['六段伤害'], 'a')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.a['六段伤害'], 'a')
+}, {
title: '仆万香班 Q伤害',
params: { team: true, Kazuha: true },
- dmg: ({ talent }, dmg ) => dmg(talent.q['技能伤害'], 'q')
-},{
+ dmg: ({ talent }, dmg) => dmg(talent.q['技能伤害'], 'q')
+}, {
title: '仆万夜钟 普攻尾段蒸发',
params: { team2: true, Kazuha: true, BondOfLife: 200 },
- dmg: ({ talent }, dmg ) => dmg(talent.a['六段伤害'], 'a', 'vaporize')
+ dmg: ({ talent }, dmg) => dmg(talent.a['六段伤害'], 'a', 'vaporize')
}]
export const defDmgIdx = 0
export const mainAttr = 'atk,cpct,cdmg,mastery'
-export const defParams = { BondOfLife: 130 }//生命之契在此调整
+export const defParams = { BondOfLife: 130 }// 生命之契在此调整
-export const buffs = [
-{
+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) / 100) * ((cons >= 1 ? (talent.a['红死之宴提升值比例'] + 100) : talent.a['红死之宴提升值比例']) / 100 ))
+ 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) / 100) * ((cons >= 1 ? (talent.a['红死之宴提升'] + 100) : talent.a['红死之宴提升']) / 100))
}
-},
-{
+}, {
title: '阿蕾奇诺天赋：在战斗状态下获得[dmg]%伤害加成',
data: {
dmg: 40
}
-},
-{
+}, {
title: '阿蕾奇诺6命：Q造成的伤害提高[qPlus],且释放后普通攻击与元素爆发的暴击率提高[aCpct]%,暴击伤害提高[aCdmg]%',
cons: 6,
data: {
- qPlus: ({ attr , params , weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * (700 / 100),
- aCpct: 10 ,
- aCdmg: 70 ,
- qCpct: 10 ,
+ qPlus: ({ attr, params, weapon }) => attr.atk * (Math.min((params.BondOfLife + (weapon.name === '赤月之形' ? 25 : 0)), 200) / 100) * (700 / 100),
+ aCpct: 10,
+ aCdmg: 70,
+ qCpct: 10,
qCdmg: 70
}
}, {
@@ -69,7 +66,7 @@ export const buffs = [
atkPlus: 1202.35
}
}, {
- check: ({ params , artis }) => params.team === true && artis.昔日宗室之仪 !== 4 ,
+ check: ({ params, artis }) => params.team === true && artis.昔日宗室之仪 !== 4,
title: '班尼特-昔日宗室之仪：增加攻击[atkPct]%',
data: {
atkPct: 20
@@ -122,11 +119,11 @@ export const buffs = [
kx: 20
}
}, {
- check: ({ params }) => params.team2 === true ,
+ check: ({ params }) => params.team2 === true,
title: '夜兰：获得[dmg]%增伤',
data: {
dmg: 35
}
}, 'vaporize']
-export const createdBy = 'liangshi'
\ No newline at end of file
+export const createdBy = 'liangshi'
diff --git a/resources/meta-gs/character/阿蕾奇诺/data.json b/resources/meta-gs/character/阿蕾奇诺/data.json
index 353de1e2..a1da0165 100644
--- a/resources/meta-gs/character/阿蕾奇诺/data.json
+++ b/resources/meta-gs/character/阿蕾奇诺/data.json
@@ -1,7 +1,7 @@
{
"id": 10000096,
"name": "阿蕾奇诺",
- "abbr": "阿蕾奇诺",
+ "abbr": "仆人",
"title": "孤暝厄月",
"star": 5,
"elem": "pyro",
@@ -429,8 +429,8 @@
"name": "厄月将升",
"desc": [
"阿蕾奇诺振舞厄月血火之翼，回收并清除周围的血偿勒令，造成火元素范围伤害，并在此后清除元素战技「万相化灰」的冷却时间及为自己恢复生命值，回复量基于她的生命之契数值与攻击力。",
- "就提瓦特常识来说，满月以外的月相皆是仅炼金术与占星术会用到的厄运隐喻。",
- "她梦中曾数次梦见的这一轮赤色之月，是噩兆吗？是，不过悲惨命运是属于激怒她的那些人的。"
+ "就提瓦特常识来说，满月以外的月相皆是仅炼金术与占星术会用到的厄运隐喻。",
+ "她梦中曾数次梦见的这一轮赤色之月，是噩兆吗？是，不过悲惨命运是属于激怒她的那些人的。"
],
"tables": [
{
diff --git a/resources/meta-gs/character/阿贝多/calc.js b/resources/meta-gs/character/阿贝多/calc.js
index d9c11b2c..c34b9ed5 100644
--- a/resources/meta-gs/character/阿贝多/calc.js
+++ b/resources/meta-gs/character/阿贝多/calc.js
@@ -5,7 +5,7 @@ export const details = [{
}, {
title: 'E刹那之花伤害',
dmg: ({ talent, attr }, { basic }) => {
- let ret = talent.e['刹那之花伤害'] * attr.def / 100 + attr.e.plus
+ let ret = talent.e['刹那之花伤害'] * attr.def / 100
return basic(ret, 'e')
}
}, {
@@ -14,7 +14,7 @@ export const details = [{
half: true
},
dmg: ({ talent, attr }, { basic }) => {
- let ret = talent.e['刹那之花伤害'] * attr.def / 100 + attr.e.plus
+ let ret = talent.e['刹那之花伤害'] * attr.def / 100
return basic(ret, 'e')
}
}, {
diff --git a/resources/meta-gs/info/pool.js b/resources/meta-gs/info/pool.js
index 1e2e523a..ea4ff5f7 100644
--- a/resources/meta-gs/info/pool.js
+++ b/resources/meta-gs/info/pool.js
@@ -33,7 +33,8 @@ export const poolName = {
芙宁娜: '众水的颂诗',
娜维娅: '明花蔓舵',
闲云: '鸾音鹤信',
- 千织: '千云绘羽织'
+ 千织: '千云绘羽织',
+ 阿蕾奇诺: '炉边烬影'
}
export const poolDetail = [{
@@ -603,6 +604,15 @@ export const poolDetail = [{
char4: ['芭芭拉', '行秋', '烟绯'],
weapon5: ['万世流涌大典', '苍古自由之誓'],
weapon4: ['暗巷的酒与诗', '幽夜华尔兹', '笛剑', '西风大剑', '西风长枪']
+}, {
+ version: '4.6',
+ half: '上半',
+ from: '2024-04-24 06:00:00',
+ to: '2024-05-14 17:59:59',
+ char5: ['阿蕾奇诺', '林尼'],
+ char4: ['菲米尼', '琳妮特', '香菱'],
+ weapon5: ['赤月之形', '最初的大魔术'],
+ weapon4: ['船坞长剑', '便携动力锯', '匣里灭辰', '昭心', '西风猎弓']
}
]
diff --git a/resources/meta-gs/weapon/sword/calc.js b/resources/meta-gs/weapon/sword/calc.js
index 523d5cc3..67161443 100644
--- a/resources/meta-gs/weapon/sword/calc.js
+++ b/resources/meta-gs/weapon/sword/calc.js
@@ -4,7 +4,7 @@ export default function (step, staticStep) {
title: '元素战技造成的伤害值提高[ePlus]',
sort: 9,
data: {
- ePlus: ({ attr, calc, refine }) => calc(attr.def) * step(40)[refine] / 100
+ ePlus: ({ attr, refine }) => attr.def * step(40)[refine] / 100
}
},
腐殖之剑: {
@@ -248,7 +248,7 @@ export default function (step, staticStep) {
hpPct: step(14 * 2)
}
}],
- 有乐御簾切: [staticStep('defPct', 20),{
+ 有乐御簾切: [staticStep('defPct', 20), {
title: '附近的角色在场上造成岩元素伤害后，普通攻击伤害提升[aDmg]%，元素战伤害提升[eDmg]%；',
refine: {
aDmg: step(16 * 2),