Readded locking songs in initialDataCheck, updated game constants

TaikoLocalServer/Common/Constants.cs

@@ -29,13 +29,13 @@ public static class Constants
 
 	public const int TONE_UID_MAX = 19;
 
-	public const int TITLE_UID_MAX = 814;
+	public const int TITLE_UID_MAX = 941;
 
-	private const int COSTUME_FLAG_1_ARRAY_SIZE = 154;
+	private const int COSTUME_FLAG_1_ARRAY_SIZE = 156;
 	private const int COSTUME_FLAG_2_ARRAY_SIZE = 140;
 	private const int COSTUME_FLAG_3_ARRAY_SIZE = 156;
 	private const int COSTUME_FLAG_4_ARRAY_SIZE = 58;
-	private const int COSTUME_FLAG_5_ARRAY_SIZE = 129;
+	private const int COSTUME_FLAG_5_ARRAY_SIZE = 142;
 	public static readonly int[] CostumeFlagArraySizes =
 	{
 		COSTUME_FLAG_1_ARRAY_SIZE,

TaikoLocalServer/Configurations/Logging.json

@@ -1,6 +1,9 @@
 {
   "Serilog": {
-    "Using":  [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "Using": [
+      "Serilog.Sinks.Console",
+      "Serilog.Sinks.File"
+    ],
     "MinimumLevel": {
       "Default": "Information",
       "Override": {
@@ -20,7 +23,10 @@
     "WriteTo": [
       {
         "Name": "File",
-        "Args": { "path":  "./Logs/log-.txt", "rollingInterval": "Day" }
+        "Args": {
+          "path": "./Logs/log-.txt",
+          "rollingInterval": "Day"
+        }
       }
     ]
   }

TaikoLocalServer/Controllers/Game/InitialDataCheckController.cs

@@ -24,12 +24,17 @@ 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 musicList = gameDataService.GetMusicList();
+		var lockedSongsList = gameDataService.GetLockedSongsList();
+		var enabledMusicList = musicList.Except(lockedSongsList);
 		var enabledArray =
-			FlagCalculator.GetBitArrayFromIds(gameDataService.GetMusicList(), songIdMax, Logger);
+			FlagCalculator.GetBitArrayFromIds(enabledMusicList, songIdMax, Logger);
 
 		var defaultSongWithUraList = gameDataService.GetMusicWithUraList();
+		var enabledUraList = defaultSongWithUraList.Except(lockedSongsList);
 		var uraReleaseBit =
-			FlagCalculator.GetBitArrayFromIds(defaultSongWithUraList, songIdMax, Logger);
+			FlagCalculator.GetBitArrayFromIds(enabledUraList, songIdMax, Logger);
 
 		var response = new InitialdatacheckResponse
 		{
@@ -68,12 +73,13 @@ public class InitialDataCheckController : BaseController<InitialDataCheckControl
 		verUp2Type101.AryInformationDatas.AddRange(danData);
 		response.AryVerupNoData2s.Add(verUp2Type101);
 		
-		var verUp2Type102 = new InitialdatacheckResponse.VerupNoData2
+		// gaiden testing
-		{
+		// var verUp2Type102 = new InitialdatacheckResponse.VerupNoData2
-			MasterType = 102,
+		// {
-		};
+		// 	MasterType = 102,
-		verUp2Type102.AryInformationDatas.AddRange(danData);
+		// };
-		response.AryVerupNoData2s.Add(verUp2Type102);
+		// verUp2Type102.AryInformationDatas.AddRange(danData);
+		// response.AryVerupNoData2s.Add(verUp2Type102);
 		
 		var eventFolderData = new List<InitialdatacheckResponse.VerupNoData2.InformationData>();
 		foreach (var folderId in Constants.EVENT_FOLDER_IDS)

TaikoLocalServer/wwwroot/data/event_folder_data.json

@@ -10,9 +10,38 @@
     "verupNo": 1,
     "priority": 1,
     "songNo": [
-            478, 153, 200, 482, 511, 672, 675, 646, 644, 645, 676, 671, 479,
+      478,
-            707, 480, 481, 203, 204, 483, 205, 202, 241, 14, 387, 197, 281, 226,
+      153,
-            484, 543, 512, 709, 35
+      200,
+      482,
+      511,
+      672,
+      675,
+      646,
+      644,
+      645,
+      676,
+      671,
+      479,
+      707,
+      480,
+      481,
+      203,
+      204,
+      483,
+      205,
+      202,
+      241,
+      14,
+      387,
+      197,
+      281,
+      226,
+      484,
+      543,
+      512,
+      709,
+      35
     ]
   },
   {
@@ -20,12 +49,68 @@
     "verupNo": 1,
     "priority": 1,
     "songNo": [
-            1485, 1404, 1580, 1730, 1750, 1277, 1478, 1481, 1482, 1484, 1500,
+      1485,
-            1890, 2349, 2604, 2640, 1176, 1419, 1596, 1693, 2248, 1049, 1221,
+      1404,
-            1222, 1223, 1224, 1493, 1578, 1719, 2650, 1595, 1964, 1469, 1217,
+      1580,
-            1314, 1406, 1565, 1745, 2120, 2200, 2324, 2785, 1631, 2301, 2802,
+      1730,
-            1490, 2088, 2268, 2309, 2507, 2126, 1630, 2509, 1263, 2495, 2642,
+      1750,
-            2745, 1054, 2583, 1271, 1266, 1267, 2923
+      1277,
+      1478,
+      1481,
+      1482,
+      1484,
+      1500,
+      1890,
+      2349,
+      2604,
+      2640,
+      1176,
+      1419,
+      1596,
+      1693,
+      2248,
+      1049,
+      1221,
+      1222,
+      1223,
+      1224,
+      1493,
+      1578,
+      1719,
+      2650,
+      1595,
+      1964,
+      1469,
+      1217,
+      1314,
+      1406,
+      1565,
+      1745,
+      2120,
+      2200,
+      2324,
+      2785,
+      1631,
+      2301,
+      2802,
+      1490,
+      2088,
+      2268,
+      2309,
+      2507,
+      2126,
+      1630,
+      2509,
+      1263,
+      2495,
+      2642,
+      2745,
+      1054,
+      2583,
+      1271,
+      1266,
+      1267,
+      2923
     ]
   },
   {
@@ -33,29 +118,87 @@
     "verupNo": 1,
     "priority": 1,
     "songNo": [
-            1361, 1366, 1373, 1379, 1337, 1345, 1357, 1362, 1367, 1368, 1369,
+      1361,
-            1374, 1375, 1388, 1390, 1579, 2225, 1354, 1394, 2804, 1340, 1341,
+      1366,
-            1370, 1376, 1384, 1359, 1385, 2416, 2756, 1363, 1920, 1353, 1360,
+      1373,
-            1381, 1389, 1364, 1391, 1342, 1546, 1931
+      1379,
+      1337,
+      1345,
+      1357,
+      1362,
+      1367,
+      1368,
+      1369,
+      1374,
+      1375,
+      1388,
+      1390,
+      1579,
+      2225,
+      1354,
+      1394,
+      2804,
+      1340,
+      1341,
+      1370,
+      1376,
+      1384,
+      1359,
+      1385,
+      2416,
+      2756,
+      1363,
+      1920,
+      1353,
+      1360,
+      1381,
+      1389,
+      1364,
+      1391,
+      1342,
+      1546,
+      1931
     ]
   },
   {
     "folderId": 5,
     "verupNo": 1,
     "priority": 1,
-        "songNo": [242, 430, 368, 604, 333]
+    "songNo": [
+      242,
+      430,
+      368,
+      604,
+      333
+    ]
   },
   {
     "folderId": 6,
     "verupNo": 1,
     "priority": 1,
-        "songNo": [841, 767, 658, 467, 468, 466, 460, 157, 465]
+    "songNo": [
+      841,
+      767,
+      658,
+      467,
+      468,
+      466,
+      460,
+      157,
+      465
+    ]
   },
   {
     "folderId": 7,
     "verupNo": 1,
     "priority": 1,
-        "songNo": [733, 732, 44, 790, 894]
+    "songNo": [
+      733,
+      732,
+      44,
+      790,
+      894
+    ]
   },
   {
     "folderId": 8,

TaikoLocalServer/wwwroot/data/intro_data.json

@@ -3,72 +3,132 @@
     "setId": 1,
     "verupNo": 1,
     "mainSongNo": 895,
-    "subSongNo":[894,732,44,921]
+    "subSongNo": [
+      894,
+      732,
+      44,
+      921
+    ]
   },
   {
     "setId": 2,
     "verupNo": 1,
     "mainSongNo": 912,
-    "subSongNo":[827,871,36,227]
+    "subSongNo": [
+      827,
+      871,
+      36,
+      227
+    ]
   },
   {
     "setId": 3,
     "verupNo": 1,
     "mainSongNo": 913,
-    "subSongNo":[460,916,430,872]
+    "subSongNo": [
+      460,
+      916,
+      430,
+      872
+    ]
   },
   {
     "setId": 4,
     "verupNo": 1,
     "mainSongNo": 842,
-    "subSongNo":[7,233,256,831]
+    "subSongNo": [
+      7,
+      233,
+      256,
+      831
+    ]
   },
   {
     "setId": 5,
     "verupNo": 1,
     "mainSongNo": 947,
-    "subSongNo":[926,882,730,695]
+    "subSongNo": [
+      926,
+      882,
+      730,
+      695
+    ]
   },
   {
     "setId": 6,
     "verupNo": 1,
     "mainSongNo": 937,
-    "subSongNo":[828,925,474,924]
+    "subSongNo": [
+      828,
+      925,
+      474,
+      924
+    ]
   },
   {
     "setId": 7,
     "verupNo": 1,
     "mainSongNo": 956,
-    "subSongNo":[839,255,285,187]
+    "subSongNo": [
+      839,
+      255,
+      285,
+      187
+    ]
   },
   {
     "setId": 8,
     "verupNo": 1,
     "mainSongNo": 923,
-    "subSongNo":[729,873,789,893]
+    "subSongNo": [
+      729,
+      873,
+      789,
+      893
+    ]
   },
   {
     "setId": 9,
     "verupNo": 1,
     "mainSongNo": 915,
-    "subSongNo":[726,811,711,303]
+    "subSongNo": [
+      726,
+      811,
+      711,
+      303
+    ]
   },
   {
     "setId": 10,
     "verupNo": 1,
     "mainSongNo": 885,
-    "subSongNo":[837,464,801,18]
+    "subSongNo": [
+      837,
+      464,
+      801,
+      18
+    ]
   },
   {
     "setId": 11,
     "verupNo": 1,
     "mainSongNo": 898,
-    "subSongNo":[47,135,374,792]
+    "subSongNo": [
+      47,
+      135,
+      374,
+      792
+    ]
   },
   {
     "setId": 12,
     "verupNo": 1,
     "mainSongNo": 948,
-    "subSongNo":[412,538,411,413]
+    "subSongNo": [
+      412,
+      538,
+      411,
+      413
+    ]
   }
 ]

TaikoWebUI/wwwroot/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"/>
     <title>TaikoWebUI</title>
     <base href="/"/>
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet"/>
@@ -16,7 +16,7 @@
 
 <div id="blazor-error-ui">
     An unhandled error has occurred.
-        <a href="" class="reload">Reload</a>
+    <a class="reload" href="">Reload</a>
     <a class="dismiss">🗙</a>
 </div>
 <script src="_framework/blazor.webassembly.js"></script>