From cbdd2c303dae7d6bb9fcca5d434c39b97d6116ea Mon Sep 17 00:00:00 2001 From: yoimiya-kokomi <592981798@qq.com> Date: Sun, 25 Sep 2022 21:56:10 +0800 Subject: [PATCH] =?UTF-8?q?`#=E5=96=B5=E5=96=B5=E5=B8=AE=E5=8A=A9`?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B8=AE=E5=8A=A9=E5=88=97=E6=95=B0=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E7=95=8C=E9=9D=A2=E9=80=8F=E6=98=8E?= =?UTF-8?q?=E5=BA=A6=E6=8F=90=E5=8D=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + apps/help.js | 4 +++- apps/help/style.js | 9 +++++++-- components/Data.js | 2 +- config/help_default.js | 9 +++++---- config/system/help_system.js | 9 +++++---- models/Artifact.js | 3 +++ models/ArtifactSet.js | 3 +++ models/Avatar.js | 4 ++-- models/AvatarList.js | 6 ++++++ models/Base.js | 6 ++++++ models/Character.js | 6 ++++++ models/Material.js | 3 +++ resources/help/index.css | 3 +-- resources/help/index.html | 19 +++++++++++++------ resources/help/index.less | 3 +-- 16 files changed, 66 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index c7b549f6..386874cf 100755 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /resources/help/help-cfg.js /config/character.js /config/profile.js +/config/help.js diff --git a/apps/help.js b/apps/help.js index 7449809d..a7a1401d 100644 --- a/apps/help.js +++ b/apps/help.js @@ -75,12 +75,14 @@ async function help (e) { helpGroup.push(group) }) - let style = customStyle(diyCfg.helpCfg?.style || {}, sysCfg.helpCfg?.style || {}) + let colCount = Math.min(5, Math.max(parseInt(helpConfig?.columnCount) || 3, 2)) + let style = customStyle(diyCfg.helpCfg?.style || {}, sysCfg.helpCfg?.style || {}, colCount) return await Common.render('help/index', { helpCfg: helpConfig, helpGroup, style, + colCount, element: 'default' }, { e, scale: 1.2 }) } diff --git a/apps/help/style.js b/apps/help/style.js index 28006cc7..a7132ed7 100644 --- a/apps/help/style.js +++ b/apps/help/style.js @@ -1,5 +1,6 @@ -export default function (diyStyle, sysStyle) { - let ret = []; +export default function (diyStyle, sysStyle, columnCount = 3) { + let width = Math.min(1360, Math.max(800, columnCount * 266 + 30)) + let ret = [`body,.container{width:${width}px}.help-table .td,.help-table .th{width:${100 / columnCount}%}`] let css = function (sel, css, key, def, fn) { let val = diyStyle[key] || sysStyle[key] || def if (fn) { @@ -8,6 +9,10 @@ export default function (diyStyle, sysStyle) { ret.push(`${sel}{${css}:${val}}`) } css('.help-title,.help-group', 'color', 'fontColor', '#ceb78b') + css('.help-title,.help-group', 'text-shadow', 'contBgColor', 'rgba(6, 21, 31, 0.5)', (c) => { + c = c.replace(/,[^,]+\)/, ',1)') + return `0 0 1px ${c};` + }) css('.help-desc', 'color', 'descColor', '#eee') css('.cont-box', 'background', 'contBgColor', 'rgba(43, 52, 61, 0.8)') css('.cont-box', 'backdrop-filter', 'contBgBlur', 3, (n) => `blur(${n}px)`) diff --git a/components/Data.js b/components/Data.js index f2917e9c..0df2d7c6 100644 --- a/components/Data.js +++ b/components/Data.js @@ -82,7 +82,7 @@ let Data = { } if (fs.existsSync(`${root}/${file}`)) { try { - let data = await import(`file://${root}/${file}`) + let data = await import(`file://${root}/${file}?t=${new Date() * 1}`) return data || {} } catch (e) { console.log(e) diff --git a/config/help_default.js b/config/help_default.js index befd3b91..1d7db1c4 100644 --- a/config/help_default.js +++ b/config/help_default.js @@ -10,16 +10,17 @@ export const helpCfg = { title: '喵喵帮助', // 帮助标题 subTitle: 'Yunzai-Bot & Miao-Plugin', // 帮助副标题 + columnCount: 3, // 帮助表格列数，2-5 style: { fontColor: '#ceb78b', // 主文字颜色 descColor: '#eee', // 描述文字颜色 - contBgColor: 'rgba(43, 52, 61, 0.8)', // 面板整体底色，颜色过透明可能导致阅读困难 + contBgColor: 'rgba(6, 21, 31, .5)', // 面板整体底色，注意与主文字颜色过近或太透明可能导致阅读困难 contBgBlur: 3, // 面板底图毛玻璃效果，数字越大越模糊，0-10 ，可为小数 - headerBgColor: 'rgba(34, 41, 51, .4)', // 板块标题栏底色 - rowBgColor1: 'rgba(34, 41, 51, .2)', // 帮助奇数行底色 - rowBgColor2: 'rgba(34, 41, 51, .4)' // 帮助偶数行底色 + headerBgColor: 'rgba(6, 21, 31, .4)', // 板块标题栏底色 + rowBgColor1: 'rgba(6, 21, 31, .2)', // 帮助奇数行底色 + rowBgColor2: 'rgba(6, 21, 31, .35)' // 帮助偶数行底色 } } diff --git a/config/system/help_system.js b/config/system/help_system.js index db75c815..eca2795f 100644 --- a/config/system/help_system.js +++ b/config/system/help_system.js @@ -8,14 +8,15 @@ export const helpCfg = { title: '喵喵帮助', subTitle: 'Yunzai-Bot & Miao-Plugin', + columnCount: 3, style: { fontColor: '#ceb78b', descColor: '#eee', - contBgColor: 'rgba(43, 52, 61, 0.8)', + contBgColor: 'rgba(6, 21, 31, .5)', contBgBlur: 3, - headerBgColor: 'rgba(34, 41, 51, .4)', - rowBgColor1: 'rgba(34, 41, 51, .2)', - rowBgColor2: 'rgba(34, 41, 51, .4)' + headerBgColor: 'rgba(6, 21, 31, .4)', + rowBgColor1: 'rgba(6, 21, 31, .2)', + rowBgColor2: 'rgba(6, 21, 31, .35)' } } diff --git a/models/Artifact.js b/models/Artifact.js index 4a507dc4..bf55d722 100644 --- a/models/Artifact.js +++ b/models/Artifact.js @@ -1,3 +1,6 @@ +/* +* 圣遗物 +* */ import Base from './Base.js' import { ArtifactSet } from './index.js' import { artiMap, attrMap } from '../resources/meta/artifact/index.js' diff --git a/models/ArtifactSet.js b/models/ArtifactSet.js index 53b11f1c..2ffc544b 100644 --- a/models/ArtifactSet.js +++ b/models/ArtifactSet.js @@ -1,3 +1,6 @@ +/* +* 圣遗物套装 +* */ import Base from './Base.js' import { abbr, artiMap, artiSetMap } from '../resources/meta/artifact/index.js' import { Artifact } from './index.js' diff --git a/models/Avatar.js b/models/Avatar.js index a671cfd0..c3bc1038 100644 --- a/models/Avatar.js +++ b/models/Avatar.js @@ -1,6 +1,6 @@ /* -* 用户角色 -* 抹平Profile及Mys Avatar +* 用户角色封装 +* 兼容处理面板 Profile Data 及 Mys Avatar 数据 * */ import Base from './Base.js' import lodash from 'lodash' diff --git a/models/AvatarList.js b/models/AvatarList.js index 748bb053..0ec24484 100644 --- a/models/AvatarList.js +++ b/models/AvatarList.js @@ -1,3 +1,9 @@ +/* +* 用户角色列表 +* +* 批量管理及天赋等数据获取 +* 使用 Avatar Model实现兼容处理面板数据及Mys角色数据 +* */ import Base from './Base.js' import lodash from 'lodash' import { Data, Common, Profile } from '../components/index.js' diff --git a/models/Base.js b/models/Base.js index 38bbfd36..ed4f69b0 100644 --- a/models/Base.js +++ b/models/Base.js @@ -1,3 +1,9 @@ +/* +* Base Model +* +* 使用Proxy实现meta数据的getter +* 对Character等可复用设置实例缓存，提高性能 +* */ import { Data } from '../components/index.js' let cacheMap = {} diff --git a/models/Character.js b/models/Character.js index 0cbfb9a0..c82855c2 100644 --- a/models/Character.js +++ b/models/Character.js @@ -1,3 +1,9 @@ +/* +* 角色数据 +* +* 支持角色查询及Meta元数据获取 +* 兼容处理自定义角色 +* */ import lodash from 'lodash' import Base from './Base.js' import { Data } from '../components/index.js' diff --git a/models/Material.js b/models/Material.js index 47c526a2..f505f506 100644 --- a/models/Material.js +++ b/models/Material.js @@ -1,3 +1,6 @@ +/* +* 角色培养及天赋材料 +* */ import lodash from 'lodash' import Base from './Base.js' import { Data } from '../components/index.js' diff --git a/resources/help/index.css b/resources/help/index.css index 6691ad93..b0db1f8f 100644 --- a/resources/help/index.css +++ b/resources/help/index.css @@ -35,7 +35,7 @@ body { border-radius: 0 0 10px 10px; display: table; overflow: hidden; - width: calc(100% + 30px); + width: 100%; color: #fff; } .help-table .tr { @@ -49,7 +49,6 @@ body { padding: 12px 0 12px 50px; line-height: 24px; position: relative; - width: 33.33%; text-align: left; } .help-table .tr:last-child .td { diff --git a/resources/help/index.html b/resources/help/index.html index 1f547c7f..50a5af6b 100644 --- a/resources/help/index.html +++ b/resources/help/index.html @@ -6,6 +6,7 @@ {{/block}} {{block 'main'}} +
{{helpCfg.title||"使用帮助"}}
@@ -17,19 +18,25 @@
{{group.group}}
- {{each group.list help idx}} - {{if idx%3 == 0}}
- {{/if}} + {{set len = group.list.length }} + {{each group.list help idx}}
{{help.title}} {{help.desc}}
- {{if idx%3 ==2 || idx == group.list.length -1}} + + {{if idx%colCount === colCount-1 && idx>0 && idx< len-1}}
- {{/if}} - {{/each}} +
+ {{/if}} + {{/each}} + <% for(let i=(len-1)%colCount; i< colCount-1 ; i++){ %> +
+ <% } %> +
+
{{/each}} diff --git a/resources/help/index.less b/resources/help/index.less index b9c9f978..6cc58f85 100644 --- a/resources/help/index.less +++ b/resources/help/index.less @@ -44,7 +44,7 @@ body { border-radius: 0 0 10px 10px; display: table; overflow: hidden; - width: calc(100% + 30px); + width: 100%; color: #fff; } @@ -60,7 +60,6 @@ body { padding: 12px 0 12px 50px; line-height: 24px; position: relative; - width: 33.33%; text-align: left; }