From a0e9860971e5df1dcae0196bd4281e60508027a4 Mon Sep 17 00:00:00 2001
From: yoimiya-kokomi <592981798@qq.com>
Date: Mon, 26 Sep 2022 00:41:09 +0800
Subject: [PATCH] =?UTF-8?q?`#=E5=96=B5=E5=96=B5=E5=B8=AE=E5=8A=A9`?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=AE=E8=82=A4=E8=87=AA=E5=AE=9A=E4=B9=89?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 4 +-
CHANGELOG.md | 8 +--
apps/help.js | 10 ++--
apps/help/style.js | 23 --------
apps/help/theme.js | 71 +++++++++++++++++++++++++
config/help_default.js | 22 ++++----
config/system/help_system.js | 4 ++
resources/help/index.html | 3 +-
resources/help/index.less | 3 --
resources/help/theme/default/bg.jpg | Bin 0 -> 38498 bytes
resources/help/theme/default/config.js | 9 ++++
resources/help/theme/default/main.png | Bin 0 -> 761092 bytes
resources/help/theme/目录说明.txt | 21 ++++++++
13 files changed, 127 insertions(+), 51 deletions(-)
delete mode 100644 apps/help/style.js
create mode 100644 apps/help/theme.js
create mode 100644 resources/help/theme/default/bg.jpg
create mode 100644 resources/help/theme/default/config.js
create mode 100644 resources/help/theme/default/main.png
create mode 100644 resources/help/theme/目录说明.txt
diff --git a/.gitignore b/.gitignore
index 386874cf..b604ccf9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
/resources/character-img/*/upload/
/resources/help/help-list.js
/resources/help/help-cfg.js
+/resources/help/theme/*
+!/resources/help/theme/default
/config/character.js
/config/profile.js
-/config/help.js
+/config/help.js
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08d27dc7..546771ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
# 2.0 Alpha.8
* `#喵喵帮助`配置功能升级
- * 为统一配置目录，配置文件迁移至**config/help.js**
- * 如之前自定义过配置文件，原目录下的help-cfg.js仍能够识别，但建议移至新目录以使用更多功能
- * 支持帮助文字、背景颜色通过配置自定义，防止后续css冲突
+ * 支持自定义帮助皮肤包，皮肤目录为**resources/help/theme**
+ * 若有多套皮肤包，默认随机使用，可通过**config/help.js**指定
+ * 支持配帮助文字颜色及容器颜色与透明度
* 支持图片毛玻璃效果，默认开启，可通过配置关闭
+ * **注意1：** 如之前更改过底图可能会在更新后失效，可将自定义底图放置在皮肤包目录内
+ * **注意2：** 为统一配置目录，帮助配置文件迁移至**config/help.js**，如之前自定义过配置文件，help-cfg.js仍能够识别，但建议移至新配置目录以使用后续更多功能
* `#上传深渊` 页面样式调整
* 队伍人数少于4人时展示样式优化，样式未完全稳定
diff --git a/apps/help.js b/apps/help.js
index a7a1401d..c6063f71 100644
--- a/apps/help.js
+++ b/apps/help.js
@@ -1,7 +1,7 @@
import lodash from 'lodash'
import fs from 'fs'
import { Cfg, Version, Common, Data, App } from '../components/index.js'
-import customStyle from './help/style.js'
+import Theme from './help/theme.js'
let app = App.init({
id: 'help',
@@ -74,15 +74,11 @@ async function help (e) {
helpGroup.push(group)
})
-
- let colCount = Math.min(5, Math.max(parseInt(helpConfig?.columnCount) || 3, 2))
- let style = customStyle(diyCfg.helpCfg?.style || {}, sysCfg.helpCfg?.style || {}, colCount)
-
+ let themeData = await Theme.getThemeData(diyCfg.helpCfg || {}, sysCfg.helpCfg || {})
return await Common.render('help/index', {
helpCfg: helpConfig,
helpGroup,
- style,
- colCount,
+ ...themeData,
element: 'default'
}, { e, scale: 1.2 })
}
diff --git a/apps/help/style.js b/apps/help/style.js
deleted file mode 100644
index a7132ed7..00000000
--- a/apps/help/style.js
+++ /dev/null
@@ -1,23 +0,0 @@
-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) {
- val = fn(val)
- }
- 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)`)
- css('.help-group', 'background', 'headerBgColor', 'rgba(34, 41, 51, .4)')
- css('.help-table .tr:nth-child(odd)', 'background', 'rowBgColor1', 'rgba(34, 41, 51, .2)')
- css('.help-table .tr:nth-child(even)', 'background', 'rowBgColor2', 'rgba(34, 41, 51, .4)')
- return ``
-}
diff --git a/apps/help/theme.js b/apps/help/theme.js
new file mode 100644
index 00000000..00bf5822
--- /dev/null
+++ b/apps/help/theme.js
@@ -0,0 +1,71 @@
+import lodash from 'lodash'
+import fs from 'fs'
+import { Data } from '../../components/index.js'
+
+let Theme = {
+ async getThemeCfg (theme, exclude) {
+ let dirPath = './plugins/miao-plugin/resources/help/theme/'
+ let ret = []
+ let names = []
+ let dirs = fs.readdirSync(dirPath)
+ lodash.forEach(dirs, (dir) => {
+ if (fs.existsSync(`${dirPath}${dir}/main.png`)) {
+ names.push(dir)
+ }
+ })
+ if (lodash.isArray(theme)) {
+ ret = lodash.intersection(theme, names)
+ } else if (theme === 'all') {
+ ret = names
+ }
+ if (exclude && lodash.isArray(exclude)) {
+ ret = lodash.difference(ret, exclude)
+ }
+ if (ret.length === 0) {
+ ret = ['default']
+ }
+ let name = lodash.sample(ret)
+ let resPath = '{{_res_path}}/help/theme/'
+ return {
+ main: `${resPath}${name}/main.png`,
+ bg: fs.existsSync(`${dirPath}${name}/bg.jpg`) ? `${resPath}${name}/bg.jpg` : `${resPath}default/bg.jpg`,
+ style: (await Data.importModule(`resources/help/theme/${name}/config.js`)).style || {}
+ }
+ },
+ async getThemeData (diyStyle, sysStyle) {
+ let helpConfig = lodash.extend({}, diyStyle, sysStyle)
+ 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, helpConfig.themeExclude)
+ let themeStyle = theme.style || {}
+ let ret = [`
+ body{background-image:url(${theme.bg});width:${width}px;}
+ .container{background-image:url(${theme.main});width:${width}px;}
+ .help-table .td,.help-table .th{width:${100 / colCount}%}
+ `]
+ let css = function (sel, css, key, def, fn) {
+ let val = themeStyle[key] || diyStyle[key] || sysStyle[key] || def
+ if (fn) {
+ val = fn(val)
+ }
+ 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)`)
+ css('.help-group', 'background', 'headerBgColor', 'rgba(34, 41, 51, .4)')
+ css('.help-table .tr:nth-child(odd)', 'background', 'rowBgColor1', 'rgba(34, 41, 51, .2)')
+ css('.help-table .tr:nth-child(even)', 'background', 'rowBgColor2', 'rgba(34, 41, 51, .4)')
+ return {
+ style: ``,
+ colCount
+ }
+ }
+}
+export default Theme
diff --git a/config/help_default.js b/config/help_default.js
index 1d7db1c4..004a6dc1 100644
--- a/config/help_default.js
+++ b/config/help_default.js
@@ -10,18 +10,16 @@
export const helpCfg = {
title: '喵喵帮助', // 帮助标题
subTitle: 'Yunzai-Bot & Miao-Plugin', // 帮助副标题
- columnCount: 3, // 帮助表格列数，2-5
- style: {
- fontColor: '#ceb78b', // 主文字颜色
- descColor: '#eee', // 描述文字颜色
-
- contBgColor: 'rgba(6, 21, 31, .5)', // 面板整体底色，注意与主文字颜色过近或太透明可能导致阅读困难
- contBgBlur: 3, // 面板底图毛玻璃效果，数字越大越模糊，0-10 ，可为小数
-
- headerBgColor: 'rgba(6, 21, 31, .4)', // 板块标题栏底色
- rowBgColor1: 'rgba(6, 21, 31, .2)', // 帮助奇数行底色
- rowBgColor2: 'rgba(6, 21, 31, .35)' // 帮助偶数行底色
- }
+ colCount: 3, // 帮助表格列数，2-5
+ colWidth: 265, // 单列宽度，默认265
+ /* 皮肤选择，可多选，或设置为all
+ 皮肤包放置于 resources/help/theme
+ 皮肤名为对应文件夹名
+ theme: 'all', // 设置为全部皮肤
+ theme: ['default','theme2'], // 设置为指定皮肤
+ */
+ theme: 'all',
+ themeExclude: ['default'] // 排除皮肤：在有其他可选项时会忽略此中列举的皮肤
}
// 帮助菜单内容
diff --git a/config/system/help_system.js b/config/system/help_system.js
index eca2795f..17f501fd 100644
--- a/config/system/help_system.js
+++ b/config/system/help_system.js
@@ -9,6 +9,10 @@ export const helpCfg = {
title: '喵喵帮助',
subTitle: 'Yunzai-Bot & Miao-Plugin',
columnCount: 3,
+ colWidth: 265,
+ theme: 'all',
+ // 排除皮肤，在theme设置为all时会忽略此设置项中的皮肤
+ themeExclude: ['default'],
style: {
fontColor: '#ceb78b',
descColor: '#eee',
diff --git a/resources/help/index.html b/resources/help/index.html
index 50a5af6b..5a638c7d 100644
--- a/resources/help/index.html
+++ b/resources/help/index.html
@@ -2,6 +2,7 @@
{{block 'css'}}
+<% style = style.replace(/{{_res_path}}/g, _res_path) %>
{{@style}}
{{/block}}
@@ -26,7 +27,6 @@
{{help.title}}
{{help.desc}}
-
{{if idx%colCount === colCount-1 && idx>0 && idx< len-1}}
@@ -36,7 +36,6 @@
<% } %>
O_w+PMwc@2~|06G!>my
zT3_9vG;7Ci?%?qKh5VIR-ehr#jTm06?0OvspJP}v8QjW5p>oPw3zN$@sBMxgq>Q$`AnwUa`q4=6SY(r9st&+DwH6@|WI+$&k!Znj~aj}m&4QV@?
z5WAW-Lr*UvYEtNG^Oj1xO~f2;cKhH>UD-!d<1^4{EWrjop+dm?LoWO9KuZ0dxjAdXlwpHV(ge;az@Nu%bq9a_rR#KI{zaa~bfHe8^MS5x{E
zSzUS%{mp$%NhYs5m+^08l4PfYe^K4IlMY`~OzbIe(5dA4PK@PMhoO|PC}c6Z{!xZG
zS*tLkxTQ#(L)>wd)SgXF!_2Wx{9aB}-ZKVrwzA4ImM9>XR+?spWgiyBXJ-p(6>V&EEArI%+t^E4)tGvd
zIX8oi_R*Mrf|DrMFG4j!e{*Iwp$`TM(lu}+)QHBTdo4(_hq1;J?8efDYY1O01d8&)
zoRzKGmbDY5l#+>h9S0hW)(LwWGmV@+hva@lY-l)8IYV0(viln7Jn5krSd4TRDc4ba
zz8J@$Jic2wALpdnu0{I`KTNEWmNycZdlmU2ZGU4HP>eZ0W8-KuX32>9QTKT#jIO7}Wp*MVj=!NV
z3{$Yy1)`BO@Fk#}n!i%5URLN%%}F)339D>e-gg{rk*?&mDl|WimCyZ(t2C{5oR#@$
zx<4p;A*S%R5?OnhWTD9LX@TR|-|37CI*Gk^GO#NxPKHvzoGWEugq2bKNZaYxse!o?
z-H_^G3+SL$`-#rE6NtuI$u*gR9iA{lyY&=#9Fo}>ZU;Cql(sa-Y?_lfINjjo<7!cN
z8axd>QORs)?l@=VsSoZ@mG$qlZ})&tdf)M25a=2l6Jj%hQJsd9A?#{L>PFj=
zl%oq>zM6_2dluzYgYX$)%ZD=b1jIWqmo6zKI5nCgrylV7nGdDu?2
zcoTSkOl9n6-4Po7D_*6S7gj@VIuDwbwI7ljdcq$S9fw^9kw~LMS%Xq?YoS*yK$Cdt
zE_O|$g&NO7X)Sg>Y2<5#o!LmZI?4Rcm#b`$_zDqnN;}YRc+EN=Ze!
zjS^@-iXkQ3UlUCTVvG{CL+Uu!sMFO8ip(`--8?^ZDf=Bw6qr!7GMMG+Ie1z>LA&`l
z?_6~h<}_-=#ol#Ne0j%BMOWju9Tc;+#5@?!b5k}VWY4gYwz~v9Zcp-
zZaMz|-U-ttWv20y4qDWUQC%#j)c=FKss88tBW(o1R9h$<)d-02GUNx%7
z-wDYrVeQx~w&}m(#)O_1D
zo~N#mM8K1HVx0EsVYS(fr<3JuiT3T?{03iWRzt#in9<11I{ei@k(
zrDoGC`Bi0P?kq2{q>tj9^%_)3Xhj#rV%PLXSp83mlL@ZEX>O$zaSwA-TpuMXW;oDe%nK<_ge+DyddU-#7Mr$Z
z$t&z-k)NiL&cx0OQp=5(X{{X4FAu~pWGLqDWu=E?_j;0b_MGsLYsjMALW2oenzM@f~gy-}!
zi841oRR?n(<6TE;xV3a;f0H()c=FkytvauxZI!BrSN*ooxAR%}EdK!cty9NQLz+Lv
z&rw2Ayb%0u$^QU$jQky|(Q15?s(V4F%T|tpUMJ1G@k3Xq7ouWmLh3<>9*z%{>s8$3
zyp>&cA$b*^@$_6(I!t^t5P8G&&a2@-Z9Sq7hmqU5
zWZKO=^QkZHVXE6jdbnk|E@}S&b9o}oq_u6W1nSdIxb`L|sSRnQ8LTn5)YAyiQncJr
zzM^U8MvTTfF*$s9`wGoM`a4%Ks${O39lDM-9HT0G39MIiXGi-Lj3ufPS_*3-v}EM*
z8Y0ddOU#XRBl~sxl4*h3>R!xtaPcR>B?DGk;!I3-G{A>5FgEcA>|;_jf3W102>8q8
zme~(7W$1Qg?%}GYS$NkgFJ&V5Ol8JI??#_ijWq0NpHmuiCL!s8nm9+G`*$%5G9_%-
zt!lFMjSev8a`qhBA5`RRG}I0>*
z(m1SHEV2EhaLpskTArfBp~{0Q
zP`P85VmuJ*tIkD;9}sakPtWqX-X{{Tzx+Dtx4>14^APJ0iJQO~R$#=Ll(*tMEgO(ulz
zTUVz-7Q*>J=PXSxRKAk_kgB0-&P`2r7c8k46&cA2t>xs!btTlEB-*}*Rw`m_o=8m`
ztC$mB=v8U9^h9saI4tNh#1zqq{r0PEl5Wh$>(7l!^P&uhIu
zsmi{0;^nef_m+IJ()n0ztZse|mVez>0<~@MTF#=cHu0eqt7_Oyp+653nv9i*Ejtge+sbHmt@7K$@2Oh5
zCkHR&Nov#1+H5^5T_F!T4a&gW`x3JnCPQkiEm6jKcVo8fR-=Z@=c(}%Yb0)k*lKjk
zD%-=@PEeO6jYz9WEI|p7*%D7AnfWa4eo9{QEc%>Vz?xpdYMK(g%%zecDBs+8!g}s1
z7S#jLO(pdECd?SebgGNIxctm-aI9Ww+GBKPE>eM>fgi;Vne1
zi64@ePBRA^rpzyL5)m-B+qq(8R|F2
z2x|yi7~In`EBO3&?KOYNBq?3eJv0hkM*iJRx4AfEj8Dy9=5_*e_8YBMz
zLtRB8NzGoU=Hr(_6VF0cQIR_P_8o4LeOb!1R-MZ_(>eVHontsmj5X1Yo*Jib?P6|?
zxA@AB+_#g=?);B1o)UwH`uE|+--6Ck>nHyJ=P1cdWJelg?T>+sgPm
zW%M)iQ}Osrkps*p
zx#${+O~@~$sA{{Zl_uloy>Vy?FT0D*Bz)#@&7F6YL{+A}>j)VlFi
z)Be`3RKet5=>Gt(UoDl_7Ohm>bJeDKU;92UEvNFV#3}XAqw#p|-03NQQ9t9dxBXjD
z_mM9z`pHxKpDOG3DLyA=nuRMbV*dci;^5~=U(vC`$3g!9j~!(WDtpk0Fq4{QXNcme~Mpsi*pFwl7k8}S3
zqVI?Q00umYJsF{{XD~emcBWT8&%R
zm@!HWqMcj*<@vwoyzlos>s#MB>twC%zOT01wfFDZ*FA~Q(@`fUVIaZ5!6DbUr(%GE
zgZBdm=gQDkLZIhZBcTv@5WC+q^~Av;y?#koaNcFm;owkkI2b+jdZ>M03gYG>U~TJW
z0~PRfaR+AO;K<1Px?4k>pk8b?P&)@#S$52~CU!OlTUmA!QEfqOcV(!(!@cJoP{Zds
zMv&)D5J_8hc{w&2Unzir3)IV+&DX`*)lmi;$hDd7FG8^q4`dy1EnEW6^RK(>e4
zdTh#W9#A$h0YQF@(T$`iGrnsgxUW5#|}vI
zuzezBprZDtETARJZtvygE(HSl`1lC;2n)D**nxy3B_%I;fWiF041P~PS1)T{epgS9
zzc{EsJs}=Ay=2(|P5&^##a&zbZ^o{ke>w_q8OYb#9V8?m2y$_`
zwCne5PcPMHz~VpE_-|)>8u__HK?YDyH*XIJRP`Cu)r;d_%MGCavf@8j4ov@hu`T3p
z!S3E3&cCg+yLq{J+Pk^`z2v_L`+NAeeSc{O?CpO){VzxS
zHPOrA$^T%*<;Z{G3H5dOAEsW8{5=)e11S|Zi1(!>8Y+K9m8~1Z!B*;TWuBUUJiL_4KlKg+MR40X+f^04J!3
zsGtN?(uQA1RNR_h!d66x-x@3=!7pqrEGPmNdm;g`75{6!u7?AV7}n1J)JjEFNf9h2
zp&}uosv@c^q9Ud&BB(5;s00>L6&Dm#1=iX^q@K8WxL5-*;^1O!2L-vi+Of0!%Yyq*
zJ8OuahMtkKih~{06PTtdp(Z4%tR@UrQx+1EP!v)Giz|tVE2=1qiixO*Dk=VRwX&PD
zn}@cWEmW3W_@Dh6%F22kZciMXfq~!pODTImt-YWs0LiigSqA186y_HeG7=P)5|)qx
zi}49cNC^u5F%{tF@Wk(*Q$_fN1dYH#Qo|_G1M&q0K|+^*{~R~{H{<^rHg1pX^>{*dkI_QcD_+5@U+2W-i|
z4~Rb&LF}zv?V!M^1Y!sMZyN)Fidln2A>#ZJ;$p)5HZ~#>{5D{)1V2O^3>A^I5f_&b
z2e$YRf&Vn-uQULQOM!*|KQad5=K2ik;q|ZGakuuc27(+2A6fP%9&Rpdf53{PJJgQN
z%Z<(2-QC#%@;kyo&s=T)JiPwKoB!Eswong;e+0ol#r&-U+y6;{|2F2t#f7Y&2nj;@
zZN#D0{Ney0^IHRv#t#)02aDNA2tp;H(Eq<|)4w;y77P)xwiV--u(6fo2TO{G@k>HQ
zA^c!5No%1e5~9|U*8j_x`!CS@|8fHTz2AR%_n*P=I|TkslwAhmzfQaVF;V~Xko!L)
z@853He^w6s&%p5i(k6i}tJFWx8}xq%_CMMxe_KF2o!CX=a}c8fUjh2_c!#*{iT}-aPUEd
zpNR5H+Spk01ErEAzqO5oEkD#oSWr^pi48>DRz&8vBb^=opR4~9%l@(YH=jS$0R6A^
z{ar^WIe1-G7k|_le+vKSVJs){58ju14XF5Uy8amw|E-MQ6aI120mT090aV=a~VN8
zTwy^{DqKlC+zfi0mAZm}6bF;}`U+EH**RtRTCLh7rN}reNY(jXkbR0`1odj9R>Y|0
zBc)X(FPwYPZTC+EtPV~ax@-e~t(<^$;fId*yt`tauQ$RF-xJn_RN`-XS`TBAe>M!4c-DJKEb`BXS>&;cUFEslsNLMt*`0&kTyAs^KoI~9
znZ!(Ih3*Lq@4hb3XVrvxx-haR}OSp{wK
zzznGt64l{}M2F>(?qL9b06tk?rT^yj>yw34z&M~tD~tTIezsj;0qvi^`=6ft8oG}CvDJlsI}tm@q5ftjS3Pznw~V!>>rKyu
zdTbYxMV37_cW$NoEd+bCb-K^7bl9acnXCQ=a6D^O8LQ-zSSEn#1N$4#e+ivzI;o@i
z%Icp`vIfqvNd0^lu+i*?s0yX?BmUUk=K3R?e&7@d9?_iPHDGu1k
zGeK#A8f>imcW<05lY(YwE&Zn&cV?|mX1{=D?6PESoA&#yPgV_yPzky$pLJ!uy91HZ
zL}(wloNdf*s!+KZ?sm`y0Wltx#OQ&*bQ3Ca$WhLNuY7%
zn0Jp0br@-b9zL-Gu?fGo1B(}w&>wRxmi6p-obtMRga@rQE>+ymWq(k=+N
zoEriT07jO)8z{5M7Lg_Eh5%W7My3et!K~_?%cjIp#<1^}wf-HJRVnDPJ`*&fN$He$
z>7y?uAgij0(j5fIs{V1=qefeF2j945CAOE#sq9gmEkOMf{^u19{`1pONP#I*Em{C@
zk*H%~Bsy(G>)A&CrDHN=FL5>S=S$hZRRCL^BM`503s5~P1pqK}!IowT0He8J=w8v^
z=3F}C($e#vlCaauJ^9Fu0?>8ly1LGkX8~d=$__NOUyzKdO|V1P8fszNcSo?@eCnto
zNCCPi*ABe_0rpH-tG)~_;dF_PDG1BNttJ~ZmlI$*8zf-JQYvWPveCU~S}O&>z9=lJ
z=L>eU+z|V-+|a)?Q^Eytd4gm}I059M%PN1_24GjlNjFOZlA^;uCCojrg8-gixDnF;
zbt8OBGiCk81u~a~f1)&|4t3#G$bpO+WXjQbM#8R?&-$Z!JKAIc0Gbi|Otp{EVP9xb
zYosaY4o_P2)O9;lhvDfgsU2cwzu;w8a&n_tFVy`{!`N*P0FS&sn0|Jc$NgL#5iH6t3F~k$M~?l0Bt6H
z#P%iu?*L6#IbmbO=Rcd2?kqg2^%%2k0I13YUG;GSbptkLS#E+FTB`-!aoQr507#
zJuX1`b)-d|GsptSgh!3`0NJ3!_t*4vN`IM=Zh?o|F!b~#`vo91
z_L@w}>K)KfCq(8qdqkF`9Vn{?yLYTLZu!+2-SH7SYYG=nL72nNQ3O+MtMed>N;|GV
z=_W4#DH?2bGZ+2*Hh%!e=A;A6Ap$uvP)h*2z%rkl`oL>0(k~7!#?R3gKiy{X5|F3}
zNEZroc2G9y7O=vIEeqJ_!-@x;iK9#ckv?d{g3oyj#m*`8WZ{(dB2V@>v!EmZ{rXH7kx^x0<@enZc3=!!TD$@~
zHD9Q(IvKP2k~QCi*iKEWIPpPOep{zS6|hdbH68WnPJ#lL4Y8zIr_pEAZl}osSf?gC
z1e0%%Wx$&8Nw~W1^u-3$sp-(dsjU9#R3o<46YF*XBmgQc0egVVD#s3+o-`dHF7nUj
z(=_#lnCxN8D1@ri?|>
zrYu9sb)nwB<@|fo(=j0GRZqkl4=ui37679ct3Ie&4sMj{$tzjU%@A3iU-cHx*Ivv1
zJdpp)-LzX7u-{A#JI-svE|U_Wj{!ZAS@Mr{WzV7mwyGx3jAiwXK?m2fKC`B0)pTW@
zzBya4f{ir#0Y$@78ZBzr2mXZ{9x%;vJYa|oTR1BYSg#412;3LHC_dXPJF7eEbvw^L
z3tc$nKRIaHGeL_toz7s*t$s0|jAG791C{{aQpz7N!%i3ZuqY>P0D)=IwE(T<0rlrp
zANFUD=d+DTde}Bl^Q|A5!hRhAWu#3HT(;a6k+JCe>-6#@04j68jd)m$8%w9ZdrmH1TFq+)~;GRPQlqDfztpJSMjby#N%emN38<$ES+0
zO2%Hd!FSM7>Ztgv4LI3ZS>&HIo&4Iu_I^}H
zjkT3ci(ARsAR65V;gUzivObGY*so(eZ2LYDss~9qnSfxe;D$>#mtCAjVcR{4P(w(H
zDF}k4qRY~Ehy`{YEPFl+L}hIXs@%@%a~E9NK2|=cyAhj7i|W&rbF+eNs-A2bf+kJi
z{sWEYKvlI@1OI|J-4;jhTlo#M9EBF3qM8nwPg+f~DiA?yGuY!Y{~5W%DsHr=RlsoL
zPE`SF-wHO|cr@lVQ_yt$>1;D4XrXa$3^Q4Fv5lE3xLD*p>79U=BQ6fyrjU);4*};N
zb*E_?u`VaAn1C68f!(E~-oP!NM%SPVz9u)y^Yanxj#bdG+(i;MTDa*V@eFHqkspBl
zs5^yc1)B!C-KGkHkdy%ItbwLLXTzWwP|#8e+U;VmY#J1_Yl2Q`+Tp|YS)Cf60OWs-Odg3GypvL02?TKdhweb@a?HYb{(R_AB(
zpVi_1oh(6{*|J!43VLfn#+LG|B?{Xt4zD6=+y%ns0ExEM&>DG_2a
zCFsKRWLg~lr3~P8vMCNPFALn4yzHq_Z#;f4`>P}r`=iFHvI{P6d$9*P?G^I;)t+`y
z%Pr6TewfbiPM#)Co&isi!S2b4*}8??fCq;d(<>^`9dkV`45F8GIHq$?(@!CZ!$r
zhVLGwn3igif1fDUyLMD{C6Pqt_F$cnULJd*o@Qr=e6E3vfL`%vP143?*6^i=uc;)hr~>y9i2QA2v*9ac8;Qgssso5)(nZMZVXt$y9Ndv9ow@~AbTaSP^i4mH6Shq9ftLqS8
zZZMnW=Ngw%`@wfk0@GVptd&R8l)n#t#gpSj%rU`!7l
z5ML$lL9y2xgtdz=<*j3jXzS(U7OQYs_D*uW3YJ#C+b|xZ*)PYk4gH|8%odz1L`B)1
zj(z^^wF$?L@JE9ua@{YGbt8MOX%
z;`~X4i^WDgUyKlwTP1%PzbS_qyi15dUaV`yL-1~2ng0Rb+C$5sXdmsnqpoZc=DusGHyqV7v^B^xIS-6TZ
z{IlE308Uiesp&CU`a8Hlf!YXEj4ttm(bRLR=h;8!Q?%z2UFH(CM-oT(EEikh3dQ}=
zyrdA#Bs;F?J27ewm3OL^V0jwbX~+OgT2o-rIqL=Gg>fzHaC>if%n2%%A>dikH{||M
z2k|}0Gm3O=8J@WY4`;pOvpsK^+>z~%$*k#n?p@+hxA)iJ%rGshZyv}~rCO&a`9Bjh(yl;-=~LXA&Q|s^v(CSsCIp?7
z^&Kt*7G&HZT3ca-eKOKpJA?W3F}O@gSQXdtBG=dZm_4JoI=zqG&QC6KywbgEJsqom
zrmq-CTfNU4uF{?o^Cs2>PjFf4thg&I>zafV_E*&RS42KwJI
z^pgVpa+wysnh&JaGX-ldjIP~JOF{oqt9`!mT+-B3z;3UCDH*z9(N~7I{BX9mf@d$D
zrdKxz`(-U9=)|WNA+xKpQC#=wV{w1f`wVy%i1rzO^0#NGJFN2;ddEA;lu0L84CoL&
zWw@Q11yT>K5RrXXP?@Cu!a1O@vYZyl&UMQ`WH-oURX$6Y~KWS*6Uz+naXE#SX$#<
zr2XKDS;{M~B4$lWD=DSgx^mMuAL~9@^c~~y_89w?J*{}g?QKyvo+8z!RbpJ!oibXT
zH(u<_q*)-*X{1sw-)%`?inoL^S`@__%Y-dOlbmp1C>wpYr7^w5#l6)}nUFk@lByDR
zY~@ltZFClI6xa5A9}TRlrZE}>#lMJA1?}q(MC@MZN{rL1#EhXt=
zU(ELy4+EFP1jjFr%)eR8H~M_3Z}Kn57)^(6nZduTuB7gI>uE6TK3A4mlf|6fl3xjr
zvWrUoA}0(SS3Q!%lB~jS-e!UVMiSAs22vBkbH#_N7iU~Wt3BeAmXvdGn
z=u}bxjMd!7tf5!;i;e>5HU%5^OkStZb>{el#v@PFw{r|g;4(iHn?gfwk7?iFVR7@*
zIUMd`iprg~04>ncd+Y9;;+|gLT+fZqx`Ll4iXh(6zU}KL-x#aLl}pt**2nQEHDybW
zQ7g69z4sp%WaeUm@FF0iE`X5g%t`u;Aj#$Ml@)bJc`UrOJ-oi~f-vDIsS)Q6(q
zx5AJ%k8bH{D)Yr;9b^eHnC;8aKk%ued^NQmfwNb^ea+U_@BSLPuIf`=QbC<5{QfR_
zE4uFR7S3v$s28kqh~YM}p~F7u6I-oYB(mP%Rhi;-tFpa@v74RrgB4Uq({<4GZ^u#F
z^}*w8>=H=dSYbl=qgn1G1GXuvDj|FG@SYDL;|yv}l`c`$E-O>-D_=PIxs{|7y3DYH
zNG$O*Tl`ojstwvbXXsvfl56I8Q)rJgOH$^EfTw~+o-S?SRoqn;qGLmR`HE;qsN!AlkB}p%^C2h*P=Di{e#b-2=~=5)bQvUnJ=)
zXB^GTEZpFY!wm4*Q!4BWw@MaXmCHEB_eCnM=7?a>^DqgI)8jRUHkOr!P)~pKw7q?a
z!aE3K<88@_s`!BK9DN@4xl0+LKBYB8lE_5{BIFF6yd*|(08g#sOpT9R*YeGykbRal
z`_~A6>=)nVh}c{##fl?t0+NlOzh7r%CF=+uyFC{k7RK!RBPYE4D}=}lIW)>&xm;zL
zN=8D$FBx~}f%*1O;B;gT(g@f}v_xitZy$CS5l2hVzxNNsgCoU&_jvFEl}6Sy+5n|{$#wxSiZ)^{{)b>`xKjtrvC
zIzfRJN3wq1RU0w17wdZ15JcIQxu0q^88+oX654r%FFkeEyyF5DbZo_j@HibV2&52!
zHyevq`UqjKI&rYHc?90sVK7;&ofaW~w6)kk^!jn-D=>r3GOBe|kiVtGrL`nx=&oD#
zD8mT!g*80qWoVI8YJN-N@IyKZ{hI^}$ZCRaPZ5-CQ}ud7RVky<3h{IdaiPoG8w7;8
zx4f(uGw^J)dZRmkj?&y*r~T~KrGr|ip^cT<6U3rtqUNNZJx0#5=M!>)ONM;IpPEA|
z%3oET9J+5|y=UwE@M_!wUz&@%J$CWC@!gh;!|787i(;(W*QaMU&w=v`v=bV%?VQdqb@F1
z5-oyawrqI$gS1ox7ty#RgK4kA+t5i+Ux;7|xnQ@)=z#TXCEcndCUkWrjetO6uW*{g
zH2*DMOnynZ*nD&EG|4t-p>yv{`k`q<=-8O_Ln|xQIisD`rFwNO7XEtF$NHvxAtH^>
zNI%1{eVHIwdFrOk{SxxTRlj-3N*7XEmH|acqDu1V{E&Te9J~_nYCisBg?M=$63IN3
zky`|DUqZS}=SS>mI&g9~sCzx|OUMen?PnNDU2<}=jR*;@Bb@V&M(*H9^|`NLOGG`-
zQIdQ&4ms_04voj6$k&)+t$e~=?zz`B-SQhoXs(_^h`(vZ@9!|>N-PTA4o&7%a*DZ&
zuwkPqBX+=v-uC46(s+$eZ@o`KOxA&~>s@w>-kt1f<+1}!h>q7nfnwaD%&yF?THfpI
z8;?0BO@ycogZDfZjQ#Cuqg_3XEqXP}pTyr5i5CfL7rn`B^lmfPiuCPaBqEQ9`-gda
z{LjXrolt_i*gGeG+h-x(Fh%-wgtOF!W
z7w;v-!-F7}(l96%;Z8CGKhI12M0vf;luxG=?DDuWghcUM&$5}&?NBj;(OVQGF*?`0
zO8g$ttip>emsGj0JiM=GtK*b3u>PSiaiAeCxclO1^0nQo4jS_syD`K*ro244d4oAQ
zgWt6=4bI&Z1JaGIBp>;B-`x}Hcv+q(v^(Dw%FpSl8M5U?Zl83MNn}BJPtWXD-~GFz
zFPi}cXGyc-aasM`=hV7HKPV|G$z_q;sMh`ml?)z&*z7eB<{*P
z-RsAn6MmGQW)C00Z|d0!@_yR>iHft;+<#84p_@XpdnAoK`X!t5&ZzMA4IGNmhJC#c
zZ)qhjG6{Q!uI7IPYYv5G-{5|&sl~=}O@o(40y#L!pRvNOdM`EN-ul~E;^^^Hc&K6v
zfsv`53X3Ifs37*v%~~UwLgRPM#S$tWviXNh90Xz8-to5cbOJZ~y!G$pf4M8iO*2_B
z%LejDomF6*m#)Is<)qGx$Dg6Y%NzPek-1yHhWjcxJOb%d$m*ccI)b2^pt#bw2Aj*&
zZeNPoBxFxE>FG=Tbv~;#Ks(=7lclew^?6e^kz4Zmqr3j?&Ai0UH;haqw6GjW0|8^1
zFEo!!cXY1Fd?TFyMh8-OcVz%Z{KZ!1UFlKgnq=j`V&=+Avq)JI231ofB%z;Wb0Jwy
z??z@y@V9l(R!JjcX38BA#lr!gljN1N*z5L`B>FWNY?t0c15Imi+G9`ft3!&bCpqgj
z3ZiL`^~gSd{`~s**pG}bbTyiEi_-oP9_}KKWFL-zT>D(`1?365KJEU|DhpdM?-`BYHZoCp@bK{3r7F~O1CtqRvVy^S`5nDB`i|a9r
zUjw#oKG$d)pY8?$%R)J6mj96uDmANZ
zy_4Y_-E?kpv~+mEB!3o_wLG8s?IE)XT@8f}eY8{T)3rr2O5bp6%g30;fYkK#jyKHG
zLJa-6MKpw=lJ>&wwy4kLLTZ3{)=ydXrJpIe7^Tiys=<8dCBdi1u|Y2{#)6KU+R84b
z%U1Sv{c%?gM0xgtkwV61TG7oKRx1IuMxSKYOvsvQ;^!UxFjZJY4?Xz^TO4_!y%
zb>F+i9sKTQm_E-JvfO$F{ng$63C*0OeJ!nAMS6k-UmkUZ872DA`nzvaB&o2}l7-#Z
zyQP~?QfDdmaD@#GCmSH#Sj<#x_#wKZQJuAA0HFRx+0=J%^|!QxYPl|EpUTQ02lD~5
z-vaS!jNWFJt$_X#b
zh&(9ToP%4kgSo?dYnXg^!m7RtDe?E#SR;NcD-d*?;9u1vgwrTcgw{8A0(Bf=E$`sh
zWYXZLv6ul{E~k4Mv!PVs_EVr17}LER2Qv}xHoL&&7gz0PZjOCWvlzp<1s5K5T6{WA
z6&niNp0(bAEeR5CW-u5#V4L95=l&vF-jAl7;kq_?q*Yx&=$Jz@$GD02gW~Uc{N74(gyF8s`I}{FdzvV?)H8qBQBUmxH@PO
zj}vx0;oTPJ)zJFOs9|CM)^HicLEwTpsl{VjY1^lJ1xW@Q(|x`lGN0+zuPZca>C|Bx
zPcu1hgE7@N31BCzQeKhs@eds!t9G0%oVos-i1ku}=iV=DnY_xrd{|x$qy$4^aGRYodMSKd;fV(wvs*M7lq2)}^P#PW%Ul2|jwdGs1W}M7Og!CgL8?A1
zxR%J*j#xKtuficIoVhuAZMw6q3Z7t(h#Dx?G%%ep^36*No?ZE@cuL
zhQU3;Kl96wi;rh8|d%x;m?T*6rgSWIR
zD;(6dQ=>T*-x>tqM?9z_y`Pxen#zgHS6)^ic^79p!$aUg6(#tg-s^(gM^1)2$=Yp4
zW%vNI-jJ9`kk>3P9?EpP@54@B_LsYa12Rtp-ao#d+|y`Nmu)rRmvFPs*rYu)<-^^6
z=<$8cb=%1xrMJ8^-<7DtmXAB^f;qO6op1*=sS_m%3Bx!^?PWVkBh>kjpA$G6W;~gy
z*c`c@a{78ipYO2D^YQxPU7dT%wQyZAG&?aOOP8MWH8Gq+bL(L=TjA>m-9&j_!^#HT
zTluAqquxM?x0rr&R7&70&)f`hx-RKUfV5f6P>|+;Hmj~tWB6@erM*)_e2EDU+DC9!
zSF5YVz{QXwOh0$qbK}EwZHS?^IN=A-A(jAEGsOMcMJ|{THH<4K1X&LNrVC
zlWq6fTOJ1&Z8-D~^xHfSWEmmdPffFGK7FIwzx}ZNXaC(-&=>u-!JhVF+z+ixThLpq
ztu2t}UATw6Vq%Y7=atLFUZsx)4-c*>1iRpir)4)hW%Wbn>@!KzKG`kehBq&_>Hv4s
zSXckoto|3_56#WPc?rAw9LR_`c%XU->Y`IB4!|*S#U9*AG~s6B2gUOy72(fuaJnyM
z?p#T}H=I40kzLmmx$7IEn9Px$)*^qzeR1`oEC{Q9wC)ykBkTFHkhAkAAD*Iz3hLnk
zyY*OQCHlS@53NL+i0tOAT*qt;MI=3D2EIts;?ztv=omB3XKVYFiUTIY!CmM?;n#(%
zVYihEzokIGE!B2?a7VVEkYKMOZa^@IFolh-YCL#o2fxy#E&Rp4yLRYJmPCiuHtPJF
z&um-+#aWJ53qEfRsh2|zE$?p6#%$F3t+rix?RZqD_N6hR>ZI>zvA}I*KsPXiKCe8e
zi~ZSlDqaz>SE*peJ2f$;W_%UBC!7xs>ldCAX|rgreU?mXzQR_Pok?>qF(s8x@rmOA
z_}-PU2Xy4&zK5L_v$ZfvQej~_a!psBqX$&>RGfty4cy-!A))+)ocHl$2+Q!xp$c;WH
zr>`~sj1w5kuD#6w=lQ1aq$JowMo@04xMHcID<`2SJ&7SZf;2JoN^gaV=}kHcwNwUe
zh@&Gz?$Xt^7OJ&umA5x|DwzB%*$^bFrf)uV>(k&Rwq1its+cD85OTfBquJhL>U0-&
zd@M1Ajr6>RWXg5EeO+XX?rIEmZjQdf7H%Zjy*-jOE|J(MmYL`~+dxiRWA!gcEwm6t)LPH0Z07H!?E1sPq4K4E66Z|3kGxZ?36?&U0)
zA`3%_=c5*Ie>_G(b0kuo_A{xGhE&i?3d^X}m&acN{gt>j2#(FyeXiO-xFd%->BU?5AP_Jh#zh1J_ZTz`Y(XyUSs_?w(_
z^Y>DAI1LpJuv|&(H>&$#CAB1sqzq=t4hddWMU*A6Te@y9R`OMIOSLkTiYnJR6Tij0
zveqJznMerqi;WKp)_q^%Q=nacqm{e7^on@FHZx#;dA@Kv=1Qo34LN^%5h-htlk^E5ngI;dnFvY_DwAiQRs%PY*8T(7c-*mDd~x
zB@A7{2?cj$_XBs4iu>w`s$cV8W8+8d#`3i5ih(uN>2=TN!)ppHw)A_SUZ>KMw{>Vb*8boxbMd$?
zeP~TeX#p3ZdZ{;@NTa6I1%Ju%BvG+6FD@~?)cgZ9OJtZhg!9LuN~w4ad+l8>h_?(v
z>As%$jbg`;{GzaJydZLg~mz9H-iPS=X5N0M`3*M$`GH+bzjbOuqR5lqXH_G+T6?SR&7H4?NHc*r0$=$L!MPEnB9TifLN7+G
zgH$yg?%kRs-t08|FiL