From 2f83ea81a44281538d44f5af27d74b2c18472701 Mon Sep 17 00:00:00 2001
From: bietiaop <1527109126@qq.com>
Date: Sat, 27 Jul 2024 12:07:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/common/style/index.css  | 2 +-
 resources/common/style/index.scss | 5 +++--
 resources/panel/card.css          | 4 +++-
 resources/panel/card.html         | 4 ++--
 resources/panel/card.scss         | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/resources/common/style/index.css b/resources/common/style/index.css
index 1f8dd2e..22f6a4d 100644
--- a/resources/common/style/index.css
+++ b/resources/common/style/index.css
@@ -19,7 +19,7 @@
 }
 
 .no-zzz-font {
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+  font-family: "tttgbnumber", "HYWenHei-55W", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
 }
 
 .rank-icon {
diff --git a/resources/common/style/index.scss b/resources/common/style/index.scss
index 1df54b9..6eaa23d 100644
--- a/resources/common/style/index.scss
+++ b/resources/common/style/index.scss
@@ -26,8 +26,9 @@
 }
 
 .no-zzz-font {
-  font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-    Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+  font-family: 'tttgbnumber', 'HYWenHei-55W', system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell,
+    'Open Sans', 'Helvetica Neue', sans-serif;
 }
 
 .rank-icon {
diff --git a/resources/panel/card.css b/resources/panel/card.css
index fea7bc9..18eb825 100644
--- a/resources/panel/card.css
+++ b/resources/panel/card.css
@@ -626,7 +626,7 @@
 }
 .card .damagelist .dmg-tr {
   display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
+  grid-template-columns: 1.5fr 1fr 1fr;
   border-bottom: 0.1em solid rgba(255, 255, 255, 0.2);
 }
 .card .damagelist .dmg-tr:first-child {
@@ -635,6 +635,7 @@
   font-size: 1.1em;
   background: rgba(0, 0, 0, 0.2);
   text-shadow: 0 0 0.2em rgba(0, 0, 0, 0.6);
+  color: rgb(206, 190, 149);
 }
 .card .damagelist .dmg-tr:first-child .dmg-td {
   text-align: center !important;
@@ -648,6 +649,7 @@
 .card .damagelist .dmg-td:first-child {
   text-align: left;
   background: rgba(0, 0, 0, 0.2);
+  color: rgb(206, 190, 149);
 }
 .card .damagelist .dmg-td:last-child {
   border-right: none;
diff --git a/resources/panel/card.html b/resources/panel/card.html
index 5f1cab2..c154d04 100644
--- a/resources/panel/card.html
+++ b/resources/panel/card.html
@@ -182,14 +182,14 @@
       <% include(sys.specialTitle, {en: 'DAMAGE' , cn: '伤害统计' }) %>
     </div>
     <div class="damagelist">
-      <div class="dmg-tr titlebar">
+      <div class="dmg-tr titlebar no-zzz-font">
         <div class="dmg-td">类型</div>
         <div class="dmg-td">暴击伤害</div>
         <div class="dmg-td">期望伤害</div>
       </div>
       {{each charData.damages damage}}
       <div class="dmg-tr">
-        <div class="dmg-td">{{damage.title}}</div>
+        <div class="dmg-td no-zzz-font">{{damage.title}}</div>
         <div class="dmg-td">{{damage.value.cd.toFixed(0)}}</div>
         <div class="dmg-td">{{damage.value.qw.toFixed(0)}}</div>
       </div>
diff --git a/resources/panel/card.scss b/resources/panel/card.scss
index cd1cbf7..97c49fe 100644
--- a/resources/panel/card.scss
+++ b/resources/panel/card.scss
@@ -552,7 +552,7 @@
 
     .dmg-tr {
       display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
+      grid-template-columns: 1.5fr 1fr 1fr;
       border-bottom: 0.1em solid rgba(255, 255, 255, 0.2);
 
       &:first-child {
@@ -561,6 +561,7 @@
         font-size: 1.1em;
         background: rgba(0, 0, 0, 0.2);
         text-shadow: 0 0 0.2em rgba(0, 0, 0, 0.6);
+        color: rgb(206, 190, 149);
         .dmg-td {
           text-align: center !important;
           background: none !important;
@@ -575,6 +576,7 @@
       &:first-child {
         text-align: left;
         background: rgba(0, 0, 0, 0.2);
+        color: rgb(206, 190, 149);
       }
       &:last-child {
         border-right: none;