From a52f7f5883dc6b4b4760efd4faa85e41c2054a8f Mon Sep 17 00:00:00 2001 From: shiibe Date: Sun, 11 Sep 2022 17:32:24 -0400 Subject: [PATCH] Clean up layout on dani dojo page --- TaikoWebUI/Pages/DaniDojo.razor | 108 ++++++++++++++++------------- TaikoWebUI/Pages/DaniDojo.razor.cs | 28 ++++++++ TaikoWebUI/Pages/TaikoMode.razor | 2 +- TaikoWebUI/wwwroot/index.html | 7 -- 4 files changed, 87 insertions(+), 58 deletions(-) diff --git a/TaikoWebUI/Pages/DaniDojo.razor b/TaikoWebUI/Pages/DaniDojo.razor index 05904ef..c772796 100644 --- a/TaikoWebUI/Pages/DaniDojo.razor +++ b/TaikoWebUI/Pages/DaniDojo.razor @@ -7,56 +7,64 @@

Dani Dojo

Card: @Baid - - - @for (uint i = 1; i <= 19; i++) - { - var danId = i; - var danData = GameDataService.GetDanDataById(danId); - - @foreach (var data in danData.OdaiBorderList) - { - @DanRequirementToString(data) - } - @if (bestDataMap.ContainsKey(danId)) - { - var danBestData = bestDataMap[danId]; - Clear state: @danBestData.ClearState - Best Soul gauge: @danBestData.SoulGaugeTotal - Best Total Combo: @danBestData.ComboCountTotal - - @foreach (var bestStage in danBestData.DanBestStageDataList) - { - var songNumber = bestStage.SongNumber; - var danDataOdaiSong = danData.OdaiSongList[(int)songNumber]; - - Song Number: @songNumber - - Song Name: - @GameDataService.GetMusicNameBySongId(danDataOdaiSong.SongNo) - - Song Difficulty: @((Difficulty)danDataOdaiSong.Level) - - Song play detail
- Good : @bestStage.GoodCount
- Ok : @bestStage.OkCount
- Bad : @bestStage.BadCount
- Combo : @bestStage.ComboCount
- Drumroll : @bestStage.DrumrollCount
- Total hit : @bestStage.TotalHitCount -
-
- } -
- } - else + + + + + @for (uint i = 1; i <= 19; i++) { - - This dan course hasn't been played - + var danId = i; + var danData = GameDataService.GetDanDataById(danId); + + + @if (!bestDataMap.ContainsKey(danId)) { + + This dan course hasn't been played yet. + + } + + @foreach (var data in danData.OdaiBorderList) + { + @DanRequirementToString(data) + } + @if (bestDataMap.ContainsKey(danId)) + { + var danBestData = bestDataMap[danId]; + Clear state: @danBestData.ClearState + Best Soul gauge: @danBestData.SoulGaugeTotal + Best Total Combo: @danBestData.ComboCountTotal + + @foreach (var bestStage in danBestData.DanBestStageDataList) + { + var songNumber = bestStage.SongNumber; + var danDataOdaiSong = danData.OdaiSongList[(int)songNumber]; + + Song Number: @songNumber + + Song Name: + @GameDataService.GetMusicNameBySongId(danDataOdaiSong.SongNo) + + Song Difficulty: @((Difficulty)danDataOdaiSong.Level) + + Song play detail
+ Good : @bestStage.GoodCount
+ Ok : @bestStage.OkCount
+ Bad : @bestStage.BadCount
+ Combo : @bestStage.ComboCount
+ Drumroll : @bestStage.DrumrollCount
+ Total hit : @bestStage.TotalHitCount +
+
+ } +
+ + } +
+
+
} -
- } -
-
\ No newline at end of file + + + + \ No newline at end of file diff --git a/TaikoWebUI/Pages/DaniDojo.razor.cs b/TaikoWebUI/Pages/DaniDojo.razor.cs index c711f80..7bfdf7b 100644 --- a/TaikoWebUI/Pages/DaniDojo.razor.cs +++ b/TaikoWebUI/Pages/DaniDojo.razor.cs @@ -37,4 +37,32 @@ public partial class DaniDojo _ => throw new ArgumentOutOfRangeException() }; } + + private static string GetDanTitle(string title) + { + return title switch + { + "5kyuu" => "Fifth Kyuu", + "4kyuu" => "Fourth Kyuu", + "3kyuu" => "Third Kyuu", + "2kyuu" => "Second Kyuu", + "1kyuu" => "First Kyuu", + "1dan" => "First Dan", + "2dan" => "Second Dan", + "3dan" => "Third Dan", + "4dan" => "Fourth Dan", + "5dan" => "Fifth Dan", + "6dan" => "Sixth Dan", + "7dan" => "Seventh Dan", + "8dan" => "Eighth Dan", + "9dan" => "Ninth Dan", + "10dan" => "Tenth Dan", + "11dan" => "Kuroto", + "12dan" => "Meijin", + "13dan" => "Chojin", + "14dan" => "Tatsujin", + "15dan" => "Gaiden", + _ => "" + }; + } } \ No newline at end of file diff --git a/TaikoWebUI/Pages/TaikoMode.razor b/TaikoWebUI/Pages/TaikoMode.razor index fcb4d98..8e8d82c 100644 --- a/TaikoWebUI/Pages/TaikoMode.razor +++ b/TaikoWebUI/Pages/TaikoMode.razor @@ -99,7 +99,7 @@ { - + No data for selected difficulty. diff --git a/TaikoWebUI/wwwroot/index.html b/TaikoWebUI/wwwroot/index.html index d406c4e..e3ed8a1 100644 --- a/TaikoWebUI/wwwroot/index.html +++ b/TaikoWebUI/wwwroot/index.html @@ -8,13 +8,6 @@ -