From dca46c0cd700dabed57b96e43a4b997fb9451a8d Mon Sep 17 00:00:00 2001 From: esuo1198 <54134.es@gmail.com> Date: Sat, 23 Sep 2023 08:34:23 +0900 Subject: [PATCH] Add GetfolderResponse.EventfolderData.ParentFolderId handle --- SharedProject/Models/EventFolderData.cs | 19 +++++++++++-------- TaikoLocalServer/Services/GameDataService.cs | 17 +++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/SharedProject/Models/EventFolderData.cs b/SharedProject/Models/EventFolderData.cs index 61e7a93..fb183c5 100644 --- a/SharedProject/Models/EventFolderData.cs +++ b/SharedProject/Models/EventFolderData.cs @@ -4,15 +4,18 @@ namespace SharedProject.Models; public class EventFolderData { - [JsonPropertyName("folderId")] - public uint FolderId { get; set; } + [JsonPropertyName("folderId")] + public uint FolderId { get; set; } - [JsonPropertyName("verupNo")] - public uint VerupNo { get; set; } + [JsonPropertyName("verupNo")] + public uint VerupNo { get; set; } - [JsonPropertyName("priority")] - public uint Priority { get; set; } + [JsonPropertyName("priority")] + public uint Priority { get; set; } - [JsonPropertyName("songNo")] - public uint[]? SongNo { get; set; } + [JsonPropertyName("songNo")] + public uint[]? SongNo { get; set; } + + [JsonPropertyName("parentFolderId")] + public uint ParentFolderId { get; set; } } \ No newline at end of file diff --git a/TaikoLocalServer/Services/GameDataService.cs b/TaikoLocalServer/Services/GameDataService.cs index a572cd5..cdf9ca4 100644 --- a/TaikoLocalServer/Services/GameDataService.cs +++ b/TaikoLocalServer/Services/GameDataService.cs @@ -17,7 +17,7 @@ public class GameDataService : IGameDataService private ImmutableDictionary danDataDictionary = ImmutableDictionary.Empty; - + private ImmutableDictionary gaidenDataDictionary = ImmutableDictionary.Empty; @@ -77,7 +77,7 @@ public class GameDataService : IGameDataService { return danDataDictionary; } - + public ImmutableDictionary GetGaidenDataDictionary() { return gaidenDataDictionary; @@ -112,7 +112,7 @@ public class GameDataService : IGameDataService { return lockedSongsList; } - + public ImmutableDictionary GetQRCodeDataDictionary() { return qrCodeDataDictionary; @@ -172,7 +172,7 @@ public class GameDataService : IGameDataService InitializeMusicAttributes(attributesData); InitializeDanData(danData); - + InitializeGaidenData(gaidenData); InitializeIntroData(introData); @@ -186,7 +186,7 @@ public class GameDataService : IGameDataService InitializeTokenData(tokenData); InitializeLockedSongsData(lockedSongsData); - + InitializeQRCodeData(qrCodeData); } @@ -231,7 +231,7 @@ public class GameDataService : IGameDataService danData.ThrowIfNull("Shouldn't happen!"); danDataDictionary = danData.ToImmutableDictionary(data => data.DanId, ToResponseOdaiData); } - + private void InitializeGaidenData(List? gaidenData) { gaidenData.ThrowIfNull("Shouldn't happen!"); @@ -284,7 +284,7 @@ public class GameDataService : IGameDataService lockedSongsData.ThrowIfNull("Shouldn't happen!"); lockedSongsList = lockedSongsData["songNo"].ToList(); } - + private void InitializeQRCodeData(List? qrCodeData) { qrCodeData.ThrowIfNull("Shouldn't happen!"); @@ -340,7 +340,8 @@ public class GameDataService : IGameDataService FolderId = data.FolderId, VerupNo = data.VerupNo, Priority = data.Priority, - SongNoes = data.SongNo + SongNoes = data.SongNo, + ParentFolderId = data.ParentFolderId }; return responseEventFolderData;