From 9429a60ec0346c60eff3532665a17a39142f0de8 Mon Sep 17 00:00:00 2001 From: UCPr <2032385471@qq.com> Date: Sun, 13 Apr 2025 20:18:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0MAX=E8=AF=84=E7=BA=A7?= =?UTF-8?q?=EF=BC=9A=E8=AF=84=E5=88=86=E2=89=A548=E6=88=96=E6=80=BB?= =?UTF-8?q?=E5=88=86=E2=89=A5280?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/panel.js | 2 +- model/avatar.js | 7 +++++-- model/equip.js | 7 +++++-- resources/map/Property2Name.json | 2 +- resources/panel/card.css | 16 +++++++++------- resources/panel/card.scss | 16 +++++++++------- resources/proficiency/index.css | 2 +- resources/proficiency/index.scss | 4 +++- 8 files changed, 34 insertions(+), 22 deletions(-) diff --git a/apps/panel.js b/apps/panel.js index bb26643..7fb8e34 100644 --- a/apps/panel.js +++ b/apps/panel.js @@ -219,7 +219,7 @@ export class Panel extends ZZZPlugin { SSSCount: result.reduce((acc, item) => { if (item.equip) { acc += item.equip.filter( - equip => equip.comment === 'SSS' || equip.comment === 'ACE' + equip => ['SSS', 'ACE', 'MAX'].includes(equip.comment) ).length; } return acc; diff --git a/model/avatar.js b/model/avatar.js index 9ffefef..8b8ba44 100644 --- a/model/avatar.js +++ b/model/avatar.js @@ -370,7 +370,7 @@ export class ZZZAvatarInfo { return false; } - /** @type {'C'|'B'|'A'|'S'|'SS'|'SSS'|'ACE'|false} */ + /** @type {'C'|'B'|'A'|'S'|'SS'|'SSS'|'ACE'|'MAX'|false} */ get equip_comment() { if (this.equip_score < 80) { return 'C'; @@ -390,9 +390,12 @@ export class ZZZAvatarInfo { if (this.equip_score < 220) { return 'SSS'; } - if (this.equip_score >= 220) { + if (this.equip_score < 280) { return 'ACE'; } + if (this.equip_score >= 280) { + return 'MAX'; + } return false; } diff --git a/model/equip.js b/model/equip.js index a683977..4fb1f6c 100644 --- a/model/equip.js +++ b/model/equip.js @@ -190,7 +190,7 @@ export class Equip { return this.score; } - /** @type {'C'|'B'|'A'|'S'|'SS'|'SSS'|'ACE'|false} */ + /** @type {'C'|'B'|'A'|'S'|'SS'|'SSS'|'ACE'|'MAX'|false} */ get comment() { if (this.score <= 12) { return 'C'; @@ -210,9 +210,12 @@ export class Equip { if (this.score < 40) { return 'SSS'; } - if (this.score >= 40) { + if (this.score < 48) { return 'ACE'; } + if (this.score >= 48) { + return 'MAX'; + } return false; } } diff --git a/resources/map/Property2Name.json b/resources/map/Property2Name.json index 27c7c70..0fcfa2d 100644 --- a/resources/map/Property2Name.json +++ b/resources/map/Property2Name.json @@ -10,7 +10,7 @@ "21103": ["CRITDMG", "暴击伤害", "暴伤"], "23103": ["PenRatio", "穿透率", "穿透"], "23203": ["Pen", "穿透值", "穿透"], - "30502": ["EnergyRegen", "能量回复", "能量"], + "30502": ["EnergyRegen", "能量回复", "回能"], "31203": ["AnomalyProficiency", "异常精通", "精通"], "31402": ["AnomalyMastery", "异常掌控", "掌控"], "31503": ["PhysicalDMGBonus", "物理属性伤害提高", "物伤"], diff --git a/resources/panel/card.css b/resources/panel/card.css index c7292ac..3f8ac5b 100644 --- a/resources/panel/card.css +++ b/resources/panel/card.css @@ -483,7 +483,9 @@ color: transparent; } .card .ace .comment, -.card .ACE .comment { +.card .ACE .comment, +.card .max .comment, +.card .MAX .comment { background: linear-gradient(0deg, rgba(255, 59, 59, 0.4), rgb(255, 59, 59)); -webkit-background-clip: text; background-clip: text; @@ -510,24 +512,24 @@ } .card .equip-stats .box1 .equip-score .comment-box { font-size: 1.2em; - width: 2em; + width: 2.8em; display: flex; justify-content: center; align-items: center; aspect-ratio: 1; - border-radius: 50%; + border-radius: 25%; background-color: rgba(32, 32, 32, 0.4); box-shadow: 0 0 1em rgba(0, 0, 0, 0.4); - border: 0.2em solid rgb(216, 216, 216); + border: 0.2em solid rgb(116, 116, 116); position: relative; z-index: 1; } .card .equip-stats .box1 .equip-score .value { border: 0.1em solid rgb(155, 155, 155); border-left: none; - padding: 0.1em 1em 0.1em 1em; - margin-left: -0.6em; - border-radius: 0 1em 1em 0; + padding: 0.1em 0.3em; + margin-left: -0.1em; + border-radius: 0 0.4em 0.4em 0; } .card .equip-stats .box1 .equip-score .value .subt { font-size: 0.8em; diff --git a/resources/panel/card.scss b/resources/panel/card.scss index e7e48f6..7d280ba 100644 --- a/resources/panel/card.scss +++ b/resources/panel/card.scss @@ -465,7 +465,9 @@ } } .ace, - .ACE { + .ACE, + .max, + .MAX { .comment { background: linear-gradient( 0deg, @@ -498,24 +500,24 @@ align-items: center; .comment-box { font-size: 1.2em; - width: 2em; + width: 2.8em; display: flex; justify-content: center; align-items: center; aspect-ratio: 1; - border-radius: 50%; + border-radius: 25%; background-color: rgba(32, 32, 32, 0.4); box-shadow: 0 0 1em rgba(0, 0, 0, 0.4); - border: 0.2em solid rgb(216, 216, 216); + border: 0.2em solid rgb(116, 116, 116); position: relative; z-index: 1; } .value { border: 0.1em solid rgba(155, 155, 155); border-left: none; - padding: 0.1em 1em 0.1em 1em; - margin-left: -0.6em; - border-radius: 0 1em 1em 0; + padding: 0.1em 0.3em; + margin-left: -0.1em; + border-radius: 0 0.4em 0.4em 0; .subt { font-size: 0.8em; } diff --git a/resources/proficiency/index.css b/resources/proficiency/index.css index f5723c9..afa89e3 100644 --- a/resources/proficiency/index.css +++ b/resources/proficiency/index.css @@ -242,7 +242,7 @@ background-clip: text; color: transparent; } -.list .item .content .equip .content.ace .comment, .list .item .content .equip .content.ACE .comment { +.list .item .content .equip .content.ace .comment, .list .item .content .equip .content.ACE .comment, .list .item .content .equip .content.max .comment, .list .item .content .equip .content.MAX .comment { background: linear-gradient(0deg, rgba(255, 59, 59, 0.4), rgb(255, 59, 59)); -webkit-background-clip: text; background-clip: text; diff --git a/resources/proficiency/index.scss b/resources/proficiency/index.scss index 6878cc0..d94a84c 100644 --- a/resources/proficiency/index.scss +++ b/resources/proficiency/index.scss @@ -279,7 +279,9 @@ } } &.ace, - &.ACE { + &.ACE, + &.max, + &.MAX { .comment { background: linear-gradient( 0deg,