From 39b84180bf496e3d166854fd268235a00702c531 Mon Sep 17 00:00:00 2001
From: bietiaop <1527109126@qq.com>
Date: Mon, 29 Jul 2024 00:05:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/score.js              | 12 ++++++------
 model/avatar.js           |  4 ++--
 model/equip.js            | 11 +++++++++++
 resources/panel/card.html |  6 +++---
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/score.js b/lib/score.js
index 9eba70e..365113e 100644
--- a/lib/score.js
+++ b/lib/score.js
@@ -48,7 +48,7 @@ export const getEquipPropertyScore = (charID, propertyID, value) => {
       break;
     // 大生命
     case '11102':
-      finalScore = value * 1.6 * baseScore * 100;
+      finalScore = value * 1.6 * baseScore * 1;
       break;
     // 小攻击
     case '12103':
@@ -56,7 +56,7 @@ export const getEquipPropertyScore = (charID, propertyID, value) => {
       break;
     // 大攻击
     case '12102':
-      finalScore = value * 1.6 * baseScore * 100;
+      finalScore = value * 1.6 * baseScore * 1;
       break;
     // 小防御
     case '13103':
@@ -64,15 +64,15 @@ export const getEquipPropertyScore = (charID, propertyID, value) => {
       break;
     // 大防御
     case '13102':
-      finalScore = value * 1 * baseScore * 100;
+      finalScore = value * 1 * baseScore * 1;
       break;
     // 暴击
     case '20103':
-      finalScore = value * 2 * baseScore * 100;
+      finalScore = value * 2 * baseScore * 1;
       break;
     // 暴击伤害
     case '21103':
-      finalScore = value * 1 * baseScore * 100;
+      finalScore = value * 1 * baseScore * 1;
       break;
     // 穿透值
     case '23203':
@@ -80,7 +80,7 @@ export const getEquipPropertyScore = (charID, propertyID, value) => {
       break;
     // 异常精通
     case '31403':
-      finalScore = value * 0.5 * baseScore * 100;
+      finalScore = value * 0.5 * baseScore * 1;
       break;
     default:
       break;
diff --git a/model/avatar.js b/model/avatar.js
index 7bc74f2..3d7ba9c 100644
--- a/model/avatar.js
+++ b/model/avatar.js
@@ -400,14 +400,14 @@ export class ZZZAvatarInfo {
     return damagelist;
   }
 
-  /** @type {string|boolean} */
+  /** @type {number|boolean} */
   get equip_score() {
     if (hasScoreData(this.id)) {
       let score = 0;
       for (const equip of this.equip) {
         score += equip.score;
       }
-      return score.toFixed(2);
+      return score;
     }
     return false;
   }
diff --git a/model/equip.js b/model/equip.js
index b31e979..dd695df 100644
--- a/model/equip.js
+++ b/model/equip.js
@@ -103,6 +103,17 @@ export class EquipMainProperty {
     }
     return this.score;
   }
+
+  /** @type {string} */
+  get short_name() {
+    if (this.property_name.includes('属性伤害加成')) {
+      return this.property_name.replace('属性伤害加成', '伤加成');
+    }
+    if (this.property_name === '能量自动回复') {
+      return '能量回复';
+    }
+    return this.property_name;
+  }
 }
 
 /**
diff --git a/resources/panel/card.html b/resources/panel/card.html
index 0c23966..a12c01c 100644
--- a/resources/panel/card.html
+++ b/resources/panel/card.html
@@ -144,7 +144,7 @@
         <div class="comment">{{charData.equip_comment}}</div>
       </div>
       <div class="value">
-        <span>{{charData.equip_score}}</span>
+        <span>{{charData.equip_score.toFixed(2)}}</span>
         <span class="subt">分</span>
       </div>
     </div>
@@ -163,7 +163,7 @@
         {{if equip.score !== false}}
         <div class="score {{equip.comment}}">
           <div class="comment">{{equip.comment}}</div>
-          <div class="value">{{equip.score}}</div>
+          <div class="value">{{equip.score.toFixed(2)}}</div>
         </div>
         {{/if}}
         <div class="property-list">
@@ -171,7 +171,7 @@
           {{each equip.main_properties prop}}
           <div class="properties main">
             <div class="prop-icon {{prop.classname}}"></div>
-            <div class="label yellow">{{prop.property_name}}</div>
+            <div class="label yellow">{{prop.short_name}}</div>
             <div class="value">{{prop.base}}</div>
           </div>
           {{/each}}