diff --git a/models/artis/Artis.js b/models/artis/Artis.js index e1308624..a5dce544 100644 --- a/models/artis/Artis.js +++ b/models/artis/Artis.js @@ -226,13 +226,19 @@ export default class Artis extends Base { isAttr (attr, pos = '') { let mainAttr = this.getMainAttr() let check = true - pos = pos || this.isGs ? '3,4,5' : '3,4,5,6' + pos = pos || (this.isGs ? '3,4,5' : '3,4,5,6') let dmgIdx = this.isGs ? 4 : 5 + let attrs = attr.split(',') Data.eachStr(pos.toString(), (p) => { - let attrs = attr.split(',') - if (!attrs.includes(mainAttr[p]) && (p === dmgIdx && !attrs.includes('dmg') && Format.isElem(mainAttr[p]))) { - check = false - return false + let posAttr = mainAttr[p] + if (!attrs.includes(posAttr)) { + if (p === dmgIdx && attrs.includes('dmg') && Format.isElem(posAttr)) { + return true + } + /* if (/Plus$/.test(posAttr) && attrs.includes(posAttr.replace('Pct', ''))) { + return true + } */ + return check = false } }) return check diff --git a/resources/meta-sr/character/alias.js b/resources/meta-sr/character/alias.js index 7cdabbf0..efa50f80 100644 --- a/resources/meta-sr/character/alias.js +++ b/resources/meta-sr/character/alias.js @@ -26,5 +26,5 @@ export const alias = { 黑塔: '转圈圈', '丹恒•饮月': '丹恒·饮月,饮月君,饮月,丹恒饮月,龙尊', '托帕&账账': '托帕,账账,总监', - 桂乃芬: '小桂子,桂师傅,网红,格尼薇儿' + 桂乃芬: '小桂子,桂师傅,网红,格尼薇儿,格妮薇儿' }