diff --git a/model/avatar.js b/model/avatar.js index 7e3008c..be4903c 100644 --- a/model/avatar.js +++ b/model/avatar.js @@ -368,25 +368,25 @@ export class ZZZAvatarInfo { /** @type {'C'|'B'|'A'|'S'|'SS'|'SSS'|'ACE'|false} */ get equip_comment() { - if (this.equip_score < 90) { + if (this.equip_score < 80) { return 'C'; } if (this.equip_score < 120) { return 'B'; } - if (this.equip_score < 150) { + if (this.equip_score < 160) { return 'A'; } - if (this.equip_score < 170) { + if (this.equip_score < 180) { return 'S'; } - if (this.equip_score < 190) { + if (this.equip_score < 200) { return 'SS'; } - if (this.equip_score < 210) { + if (this.equip_score < 220) { return 'SSS'; } - if (this.equip_score >= 210) { + if (this.equip_score >= 220) { return 'ACE'; } return false; diff --git a/model/damage/Score.js b/model/damage/Score.js index 7c1b2d7..6379392 100644 --- a/model/damage/Score.js +++ b/model/damage/Score.js @@ -64,7 +64,7 @@ export default class Score { const rarity_multiplier = this.get_rarity_multiplier(); const actual_count = this.get_actual_count(); if (actual_count === 0 && this.partition <= 3) { - return 12 * this.get_level_multiplier(); + return 12 * this.get_level_multiplier() * rarity_multiplier; } const max_count = this.get_max_count(); if (max_count === 0) diff --git a/model/damage/Score.ts b/model/damage/Score.ts index 5116bc1..9d7f699 100644 --- a/model/damage/Score.ts +++ b/model/damage/Score.ts @@ -78,7 +78,7 @@ export default class Score { const actual_count = this.get_actual_count() if (actual_count === 0 && this.partition <= 3) { // 1…1个有效副词条都没有吗?真是拿你没办法呢~给点主词条的分吧~❤️杂鱼~❤️杂鱼~❤️ - return 12 * this.get_level_multiplier() + return 12 * this.get_level_multiplier() * rarity_multiplier } const max_count = this.get_max_count() if (max_count === 0) return 0