From e99e8361010452a8dae852acbcf670d58dab22a1 Mon Sep 17 00:00:00 2001 From: lixiangwuxian Date: Sun, 4 May 2025 00:02:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20blPlus=20=E5=92=8C?= =?UTF-8?q?=20ssPlusN=20=E5=87=BD=E6=95=B0=E4=B8=AD=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84=E6=8D=A2=E8=A1=8C=E7=AC=A6?= =?UTF-8?q?=E4=BB=A5=E6=8F=90=E5=8D=87=E8=BE=93=E5=87=BA=E7=9A=84=E6=95=B4?= =?UTF-8?q?=E6=B4=81=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handler/beatleader/beatleader.go | 11 +++++++---- handler/scoresaber/score.go | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/handler/beatleader/beatleader.go b/handler/beatleader/beatleader.go index fce869d..72905c7 100644 --- a/handler/beatleader/beatleader.go +++ b/handler/beatleader/beatleader.go @@ -92,7 +92,7 @@ func blPlus(msg model.Message) (reply *model.Reply) { FromMsg: msg, } } - resultStr.WriteString(fmt.Sprintf("您当前的BeatLeader全区排名为：%d\n", userInfo.CountryRank)) + resultStr.WriteString(fmt.Sprintf("您当前的BeatLeader全区排名为：%d", userInfo.CountryRank)) // 获取当前用户所在区对应 + N位的玩家列表 leaderboard, err := beatleader.FetchCountryLeaderboard(userInfo.Country, userInfo.CountryRank-N, userInfo.ID) if err != nil { @@ -103,12 +103,14 @@ func blPlus(msg model.Message) (reply *model.Reply) { } } if userInfo.CountryRank-N <= 0 { + resultStr.WriteString("\n") if userInfo.CountryRank == 1 { - resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。\n", userInfo.Country)) + resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。", userInfo.Country)) } else { - resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) + resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。", userInfo.CountryRank-1, userInfo.Country)) } - } else if userInfo.CountryRank != 1 { + } + if userInfo.CountryRank != 1 { //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 var targetPlayer beatleader.PlayerDataLite targetRank := userInfo.CountryRank - N @@ -121,6 +123,7 @@ func blPlus(msg model.Message) (reply *model.Reply) { break } } + resultStr.WriteString("\n") if isPlus { resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越 %s，达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank)) } else { diff --git a/handler/scoresaber/score.go b/handler/scoresaber/score.go index dd28968..2635d8f 100644 --- a/handler/scoresaber/score.go +++ b/handler/scoresaber/score.go @@ -90,7 +90,7 @@ func ssPlusN(msg model.Message) (reply *model.Reply) { FromMsg: msg, } } - resultStr.WriteString(fmt.Sprintf("您当前的ScoreSaber全区排名为：%d\n", userInfo.CountryRank)) + resultStr.WriteString(fmt.Sprintf("您当前的ScoreSaber全区排名为：%d", userInfo.CountryRank)) // 获取当前用户所在区对应+N位的玩家列表 leaderboard, err := scoresaber.FetchCountryLeaderboard(userInfo.Country, userInfo.CountryRank-N, userInfo.ID) if err != nil { @@ -101,12 +101,14 @@ func ssPlusN(msg model.Message) (reply *model.Reply) { } } if userInfo.CountryRank-N <= 0 { + resultStr.WriteString("\n") if userInfo.CountryRank == 1 { - resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。\n", userInfo.Country)) + resultStr.WriteString(fmt.Sprintf("注意：你已经是%s区Top1了。", userInfo.Country)) } else { - resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) + resultStr.WriteString(fmt.Sprintf("注意：你最多只需要提升%d名就是%s区Top1了。", userInfo.CountryRank-1, userInfo.Country)) } - } else if userInfo.CountryRank != 1 { + } + if userInfo.CountryRank != 1 { //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 var targetPlayer scoresaber.PlayerData targetRank := userInfo.CountryRank - N @@ -119,6 +121,7 @@ func ssPlusN(msg model.Message) (reply *model.Reply) { break } } + resultStr.WriteString("\n") if isPlus { resultStr.WriteString(fmt.Sprintf("您只需要再打出%.2fpp就能超越%s，达到%s区第%d名。", targetPlayer.PP-userInfo.PP, targetPlayer.Name, userInfo.Country, targetPlayer.CountryRank)) } else {