From 297be2d481fdd1cfd9387f0cc23e317996b9331a Mon Sep 17 00:00:00 2001
From: UCPr <2032385471@qq.com>
Date: Thu, 29 May 2025 23:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=A4=E5=AE=B3=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/panel/card.css    |  8 +++++++-
 resources/panel/card.html   |  6 ++++--
 resources/panel/card.scss   | 12 ++++++++++--
 resources/panel/damage.css  |  7 +++++--
 resources/panel/damage.html | 10 ++++------
 resources/panel/damage.scss | 10 +++++++++-
 6 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/resources/panel/card.css b/resources/panel/card.css
index 4564a63..dfe7f11 100644
--- a/resources/panel/card.css
+++ b/resources/panel/card.css
@@ -840,9 +840,14 @@
   box-shadow: 0 0 3em rgba(0, 0, 0, 0.6);
   border: 0.1em solid rgba(255, 255, 255, 0.2);
 }
+.card .damagelist .column3 {
+  grid-template-columns: 0.28fr 2fr 2fr;
+}
+.card .damagelist .column4 {
+  grid-template-columns: 0.28fr 2fr 1fr 1fr;
+}
 .card .damagelist .dmg-tr {
   display: grid;
-  grid-template-columns: 0.25fr 1.6fr 1fr 1fr;
   border-bottom: 0.1em solid rgba(255, 255, 255, 0.2);
 }
 .card .damagelist .dmg-tr:first-child {
@@ -875,6 +880,7 @@
   padding: 0.5em 0.5em;
   font-size: 0.9em;
   border-right: 0.1em solid rgba(255, 255, 255, 0.2);
+  overflow: hidden;
 }
 .card .damagelist .dmg-td:nth-child(2) {
   background: rgba(0, 0, 0, 0.2);
diff --git a/resources/panel/card.html b/resources/panel/card.html
index 0955a94..4bea55d 100644
--- a/resources/panel/card.html
+++ b/resources/panel/card.html
@@ -242,17 +242,19 @@
         <% include(sys.specialTitle, {en: 'DAMAGE' , cn: '伤害统计' }) %>
       </div>
       <div class="damagelist">
-        <div class="dmg-tr titlebar no-zzz-font">
+        <div class="dmg-tr column4 titlebar no-zzz-font">
           <div class="td dmg-td">%</div>
           <div class="dmg-td">技能类型</div>
           <div class="dmg-td">暴击伤害</div>
           <div class="dmg-td">期望伤害</div>
         </div>
         {{each damages damage,index}}
-        <div class="dmg-tr">
+        <div class="dmg-tr {{damage.result.critDMG !== 0 ? 'column4' : 'column3'}}">
           <div class="dmg-td">{{index+1}}</div>
           <div class="dmg-td no-zzz-font">{{damage.skill.name}}</div>
+          {{if damage.result.critDMG !== 0}}
           <div class="dmg-td">{{damage.result.critDMG.toFixed(0)}}</div>
+          {{/if}}
           <div class="dmg-td">{{damage.result.expectDMG.toFixed(0)}}</div>
         </div>
         {{/each}}
diff --git a/resources/panel/card.scss b/resources/panel/card.scss
index 7e19985..cd01e9a 100644
--- a/resources/panel/card.scss
+++ b/resources/panel/card.scss
@@ -853,11 +853,18 @@
     box-shadow: 0 0 3em rgba(0, 0, 0, 0.6);
     border: 0.1em solid rgba(255, 255, 255, 0.2);
 
+    .column3 {
+      grid-template-columns: 0.28fr 2fr 2fr;
+    }
+
+    .column4 {
+      grid-template-columns: 0.28fr 2fr 1fr 1fr;
+    }
+
     .dmg-tr {
       display: grid;
-      grid-template-columns: 0.25fr 1.6fr 1fr 1fr;
       border-bottom: 0.1em solid rgba(255, 255, 255, 0.2);
-
+  
       &:first-child {
         font-size: 1.1em;
         background: rgba(0, 0, 0, 0.2);
@@ -893,6 +900,7 @@
       padding: 0.5em 0.5em;
       font-size: 0.9em;
       border-right: 0.1em solid rgba(255, 255, 255, 0.2);
+      overflow: hidden;
       &:nth-child(2) {
         background: rgba(0, 0, 0, 0.2);
         color: rgb(206, 190, 149);
diff --git a/resources/panel/damage.css b/resources/panel/damage.css
index 211143c..a45f664 100644
--- a/resources/panel/damage.css
+++ b/resources/panel/damage.css
@@ -471,8 +471,11 @@
 .damage .data-list .info-tr span {
   color: #fff !important;
 }
-.damage .damage-list .dmg-tr {
-  grid-template-columns: 0.25fr 1.6fr 1fr 1fr;
+.damage .damage-list .column3 {
+  grid-template-columns: 0.28fr 2fr 2fr;
+}
+.damage .damage-list .column4 {
+  grid-template-columns: 0.28fr 2fr 1fr 1fr;
 }
 .damage .damage-list .dmg-tr.current {
   background: rgb(120, 104, 73);
diff --git a/resources/panel/damage.html b/resources/panel/damage.html
index 1a9951c..7905f7d 100644
--- a/resources/panel/damage.html
+++ b/resources/panel/damage.html
@@ -140,21 +140,19 @@
       <% include(sys.specialTitle, {en: 'DAMAGE' , cn: '伤害统计' }) %>
     </div>
     <div class="data-list damage-list">
-      <div class="tr dmg-tr titlebar no-zzz-font">
+      <div class="tr dmg-tr column4 titlebar no-zzz-font">
         <div class="td dmg-td">%</div>
         <div class="td dmg-td">技能类型</div>
         <div class="td dmg-td">暴击伤害</div>
         <div class="td dmg-td">期望伤害</div>
       </div>
       {{each damages d,index}}
-      {{if index == skill.index}}
-      <div class="tr dmg-tr current">
-      {{else}}
-      <div class="tr dmg-tr">
-      {{/if}}
+      <div class="tr dmg-tr {{d.result.critDMG !== 0 ? 'column4' : 'column3'}} {{index == skill.index ? 'current' : ''}}">
         <div class="td dmg-td">{{index+1}}</div>
         <div class="td dmg-td no-zzz-font">{{d.skill.name}}</div>
+        {{if d.result.critDMG !== 0}}
         <div class="td dmg-td">{{d.result.critDMG.toFixed(0)}}</div>
+        {{/if}}
         <div class="td dmg-td">{{d.result.expectDMG.toFixed(0)}}</div>
       </div>
       {{/each}}
diff --git a/resources/panel/damage.scss b/resources/panel/damage.scss
index 9fe4078..a0e6e0d 100644
--- a/resources/panel/damage.scss
+++ b/resources/panel/damage.scss
@@ -447,8 +447,16 @@
 
   /* 伤害统计 */
   .damage-list {
+
+    .column3 {
+      grid-template-columns: 0.28fr 2fr 2fr;
+    }
+
+    .column4 {
+      grid-template-columns: 0.28fr 2fr 1fr 1fr;
+    }
+
     .dmg-tr {
-      grid-template-columns: 0.25fr 1.6fr 1fr 1fr;
 
       &.current {
         background: rgb(120, 104, 73);