From 372c972ea7668410277afb9b617ded8005565760 Mon Sep 17 00:00:00 2001
From: asesidaa <1061472754@qq.com>
Date: Fri, 15 Sep 2023 02:35:52 +0800
Subject: [PATCH] Update a bit

---
 TaikoLocalServer/Configurations/Kestrel.json  |  9 ------
 .../Controllers/Game/BaidController.cs        |  1 +
 .../Game/InitialDataCheckController.cs        | 32 +++++++------------
 .../Controllers/Game/MyDonEntryController.cs  |  1 +
 TaikoLocalServer/Program.cs                   | 17 +++++-----
 TaikoLocalServer/TaikoLocalServer.csproj      |  8 ++---
 6 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/TaikoLocalServer/Configurations/Kestrel.json b/TaikoLocalServer/Configurations/Kestrel.json
index 1254ce2..dea2b88 100644
--- a/TaikoLocalServer/Configurations/Kestrel.json
+++ b/TaikoLocalServer/Configurations/Kestrel.json
@@ -4,17 +4,8 @@
       "BaseServer": {
         "Url": "http://0.0.0.0:5000"
       },
-      "AmAuthServer": {
-        "Url": "http://0.0.0.0:80"
-      },
-      "MuchaServer": {
-        "Url": "https://0.0.0.0:10122"
-      },
       "GameServer1": {
         "Url": "https://0.0.0.0:57402"
-      },
-      "GameServer2": {
-        "Url": "https://0.0.0.0:54431"
       }
     },
     "Certificates": {
diff --git a/TaikoLocalServer/Controllers/Game/BaidController.cs b/TaikoLocalServer/Controllers/Game/BaidController.cs
index 33a81d6..e411c66 100644
--- a/TaikoLocalServer/Controllers/Game/BaidController.cs
+++ b/TaikoLocalServer/Controllers/Game/BaidController.cs
@@ -118,6 +118,7 @@ public class BaidController : BaseController<BaidController>
 			PlayerType = 0,
 			Baid = baid,
 			MydonName = userData.MyDonName,
+			MydonNameLanguage = 4,
 			Title = userData.Title,
 			TitleplateId = userData.TitlePlateId,
 			ColorFace = userData.ColorFace,
diff --git a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
index a83aab8..8c16e1a 100644
--- a/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
+++ b/TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs
@@ -24,23 +24,19 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 		Logger.LogInformation("Initial data check request: {Request}", request.Stringify());
 
 		var songIdMax = settings.EnableMoreSongs ? Constants.MUSIC_ID_MAX_EXPANDED : Constants.MUSIC_ID_MAX;
-
-		var lockedSongsList = gameDataService.GetLockedSongsList();
-		var enabledMusicList = gameDataService.GetMusicList().Except(lockedSongsList);
-		var enabledUraMusicList = gameDataService.GetMusicWithUraList().Except(lockedSongsList);
-
 		var enabledArray =
-			FlagCalculator.GetBitArrayFromIds(enabledMusicList, songIdMax, Logger);
-		var uraReleaseBit = FlagCalculator.GetBitArrayFromIds(enabledUraMusicList, songIdMax, Logger);
+			FlagCalculator.GetBitArrayFromIds(gameDataService.GetMusicList(), songIdMax, Logger);
 
-		var movieDataDictionary = gameDataService.GetMovieDataDictionary();
+		var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
+		var uraReleaseBit =
+			FlagCalculator.GetBitArrayFromIds(defaultSongWithUraList, songIdMax, Logger);
 
-		var verupNo1 = new uint[] { 104 };
+		var verupNo1 = new uint[] { 2, 3, 4, 5, 6, 7, 8, 13, 15, 24, 25, 26, 27, 28, 29, 30, 31, 104 };
 		var aryVerUp = verupNo1.Select(i => new InitialdatacheckResponse.VerupNoData1
-		{
-			MasterType = i,
-			VerupNo = 1
-		})
+			{
+				MasterType = i,
+				VerupNo = 1
+			})
 			.ToList();
 
 		var response = new InitialdatacheckResponse
@@ -51,11 +47,8 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 			UraReleaseBit = uraReleaseBit,
 			SongIntroductionEndDatetime = DateTime.Now.AddYears(10).ToString(Constants.DATE_TIME_FORMAT),
 		};
