From 43374aefae6b90327d6a952f2a758abc74599d25 Mon Sep 17 00:00:00 2001 From: Ctrlcvs <1509167646@qq.com> Date: Sun, 7 May 2023 19:26:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/model/user.js | 2 +- .../StarRail/html/dailyNote/dailyNote.css | 59 ++++++------------ .../StarRail/html/dailyNote/dailyNote.html | 4 +- .../resources/StarRail/img/note/uidbg.png | Bin 0 -> 2220 bytes 4 files changed, 22 insertions(+), 43 deletions(-) create mode 100644 plugins/genshin/resources/StarRail/img/note/uidbg.png diff --git a/plugins/genshin/model/user.js b/plugins/genshin/model/user.js index 0c3581b..9573bb8 100644 --- a/plugins/genshin/model/user.js +++ b/plugins/genshin/model/user.js @@ -150,7 +150,7 @@ export default class User extends base { this.checkMsg = '该账号尚未绑定原神或星穹角色！' return false } else { - res.data.list = res.data.list.filter(v => ['hk4e_cn', 'hkrpg_cn', 'hk4e_global'].includes(v.game_biz)) + res.data.list = res.data.list.filter(v => ['hk4e_cn', 'hkrpg_cn', 'hk4e_global', 'hkrpg_global'].includes(v.game_biz)) } //避免同时多个默认展示角色时候只绑定一个 diff --git a/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.css b/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.css index 1a9066f..1b75ce6 100644 --- a/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.css +++ b/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.css @@ -1,42 +1,16 @@ @font-face { - font-family: "tttgbnumber"; - src: url("../../../../../../resources/font/tttgbnumber.ttf"); + font-family: "HYWenHei-55W"; + src: url("../../../../../../resources/font/HYWenHei-55W.ttf"); font-weight: normal; font-style: normal; } -/* 不让上传字体，如需要请修改路径或者自行添加 部分插件有 -@font-face { - font-family: "MiSans-Bold"; - src: url("../../../../../../resources/font/MiSans-Bold.ttf"); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: "MiSans-Demibold"; - src: url("../../../../../../resources/font/MiSans-Demibold.ttf"); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: "MiSans-Medium"; - src: url("../../../../../../resources/font/MiSans-Medium.ttf"); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: "MiSans-Semibold"; - src: url("../../../../../../resources/font/MiSans-Semibold.ttf"); - font-weight: normal; - font-style: normal; -} */ * { margin: 0; padding: 0; box-sizing: border-box; user-select: none; - /* 如使用字体请把下面代码放出来，并注释或者删除 font-weight: bold; 属性 */ - /* font-family: MiSans-Demibold; */ + font-family: HYWenHei-55W; font-weight: bold; } @@ -59,17 +33,17 @@ body { .uid { border-radius: 0 25px 25px 0px; display: flex; - width: 621px; + width: 670px; height: 200px; justify-content: center; flex-direction: column; - background-color: #b47f4c; margin-top: 195px; margin-left: 50px; + background-image: url('../../img/note/uidbg.png'); } .uid_item { - background-color: #302b25; + /* background-color: #302b25; */ color: #fff; margin-left: 50px; align-items: center; @@ -85,10 +59,17 @@ body { .uid_span { text-indent: 1em; font-size: 48px; + display: flex; +} +.uid_name{ + overflow: hidden; + text-overflow: ellipsis; + white-space:nowrap; + max-width: 5em; } .uid_item:nth-child(2) { - background-color: #595045; + /* background-color: #595045; */ border-radius: 0 0 12px 0px; font-size: 40px; font-family: MiSans-Medium; @@ -108,12 +89,13 @@ body { width: 370px; height: 530px; position: absolute; - right: 70px; + right: 83px; top: 27px; padding: 10px; transform: rotate(4deg); background-color: #fff; border-bottom: 10px solid #b47f4c; + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2); } .icon { @@ -129,11 +111,8 @@ body { font-size: 30px; color: #808080; height: 160px; - font-family: MiSans-Semibold !important; -} -.title_date_text span{ - font-family: MiSans-Semibold !important; } + img { width: 100%; height: 100%; @@ -151,14 +130,13 @@ img { .subject_note { font-size: 48px; margin-top: 49px; + padding-top: 24px; color: #000000; - font-family: MiSans-Demibold; } .subject_note span:nth-child(1) { font-size: 82px; color: #b47f4c; - font-family: MiSans-Bold; } .subject_solid { @@ -242,6 +220,7 @@ img { .bottom_icon img { border-radius: 50%; + border: 1px solid #b47f4c; } .bottom_list div:nth-child(1) { diff --git a/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html b/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html index 45ffac5..2450081 100644 --- a/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html +++ b/plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html @@ -14,7 +14,7 @@
UID:{{uid}}
-
昵称:{{nickname}}|{{level}}级
+
昵称:
{{nickname}}
 | {{level}}级
