fix：更新版本号

erzaozi · Dec 14, 2024 · db5ab34 · db5ab34
1 parent 8fc1051
commit db5ab34
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 29 deletions.
diff --git a/apps/Training.js b/apps/Training.js
@@ -85,7 +85,22 @@ export class Training extends plugin {
                 return calculatedRole;
             });
 
-            roleList.sort((a, b) => b.starLevel - a.starLevel || b.phantomData.statistic.totalScore - a.phantomData.statistic.totalScore);
+            roleList.forEach(role => {
+                const { phantomData } = role;
+                phantomData.statistic = {
+                    color: "#a0a0a0",
+                    rank: "N",
+                    totalScore: "N/A",
+                    ...phantomData.statistic
+                };
+            });
+
+            roleList.sort((a, b) => {
+                const aScore = parseFloat(a.phantomData.statistic.totalScore) || 0;
+                const bScore = parseFloat(b.phantomData.statistic.totalScore) || 0;
+
+                return b.starLevel - a.starLevel || bScore - aScore;
+            });
 
             const imageCard = await Render.render('Template/training/training', {
                 baseData: baseData.data,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "waves-plugin",
-  "version": "1.5.15",
+  "version": "1.5.16",
   "description": "基于 Yunzai 的鸣潮游戏数据查询插件",
   "main": "index.js",
   "scripts": {

diff --git a/resources/Alias/role.yaml b/resources/Alias/role.yaml
@@ -116,4 +116,7 @@
   - yh
 椿:
   - 春
-  - c
+  - c
+灯灯:
+  - 登登
+  - dd
diff --git a/resources/Strategy/moealkyne/灯灯.jpg b/resources/Strategy/moealkyne/灯灯.jpg
diff --git a/resources/Template/charProfile/charProfile.html b/resources/Template/charProfile/charProfile.html
@@ -66,10 +66,10 @@
             {{if data.roleDetail.data.phantomData.statistic}}
             <div class="total-score-table-left">
                 <div class="total-score-key">声骸总分</div>
-                <div class="total-score-value" style="{{data.roleDetail.data.phantomData.statistic.color || "#a0a0a0"}}">
+                <div class="total-score-value" style="color: {{data.roleDetail.data.phantomData.statistic.color}};">
                     {{data.roleDetail.data.phantomData.statistic.totalScore.toFixed(2)}}</div>
                 <div class="total-score-key">声骸评级</div>
-                <div class="total-score-value" style="{{data.roleDetail.data.phantomData.statistic.color || "#a0a0a0"}}">
+                <div class="total-score-value" style="color: {{data.roleDetail.data.phantomData.statistic.color}};">
                     {{data.roleDetail.data.phantomData.statistic.rank}}</div>
             </div>
             <div id="column" style="position: relative;left: -20px;top: -30px;width:100%;height:249px;"></div>
@@ -93,7 +93,7 @@
                         </div>
 
                         <span id="reson-level"
-                            style="{{data.roleDetail.data.weaponData.color}}">谐振 {{data.roleDetail.data.weaponData.resonLevel}} 阶</span>
+                            style="background: {{data.roleDetail.data.weaponData.color}};">谐振 {{data.roleDetail.data.weaponData.resonLevel}} 阶</span>
                     </div>
                 </div>
                 <div id="weapon-effect-name">{{data.roleDetail.data.weaponData.weapon.weaponEffectName}}</div>
@@ -109,7 +109,7 @@
                     <div class="phantom-header-right">
                         <div class="phantom-name">{{phantom.phantomProp.name.replace("（","(").replace("）",")")}}</div>
                         {{if phantom.realScore}}
-                        <div class="phantom-rank-score" style="{{phantom.color}}">
+                        <div class="phantom-rank-score" style="color: {{phantom.color}};">
                             {{phantom.realScore.toFixed(2)}}-{{phantom.rank}}</div>
                         {{else}}
                         <div class="phantom-rank-score" style="color: #a0a0a0;">暂无评分</div>
@@ -124,7 +124,7 @@
                     </div>
                     {{/each}}
                     {{each phantom.subProps prop}}
-                    <div class="phantom-attribute-item" style="{{prop.color}}">
+                    <div class="phantom-attribute-item" style="color: {{prop.color}};">
                         <span class="phantom-attribute-key">{{prop.attributeName}}</span> <span
                             class="phantom-attribute-value">{{prop.attributeValue}}</span>
                     </div>

diff --git a/resources/Template/training/training.html b/resources/Template/training/training.html
@@ -70,11 +70,12 @@
                             <img src="{{pluginResources}}/Template/training/imgs/no_phantom.png">
                             {{/if}}
                         </div>
-                        <div class="phantom-rank" style="background-{{role.phantomData.statistic.color}}">
+                        <div class="phantom-rank" style="background-color: {{role.phantomData.statistic.color}};">
                             {{role.phantomData.statistic.rank}}
                         </div>
                         <div class="phantom-score">
-                            {{role.phantomData.statistic.totalScore.toFixed(2)}}
+                            {{typeof role.phantomData.statistic.totalScore === 'number' ?
+                            role.phantomData.statistic.totalScore.toFixed(2) : role.phantomData.statistic.totalScore}}
                         </div>
                     </div>
                 </li>

diff --git a/resources/Weight/1504.yaml b/resources/Weight/1504.yaml
@@ -0,0 +1,56 @@
+baseAttack: 918
+baseDefense: 879
+baseHP: 8500
+subProps:
+  - name: 暴击伤害
+    weight: 1
+  - name: 暴击
+    weight: 1
+  - name: 攻击百分比
+    weight: 0.5
+  - name: 生命百分比
+    weight: 0
+  - name: 防御百分比
+    weight: 0
+  - name: 共鸣效率
+    weight: 0.2
+  - name: 普攻伤害加成
+    weight: 0.4
+  - name: 重击伤害加成
+    weight: 0
+  - name: 共鸣技能伤害加成
+    weight: 0
+  - name: 共鸣解放伤害加成
+    weight: 0.1
+mainProps:
+  C4:
+    - name: 暴击伤害
+      weight: 0.5
+    - name: 暴击
+      weight: 0.5
+    - name: 治疗效果加成
+      weight: 0
+    - name: 生命百分比
+      weight: 0
+    - name: 攻击百分比
+      weight: 0.25
+    - name: 防御百分比
+      weight: 0
+  C3:
+    - name: 伤害加成
+      weight: 0.75
+    - name: 攻击百分比
+      weight: 0.75
+    - name: 生命百分比
+      weight: 0
+    - name: 防御百分比
+      weight: 0
+    - name: 共鸣效率
+      weight: 0.6
+  C1:
+    - name: 攻击百分比
+      weight: 1
+    - name: 防御百分比
+      weight: 0
+    - name: 生命百分比
+      weight: 0
diff --git a/resources/Weight/1603.yaml b/resources/Weight/1603.yaml
@@ -46,7 +46,7 @@ mainProps:
     - name: 防御百分比
       weight: 0
     - name: 共鸣效率
-      weight: 0.75
+      weight: 0
   C1:
     - name: 攻击百分比
       weight: 1

diff --git a/resources/Weight/weight.yaml b/resources/Weight/weight.yaml
@@ -1,4 +1,4 @@
-version: 1.0.2
+version: 1.0.3
 subProps:
   - name: 暴击伤害
     max: 21

diff --git a/utils/Calculate.js b/utils/Calculate.js
@@ -28,12 +28,12 @@ class WeightCalculator {
         });
 
         const weaponColors = {
-            5: "background:#9d2933;",
-            4: "background:#9f00ed;",
-            3: "background:#6640ff;",
-            2: "background:#00D200;"
+            5: "#9d2933",
+            4: "#9f00ed",
+            3: "#6640ff",
+            2: "#00D200"
         };
-        this.roleDetail.weaponData.color = weaponColors[this.roleDetail.weaponData.resonLevel] || "background:#a0a0a0;";
+        this.roleDetail.weaponData.color = weaponColors[this.roleDetail.weaponData.resonLevel] || "#a0a0a0";
 
         if (!fs.existsSync(this.roleWeightPath)) {
             return this.roleDetail;
@@ -213,22 +213,22 @@ class WeightCalculator {
     }
 
     calStyle(weight) {
-        return weight > 0.5 ? "color:#9d2933;"
-            : weight > 0 ? "color:#057748;"
-                : "color:#a0a0a0;";
+        return weight > 0.5 ? "#9d2933"
+            : weight > 0 ? "#057748"
+                : "#a0a0a0";
     }
 
     calRank(score) {
         const ranks = [
-            { minScore: 22, name: "MAX", color: "color:#9d2933;" },
-            { minScore: 19, name: "ACE", color: "color:#f08a5d;" },
-            { minScore: 17, name: "SSS", color: "color:#eec900;" },
-            { minScore: 15, name: "SS", color: "color:#eec900;" },
-            { minScore: 12, name: "S", color: "color:#eec900;" },
-            { minScore: 9, name: "A", color: "color:#9f00ed;" },
-            { minScore: 6, name: "B", color: "color:#6640ff;" },
-            { minScore: 3, name: "C", color: "color:#00D200;" },
-            { minScore: 0, name: "D", color: "color:#a0a0a0;" },
+            { minScore: 22, name: "MAX", color: "#9d2933" },
+            { minScore: 19, name: "ACE", color: "#f08a5d" },
+            { minScore: 17, name: "SSS", color: "#eec900" },
+            { minScore: 15, name: "SS", color: "#eec900" },
+            { minScore: 12, name: "S", color: "#eec900" },
+            { minScore: 9, name: "A", color: "#9f00ed" },
+            { minScore: 6, name: "B", color: "#6640ff" },
+            { minScore: 3, name: "C", color: "#00D200" },
+            { minScore: 0, name: "D", color: "#a0a0a0" },
         ];
 
         for (const rank of ranks) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -116,4 +116,7 @@ @@
       - yh
     椿:
       - 春
-      - c
+      - c
+    灯灯:
+      - 登登
+      - dd