diff --git a/CHANGELOG.md b/CHANGELOG.md index f1fd9230..1e71593e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * 添加 纳西妲、莱依拉 的天赋及命座数据 * 可通过 `#草神天赋``#草神命座``#草神图鉴`查看 * 优化character的进入判定逻辑,防止一些额外的log触发 +* 角色相关命令在V3下会联合V3的角色别名一同查询 # 2.0.1 diff --git a/apps/help/theme.js b/apps/help/theme.js index df095526..99bc3fc0 100644 --- a/apps/help/theme.js +++ b/apps/help/theme.js @@ -37,7 +37,7 @@ let Theme = { let colCount = Math.min(5, Math.max(parseInt(helpConfig?.colCount) || 3, 2)) let colWidth = Math.min(500, Math.max(100, parseInt(helpConfig?.colWidth) || 265)) let width = Math.min(2500, Math.max(800, colCount * colWidth + 30)) - let theme = await Theme.getThemeCfg(helpConfig.theme, diyStyle.themeExclude || sysStyle.themeExclude) + let theme = await Theme.getThemeCfg(diyStyle.theme || sysStyle.theme, diyStyle.themeExclude || sysStyle.themeExclude) let themeStyle = theme.style || {} let ret = [` body{background-image:url(${theme.bg});width:${width}px;} diff --git a/models/character-lib/CharId.js b/models/character-lib/CharId.js index 8e7823fb..f6dfed28 100644 --- a/models/character-lib/CharId.js +++ b/models/character-lib/CharId.js @@ -52,9 +52,7 @@ async function init () { }) }) abbrMap = sysCfg.abbr - gsCfg = await Data.importDefault('plugins/genshin/model/gsCfg.js', 'root') - console.log(gsCfg) } await init()