Merge branch 'master' of github.com:yoimiya-kokomi/Miao-Yunzai

 Conflicts:

	plugins/genshin/model/user.js

plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.css

@@ -1,42 +1,16 @@
 @font-face {
-  font-family: "tttgbnumber";
+  font-family: "HYWenHei-55W";
-  src: url("../../../../../../resources/font/tttgbnumber.ttf");
+  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: HYWenHei-55W;
-  /* font-family: MiSans-Demibold; */
   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) {

plugins/genshin/resources/StarRail/html/dailyNote/dailyNote.html

@@ -14,7 +14,7 @@
             <div class="uid">
                 <div class="uid_item"><span class="uid_text">UID:</span><span class="uid_span">{{uid}}</span>
                 </div>
-                <div class="uid_item"><span class="uid_text">昵称:</span><span class="uid_span">{{nickname}}|{{level}}级</span></div>
+                <div class="uid_item"><span class="uid_text">昵称:</span><div class="uid_span"><div class="uid_name">{{nickname}}</div> <span style="text-indent: 0em;">&nbsp;|&nbsp;{{level}}级</span></div></div>
             </div>
             <div class="title_date">
                 <div class="icon">
@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="subject">
-            <div class="subject_note">开拓力：<span>{{current_stamina}}</span>/<span>{{max_stamina}}</span></div>
+            <div class="subject_note">开拓力：<span>{{current_stamina}}</span>&nbsp;/<span>{{max_stamina}}</span></div>
             <div class="subject_solid"><span style="width: {{bfStamina}};"></span></div>
             <div class="subject_date">
                 {{if stamina_recover_time>0}}