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 @@
{{charData.equip_comment}}
- {{charData.equip_score}} + {{charData.equip_score.toFixed(2)}}
@@ -163,7 +163,7 @@ {{if equip.score !== false}}
{{equip.comment}}
-
{{equip.score}}
+
{{equip.score.toFixed(2)}}
{{/if}}
@@ -171,7 +171,7 @@ {{each equip.main_properties prop}}
-
{{prop.property_name}}
+
{{prop.short_name}}
{{prop.base}}
{{/each}}