diff --git a/handler/beatleader/beatleader.go b/handler/beatleader/beatleader.go index 2845966..d684223 100644 --- a/handler/beatleader/beatleader.go +++ b/handler/beatleader/beatleader.go @@ -108,23 +108,24 @@ func blPlus(msg model.Message) (reply *model.Reply) { } else { resultStr.WriteString(fmt.Sprintf("注意:你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) } - } - //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 - var targetPlayer beatleader.PlayerDataLite - targetRank := userInfo.CountryRank - N - if targetRank < 0 { - targetRank = 1 - } - for _, player := range leaderboard { - if player.CountryRank == targetRank { - targetPlayer = player - break + } else if userInfo.CountryRank != 1 { + //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 + var targetPlayer beatleader.PlayerDataLite + targetRank := userInfo.CountryRank - N + if targetRank < 0 { + targetRank = 1 + } + for _, player := range leaderboard { + if player.CountryRank == targetRank { + targetPlayer = player + break + } + } + if isPlus { + 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)) } - } - if isPlus { - 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)) } return &model.Reply{ ReplyMsg: resultStr.String(), diff --git a/handler/scoresaber/score.go b/handler/scoresaber/score.go index 1ef375b..dd28968 100644 --- a/handler/scoresaber/score.go +++ b/handler/scoresaber/score.go @@ -106,23 +106,24 @@ func ssPlusN(msg model.Message) (reply *model.Reply) { } else { resultStr.WriteString(fmt.Sprintf("注意:你最多只需要提升%d名就是%s区Top1了。\n", userInfo.CountryRank-1, userInfo.Country)) } - } - //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 - var targetPlayer scoresaber.PlayerData - targetRank := userInfo.CountryRank - N - if targetRank < 0 { - targetRank = 1 - } - for _, player := range leaderboard.Players { - if player.CountryRank == targetRank { - targetPlayer = player - break + } else if userInfo.CountryRank != 1 { + //寻找leaderboard中排名为userInfo.CountryRank-N的玩家 + var targetPlayer scoresaber.PlayerData + targetRank := userInfo.CountryRank - N + if targetRank < 0 { + targetRank = 1 + } + for _, player := range leaderboard.Players { + if player.CountryRank == targetRank { + targetPlayer = player + break + } + } + if isPlus { + 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)) } - } - if isPlus { - 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)) } return &model.Reply{ ReplyMsg: resultStr.String(),