From f48863150d1d5e456b2425718dbc5f3223697755 Mon Sep 17 00:00:00 2001
From: S-Sebb?? <tonyscwang@tencent.com>
Date: Wed, 27 Sep 2023 10:16:52 +0100
Subject: [PATCH] Send VerUpNo1s dynamically

---
 .../Controllers/Game/InitialDataCheckController.cs | 10 +++++-----
 .../Controllers/Game/PlayResultController.cs       | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
index 0e6c34a..bdf30a3 100644
--- a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
+++ b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
@@ -36,9 +36,8 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 			FlagCalculator.GetBitArrayFromIds(defaultSongList, songIdMax, Logger);
 
 		var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
-		var enabledUraMusicList = defaultSongWithUraList.Except(lockedSongsList);
 		var uraReleaseBit =
-			FlagCalculator.GetBitArrayFromIds(enabledUraMusicList, songIdMax, Logger);
+			FlagCalculator.GetBitArrayFromIds(defaultSongWithUraList, songIdMax, Logger);
 
 		var response = new InitialdatacheckResponse
 		{
@@ -62,12 +61,13 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 		response.AryVerupNoData1s.AddRange(aryVerUp);
 
 		var danData = new List<InitialdatacheckResponse.VerupNoData2.InformationData>();
-		for (var danId = Constants.MIN_DAN_ID; danId <= Constants.MAX_DAN_ID; danId++)
+		var danDataDictionary = gameDataService.GetDanDataDictionary();
+		foreach (var danId in danDataDictionary.Keys)
 		{
-			gameDataService.GetDanDataDictionary().TryGetValue((uint)danId, out var odaiData);
+			gameDataService.GetDanDataDictionary().TryGetValue(danId, out var odaiData);
 			danData.Add(new InitialdatacheckResponse.VerupNoData2.InformationData
 			{
-				InfoId = (uint)danId,
+				InfoId = danId,
 				VerupNo = odaiData?.VerupNo ?? 1
 			});
 		}
diff --git a/TaikoLocalServer/Controllers/Game/PlayResultController.cs b/TaikoLocalServer/Controllers/Game/PlayResultController.cs
index 6068d10..5274b85 100644
--- a/TaikoLocalServer/Controllers/Game/PlayResultController.cs
+++ b/TaikoLocalServer/Controllers/Game/PlayResultController.cs
@@ -79,9 +79,23 @@ public class PlayResultController : BaseController<PlayResultController>
 
         var bestData = await songBestDatumService.GetAllSongBestData(request.BaidConf);
         
+        // gameDataService.GetFolderDictionary().TryGetValue(9, out var folder9Data);
+
+        // var folder9Songs = new List<uint>();
+        //
+        // if (folder9Data is not null)
+        // {
+        //     folder9Songs.AddRange(folder9Data.SongNoes);
+        // }
+        
         for (var songNumber = 0; songNumber < playResultData.AryStageInfoes.Count; songNumber++)
         {
             var stageData = playResultData.AryStageInfoes[songNumber];
+
+            // if (folder9Songs.Contains(stageData.SongNo))
+            // {
+            //     continue;
+            // }
             
             if (stageData.IsSkipUse)
             {