Merge remote-tracking branch 'origin/2.0.0' into 2.0.0

This commit is contained in:
yoimiya-kokomi 2022-09-17 04:37:25 +08:00
commit 9b6122a25b
4 changed files with 8 additions and 9 deletions

View File

@ -180,6 +180,7 @@ export default class ProfileArtis extends Base {
attrs[key] = ret attrs[key] = ret
}) })
let maxMark = ArtisMark.getMaxMark(attrs) let maxMark = ArtisMark.getMaxMark(attrs)
// 返回内容待梳理简化
return { return {
attrs, attrs,
classTitle: title, classTitle: title,

View File

@ -82,8 +82,9 @@ const CharArtis = {
title.push('纺锤') title.push('纺锤')
} }
// 圣遗物判定 // 圣遗物判定如果是绝缘4将充能权重拉高至沙漏圣遗物当前最高权重齐平
if (artis.is('绝缘4') && check('recharge', 75, 45, false)) { let maxWeight = Math.max(weight.atk || 0, weight.hp || 0, weight.def || 0, weight.mastery || 0)
if (artis.is('绝缘4') && check('recharge', maxWeight, 75, false)) {
title.push('绝缘4') title.push('绝缘4')
} }

View File

@ -1,6 +1,6 @@
export default function ({ attr, artis, rule, def }) { export default function ({ attr, artis, rule, def }) {
// 宵宫纯色流派 // 宵宫纯色流派
if (attr.mastery < 50 && attr.cp * 2 + attr.cd > 320) { if (attr.mastery < 50 && attr.cpct * 2 + attr.cdmg > 320) {
return rule('宵宫-纯火', { atk: 85, cp: 100, cd: 100, dmg: 100 }) return rule('宵宫-纯火', { atk: 85, cp: 100, cd: 100, dmg: 100 })
} }
if (attr.mastery > 200 && artis.is('mastery', 3)) { if (attr.mastery > 200 && artis.is('mastery', 3)) {

View File

@ -1,10 +1,7 @@
export default function ({ attr, artis, rule, def }) { export default function ({ attr, artis, rule, def }) {
if (artis.is('hp', '4,5')) { if (artis.is('hp', '3,4,5') && attr.hp > 40000 && attr.cpct * 2 + attr.cdmg < 100) {
if (artis.is('绝缘4') && artis.is('hp,recharge', 3)) { // 血牛钟离其余词缀权重不高于27.89,确保小生命命中副词缀最高权重
return rule('绝缘血牛钟离', { hp: 100, atk: 50, cp: 50, cd: 50, recharge: 100 }) return rule('钟离-血牛', { hp: 100, atk: 27, cp: 27, cd: 27, recharge: 27 })
} else if (artis.is('hp', 3)) {
return rule('血牛钟离', { hp: 100, atk: 50, cp: 50, cd: 50, recharge: 50 })
}
} }
return def({ hp: 80, atk: 75, cp: 100, cd: 100, dmg: 100, phy: 50, recharge: 55 }) return def({ hp: 80, atk: 75, cp: 100, cd: 100, dmg: 100, phy: 50, recharge: 55 })
} }