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 0000000..1faeeec Binary files /dev/null and b/plugins/genshin/resources/StarRail/img/note/uidbg.png differ