From 2674b99340b4d7037a561175cab82b7230e59054 Mon Sep 17 00:00:00 2001 From: 0aubsq <0aubsq@gmail.com> Date: Fri, 25 Mar 2022 07:09:22 +0100 Subject: [PATCH] Display clear and scorerank status on the song select screen for all difficulties and display the difficulty icon next to it --- .../05.SongSelect/CActSelect曲リスト.cs | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs index f6e397b8..47475c8a 100644 --- a/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs +++ b/TJAPlayer3/Stages/05.SongSelect/CActSelect曲リスト.cs @@ -2462,7 +2462,58 @@ namespace TJAPlayer3 TJAPlayer3.Tx.SongSelect_ScoreRank.vc拡大縮小倍率.X = _resize; TJAPlayer3.Tx.SongSelect_ScoreRank.vc拡大縮小倍率.Y = _resize; + int bestCrown = -1; + int bestScoreRank = -1; + + for (int i = 0; i <= (int)Difficulty.Edit; i++) + { + if (クリア[i] > 0) + bestCrown = i; + if (スコアランク[i] > 0) + bestScoreRank = i; + } + + if (bestCrown >= 0) + { + TJAPlayer3.Tx.SongSelect_Crown?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x, y, new RectangleF(12 * 43.2f + (クリア[bestCrown] - 1) * 43.2f, 0, 43.2f, 39)); + } + + if (bestScoreRank >= 0) + { + TJAPlayer3.Tx.SongSelect_ScoreRank?.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x, y + 30, new RectangleF(0, (スコアランク[bestScoreRank] - 1) * 42.71f, 50, 42.71f)); + } + + if (TJAPlayer3.Tx.Dani_Difficulty_Cymbol != null) + { + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = TJAPlayer3.Tx.SongSelect_Favorite.Opacity; + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.X = 0.5f; + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.Y = 0.5f; + + if (bestCrown >= 0) + { + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.app.Device, + x + 22, + y + 22, + new Rectangle(bestCrown * 53, 0, 53, 53)); + } + + if (bestScoreRank >= 0) + { + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.t2D中心基準描画(TJAPlayer3.app.Device, + x + 22, + y + 52, + new Rectangle(bestScoreRank * 53, 0, 53, 53)); + } + + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.Opacity = 255; + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.X = 1f; + TJAPlayer3.Tx.Dani_Difficulty_Cymbol.vc拡大縮小倍率.Y = 1f; + } + + + // Other crowns + /* if (クリア[3] > 0 && クリア[4] == 0) TJAPlayer3.Tx.SongSelect_Crown.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x, y, new RectangleF(9 * 43.2f + (クリア[3] - 1) * 43.2f, 0, 43.2f, 39)); else if (クリア[4] > 0) @@ -2472,6 +2523,7 @@ namespace TJAPlayer3 TJAPlayer3.Tx.SongSelect_ScoreRank.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x, y + 30, new RectangleF(0, (スコアランク[3] - 1) * 42.71f, 50, 42.71f)); else if (スコアランク[4] > 0) TJAPlayer3.Tx.SongSelect_ScoreRank.t2D拡大率考慮中央基準描画(TJAPlayer3.app.Device, x, y + 30, new RectangleF(0, (スコアランク[4] - 1) * 42.71f, 50, 42.71f)); + */ } public void displayFavoriteStatus(int x, int y, CSongUniqueID csu, float _resize)