-
-		foreach (var movieData in movieDataDictionary) response.AryMovieInfoes.Add(movieData.Value);
-
 		response.AryVerupNoData1s.AddRange(aryVerUp);
-
+		
 		var danData = new List<InitialdatacheckResponse.VerupNoData2.InformationData>();
 		for (var danId = Constants.MIN_DAN_ID; danId <= 18; danId++)
 		{
@@ -65,8 +58,7 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 				VerupNo = 1
 			});
 		}
-
-		var verupNo2 = new uint[] { 101 };
+		var verupNo2 = new uint[] { 11, 101, 102, 103, 105 };
 		foreach (var i in verupNo2)
 		{
 			var verUp2 = new InitialdatacheckResponse.VerupNoData2
@@ -76,8 +68,8 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 			verUp2.AryInformationDatas.AddRange(danData);
 			response.AryVerupNoData2s.Add(verUp2);
 		}
+		response.AryChassisFunctionIds = new uint[] {1,2,3};
 
-		response.AryChassisFunctionIds = new uint[] { 1, 2, 3 };
 
 		return Ok(response);
 	}
diff --git a/TaikoLocalServer/Controllers/Game/MyDonEntryController.cs b/TaikoLocalServer/Controllers/Game/MyDonEntryController.cs
index ba0b4a1..6875445 100644
--- a/TaikoLocalServer/Controllers/Game/MyDonEntryController.cs
+++ b/TaikoLocalServer/Controllers/Game/MyDonEntryController.cs
@@ -53,6 +53,7 @@ public class MyDonEntryController : BaseController<MyDonEntryController>
 			Result = 1,
 			Baid = newId,
 			MydonName = request.MydonName,
+			MydonNameLanguage = 4
 		};
 
 		return Ok(response);
diff --git a/TaikoLocalServer/Program.cs b/TaikoLocalServer/Program.cs
index beefe30..6254ead 100644
--- a/TaikoLocalServer/Program.cs
+++ b/TaikoLocalServer/Program.cs
@@ -117,15 +117,6 @@ try
 
 
     app.UseHttpLogging();
-    app.MapControllers();
-    app.MapFallbackToFile("index.html");
-
-    app.UseWhen(
-        context => context.Request.Path.StartsWithSegments("/sys/servlet/PowerOn", StringComparison.InvariantCulture),
-        applicationBuilder => applicationBuilder.UseAllNetRequestMiddleware());
-
-    app.Run();
-    
     app.Use(async (context, next) =>
     {
         await next();
@@ -136,6 +127,14 @@ try
                 context.Connection.RemoteIpAddress, context.Request.Method, context.Request.Path, context.Response.StatusCode);
         }
     });
+    app.MapControllers();
+    app.MapFallbackToFile("index.html");
+
+    app.UseWhen(
+        context => context.Request.Path.StartsWithSegments("/sys/servlet/PowerOn", StringComparison.InvariantCulture),
+        applicationBuilder => applicationBuilder.UseAllNetRequestMiddleware());
+
+    app.Run();
 }
 catch (Exception ex)
 {
diff --git a/TaikoLocalServer/TaikoLocalServer.csproj b/TaikoLocalServer/TaikoLocalServer.csproj
index e666b02..e35fee8 100644
--- a/TaikoLocalServer/TaikoLocalServer.csproj
+++ b/TaikoLocalServer/TaikoLocalServer.csproj
@@ -64,10 +64,10 @@
       <Content Update="wwwroot\data\movie_data.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-      <Content Update="wwwroot\data\music_order.bin">
+      <Content Update="wwwroot\data\music_order.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-      <Content Update="wwwroot\data\musicinfo.bin">
+      <Content Update="wwwroot\data\musicinfo.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
       <Content Update="wwwroot\data\shop_folder_data.json">
@@ -76,7 +76,7 @@
       <Content Update="wwwroot\data\token_data.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-      <Content Update="wwwroot\data\wordlist.bin">
+      <Content Update="wwwroot\data\wordlist.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
     </ItemGroup>
@@ -91,7 +91,7 @@
       <Content Update="wwwroot\data\intro_data.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
-      <Content Update="wwwroot\data\music_attribute.bin">
+      <Content Update="wwwroot\data\music_attribute.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </Content>
       <Content Update="wwwroot\data\music_attribute.json">