diff --git a/models/Player.js b/models/Player.js index ffde0526..0ce5c5dc 100644 --- a/models/Player.js +++ b/models/Player.js @@ -52,6 +52,24 @@ export default class Player extends Base { } } + get faceImgs () { + let char + if (this.isGs && this.face) { + char = Character.get(this.face) + } + if (!char) { + let charId = lodash.keys(this._avatars)[0] + if (charId) { + char = Character.get(charId) + } + } + let imgs = char?.imgs || {} + return { + face: imgs.face || '', + banner: imgs.banner || '' + } + } + static create (e, game = 'gs') { if (e?._mys?.uid || e.uid) { // 传入为e diff --git a/resources/meta-sr/artifact/artis-mark.js b/resources/meta-sr/artifact/artis-mark.js index eb78a2c9..c64f0eee 100644 --- a/resources/meta-sr/artifact/artis-mark.js +++ b/resources/meta-sr/artifact/artis-mark.js @@ -3,6 +3,7 @@ * 如character/${name}/artis.js下有角色自定义规则优先使用自定义 */ export const usefulAttr = { + 罗刹: { hp: 0, atk: 100, def: 0, speed: 100, cpct: 100, cdmg: 100, stance: 0, heal: 100, recharge: 100, effPct: 0, effDef: 50, dmg: 100 }, 银狼: { hp: 0, atk: 75, def: 0, speed: 100, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 75, effPct: 100, effDef: 0, dmg: 100 }, 景元: { hp: 0, atk: 75, def: 0, speed: 100, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 }, 希儿: { hp: 0, atk: 75, def: 0, speed: 100, cpct: 100, cdmg: 100, stance: 0, heal: 0, recharge: 50, effPct: 0, effDef: 0, dmg: 100 }, diff --git a/resources/meta/artifact/artis-mark.js b/resources/meta/artifact/artis-mark.js index 4a22760b..8cc17262 100644 --- a/resources/meta/artifact/artis-mark.js +++ b/resources/meta/artifact/artis-mark.js @@ -49,7 +49,7 @@ export const usefulAttr = { 砂糖: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 100, dmg: 75, phy: 0, recharge: 55, heal: 0 }, 雷泽: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 100, recharge: 0, heal: 0 }, 夜兰: { hp: 80, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 }, - 久岐忍: { hp: 100, atk: 50, def: 0, cpct: 50, cdmg: 50, mastery: 100, dmg: 75, phy: 0, recharge: 55, heal: 100 }, + 久岐忍: { hp: 100, atk: 50, def: 0, cpct: 100, cdmg: 100, mastery: 100, 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: 30, heal: 0 }, 提纳里: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 90, dmg: 100, phy: 0, recharge: 30, heal: 0 }, 柯莱: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 },