From a08a1da3a4e7c7b2e5e2a6aed5774b3502be0acd Mon Sep 17 00:00:00 2001 From: lixiangwuxian Date: Sat, 3 May 2025 23:54:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=B7=B2?= =?UTF-8?q?=E6=98=AFTop1=E7=8E=A9=E5=AE=B6=E7=9A=84=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=AD=A3=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E4=B8=AD=E7=9A=84=E6=A0=87=E7=82=B9=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handler/beatleader/beatleader.go | 10 +++++++--- handler/scoresaber/score.go | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/handler/beatleader/beatleader.go b/handler/beatleader/beatleader.go index a7e3f8b..2845966 100644 --- a/handler/beatleader/beatleader.go +++ b/handler/beatleader/beatleader.go @@ -102,8 +102,12 @@ func blPlus(msg model.Message) (reply *model.Reply) { FromMsg: msg, } } - if userInfo.CountryRank-N < 0 { - resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) + if userInfo.CountryRank-N <= 0 { + if userInfo.CountryRank == 1 { + resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。\n", userInfo.Country)) + } else { + resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) + } } //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 var targetPlayer beatleader.PlayerDataLite @@ -118,7 +122,7 @@ func blPlus(msg model.Message) (reply *model.Reply) { } } if isPlus { - resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s,达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank)) + resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s，达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank)) } else { resultStr.WriteString(fmt.Sprintf("%s区的第%d名是%s，对方只需要再打出%.2fpp就能超过你。", userInfo.Country, targetPlayer.CountryRank, targetPlayer.Name, userInfo.PP-targetPlayer.PP)) } diff --git a/handler/scoresaber/score.go b/handler/scoresaber/score.go index 8f18f10..1ef375b 100644 --- a/handler/scoresaber/score.go +++ b/handler/scoresaber/score.go @@ -100,8 +100,12 @@ func ssPlusN(msg model.Message) (reply *model.Reply) { FromMsg: msg, } } - if userInfo.CountryRank-N < 0 { - resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) + if userInfo.CountryRank-N <= 0 { + if userInfo.CountryRank == 1 { + resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。\n", userInfo.Country)) + } else { + resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) + } } //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 var targetPlayer scoresaber.PlayerData @@ -116,7 +120,7 @@ func ssPlusN(msg model.Message) (reply *model.Reply) { } } if isPlus { - resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s,达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank)) + resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s，达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank)) } else { resultStr.WriteString(fmt.Sprintf("%s区的第%d名是%s，对方只需要再打出%.2fpp就能超过你。", userInfo.Country, targetPlayer.CountryRank, targetPlayer.Name, userInfo.PP-targetPlayer.PP)) }