diff --git a/apps/character/AvatarCard.js b/apps/character/AvatarCard.js index 69d8e4ed..c6ae1417 100644 --- a/apps/character/AvatarCard.js +++ b/apps/character/AvatarCard.js @@ -123,7 +123,12 @@ let Avatar = { if (e?.runtime?.gsCfg) { let gsCfg = e?.runtime?.gsCfg Meta.addAliasFn('gs', 'char', (txt) => { - let roleRet = gsCfg.getRole(txt) + let roleRet + if (gsCfg._getRole) { + roleRet = gsCfg._getRole(txt) + } else { + roleRet = gsCfg.getRole(txt) + } if (roleRet.name) { return roleRet.name } diff --git a/components/Meta.js b/components/Meta.js index c57934a5..9d2c5a6c 100644 --- a/components/Meta.js +++ b/components/Meta.js @@ -123,6 +123,9 @@ class MetaData { const MetaFn = (fnKey) => { return (game, type, args = '') => { + if (!game) { + game = 'gs' + } let meta = Meta.create(game, type) return meta[fnKey](args) } @@ -154,7 +157,7 @@ const Meta = { // 在各个游戏内匹配,以传入的game优先 matchGame (game = 'gs', type, txt) { txt = lodash.trim(txt + '').toLowerCase() - let games = game === 'gs' ? ['gs', 'sr'] : ['sr', 'gs'] + let games = (!game || game === 'gs') ? ['gs', 'sr'] : ['sr', 'gs'] for (let currGame of games) { let id = Meta.getId(currGame, type, txt) if (id) { diff --git a/models/character/CharImg.js b/models/character/CharImg.js index e58a6aba..94cb546a 100644 --- a/models/character/CharImg.js +++ b/models/character/CharImg.js @@ -145,6 +145,7 @@ const CharImg = { add(`cons${i}`, `imgs/cons-${i}`) } } + imgs.banner = 'meta-sr/character/common/imgs/banner.webp' imgs.cons3 = imgs[talentCons[3]] imgs.cons5 = imgs[talentCons[5]] return imgs diff --git a/resources/meta-gs/weapon/catalyst/讨龙英杰谭/gacha.webp b/resources/meta-gs/weapon/catalyst/讨龙英杰谭/gacha.webp index f37d1eb4..be43ebdc 100644 Binary files a/resources/meta-gs/weapon/catalyst/讨龙英杰谭/gacha.webp and b/resources/meta-gs/weapon/catalyst/讨龙英杰谭/gacha.webp differ