@@ -27,7 +27,7 @@
-
开拓力：{{current_stamina}}/{{max_stamina}}
+
开拓力：{{current_stamina}} /{{max_stamina}}
{{if stamina_recover_time>0}} diff --git a/plugins/genshin/resources/StarRail/img/note/uidbg.png b/plugins/genshin/resources/StarRail/img/note/uidbg.png new file mode 100644 index 0000000000000000000000000000000000000000..1faeeec25dd2cb3056be0079fbe55c176d2f1a52 GIT binary patch literal 2220 zcmZuzdpwl+8h=~69dT4kkxR#(ykf2B=CZro9}Ii1j5>E{Zlr$JtY$}Jm}VT|?&f#CctPrwW$tgdag_6en%J7R z)$MrBH}#rUS-UQ}83??;wf1}eu)*nzqmMFoxgGrKqn|SCe-3j0hoXP+sM>t*8dYqBO z&v<5|{k5x8mRubyy?WJ5+<*)4E#^sk#TwFXTXOXc+htbgLNJzYHajcr7UVvNZ82~u znMfg;awp_?1k)wMV!3%E7Hb`pJF%0H(-d`h2wl;S`xkI`JhH$rhL@rZ4>_V}$4v@g{CcV_S(!h*Iatz7JhDU|&ppOhnTZb9f!za5}pZ=e~#CDXTPZI3!jR z!2)@%E|ue$HEpg+B(HJKy8G{<5@NkA$OjH$1{o;o^wom|zJZ169GUxdqc_D8y8Ttq z%MqHQpf&IlfV*kI`TA+Is(e73vY$VGIS5NtyD>H4;q34RHJh9>y><1sP1wV2Q;QjE z$sD}T2O98A3MXw7N`B7FU|`sd*V(vf@CgRMGaW3FRM(484sS7i%}?p{5yj*Eh)(|M zSOb*aol!*1%z!>6&2rL-7=Bi}2co?zxvcqq1BgbZ&8+H(-egkHG*M(-6Gi{m$XYLU z0+3mq_aPnJ!7nmN=?lNJbBSXh_-X9tf@K46y5J+BPpk*S_BIt$jQ9H`WoQ;`1$yc z;L7*&v)pKte9u&=cIleq@*WJEG0f-|MkP>vSccyUIUi98rdo#InTo3%TtDtj9DpXi z`*IpBL%FP|8%?sf=aL!pZyE7}>!b-GB)q-gG zD=Np%-ed!{L*Z*4=+GNF-y{f=P)$zm5NTlEj~npm6^H$>EqR%X3D*F218m8O zIN$_Gr{_0QNUbGuX~!Wj=!2ZDW!76|4ESHIGZOt2$nz=?AEoIe9GpI-VtxmP7Hj~j z>qIjatMzuX(gVbN609D*_My^$RQT81iB15@Q;QI{NGRT`&*pL!qv~ zs~7NJrUbZ-9)(0^L6g)H#f>uUjdEm4$5K82uJiib?LpJF>!=l;+E@~Ddr-JAIt(nnhK(-hrl3nl1EbuJIqzgS-I zKuvdSX*&a3YB^bYE(orjrA&r5n+zmCfJ$GUsr8!roa9Di zpKzfx02Y8h-j!*l{2+o0D-x=6ZMSOT`V)iO${cE(4~<-Te~;^#L>+uuHc|29g`Kv& zF?{Mn4|C#qSM*QCw?)A1IB_R`Vo7Zi5dR+^^!QtgO}fn)*cIRUI_KcX5U_?n$09kq z2UC()vp~#TGKc(&$#<8~c{!dGZBA|k<+pyc6{l>DyKM*R##-xKAZ;ble6yG^oNH6K0JnIVA`f8b}c~Xedso@(~jrf>Pk^@Np0`Sxpv}d(k0%hsj#8|!>-n- zcv*5fJBD1`?UdTkTn%VzwVq@#egE9B%fZF)E{DzPn{({9s+X@NLqabB|5f2cv(}i+ W$@bd*FzUY$j5vJEz2