diff --git a/.gitattributes b/.gitattributes index af50fed..eba1110 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ # Auto detect text files and perform LF normalization -* text=auto -cert.sh eol=lf +* text=auto \ No newline at end of file diff --git a/DataFixupUtil/Program.cs b/DataFixupUtil/Program.cs index 64b3803..1e37fb7 100644 --- a/DataFixupUtil/Program.cs +++ b/DataFixupUtil/Program.cs @@ -1,5 +1,4 @@ -using System.IO; -using System.IO.Compression; +using System.IO.Compression; namespace DataFixupUtil { @@ -9,7 +8,7 @@ namespace DataFixupUtil { Console.WriteLine("Hello, World!"); - foreach(var arg in Directory.GetFiles("C:\\NIKKE\\NIKKE\\Game")) + foreach (var arg in Directory.GetFiles("C:\\NIKKE\\NIKKE\\Game")) { var fileName = Path.GetFileName(arg); if (fileName.StartsWith("input")) diff --git a/ProtobufViewUtil/Program.cs b/ProtobufViewUtil/Program.cs index 9cb44b7..dc578b2 100644 --- a/ProtobufViewUtil/Program.cs +++ b/ProtobufViewUtil/Program.cs @@ -1,8 +1,4 @@ -using Google.Protobuf; -using nksrv; -using System.Diagnostics; - -namespace ProtobufViewUtil +namespace ProtobufViewUtil { internal class Program { @@ -15,7 +11,7 @@ namespace ProtobufViewUtil s.MergeFrom(inn); Console.WriteLine(s.ToString()); var outt = s.ToByteArray(); - + if (inn.SequenceEqual(outt)) { Console.WriteLine("Check OK"); diff --git a/ServerSelector.Desktop/Program.cs b/ServerSelector.Desktop/Program.cs index 317854a..a151eff 100644 --- a/ServerSelector.Desktop/Program.cs +++ b/ServerSelector.Desktop/Program.cs @@ -1,7 +1,6 @@ -using System; - -using Avalonia; +using Avalonia; using Avalonia.ReactiveUI; +using System; namespace ServerSelector.Desktop; diff --git a/ServerSelector/ServerSwitcher.cs b/ServerSelector/ServerSwitcher.cs index 388888e..f3d124d 100644 --- a/ServerSelector/ServerSwitcher.cs +++ b/ServerSelector/ServerSwitcher.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Security.Cryptography.X509Certificates; -using System.Text; -using System.Threading.Tasks; namespace ServerSelector { diff --git a/ServerSelector/Views/MainView.axaml.cs b/ServerSelector/Views/MainView.axaml.cs index 5d1698b..4ba9f8f 100644 --- a/ServerSelector/Views/MainView.axaml.cs +++ b/ServerSelector/Views/MainView.axaml.cs @@ -3,7 +3,6 @@ using System; using System.IO; using System.Net; using System.Runtime.InteropServices; -using System.Security.Principal; namespace ServerSelector.Views; diff --git a/nksrv/AdminApiController.cs b/nksrv/AdminApiController.cs index 3268724..7122929 100644 --- a/nksrv/AdminApiController.cs +++ b/nksrv/AdminApiController.cs @@ -2,7 +2,6 @@ using EmbedIO.Routing; using EmbedIO.WebApi; using nksrv.Utils; -using System; using System.Security.Cryptography; using System.Text; diff --git a/nksrv/IntlServer/AutoLoginEndpoint.cs b/nksrv/IntlServer/AutoLoginEndpoint.cs index 196c88c..20f1366 100644 --- a/nksrv/IntlServer/AutoLoginEndpoint.cs +++ b/nksrv/IntlServer/AutoLoginEndpoint.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.IntlServer +namespace nksrv.IntlServer { internal class AutoLoginEndpoint : IntlMsgHandler { diff --git a/nksrv/IntlServer/CodeStatusEndpoint.cs b/nksrv/IntlServer/CodeStatusEndpoint.cs index 8d2387f..8e4c440 100644 --- a/nksrv/IntlServer/CodeStatusEndpoint.cs +++ b/nksrv/IntlServer/CodeStatusEndpoint.cs @@ -1,13 +1,4 @@ -using EmbedIO; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http.Headers; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.IntlServer +namespace nksrv.IntlServer { public class CodeStatusEndpoint : IntlMsgHandler { @@ -16,7 +7,7 @@ namespace nksrv.IntlServer protected override async Task HandleAsync() { // pretend that any code is valid - await WriteJsonStringAsync("{\"expire_time\":759,\"msg\":\"Success\",\"ret\":0,\"seq\":\""+Seq+"\"}"); + await WriteJsonStringAsync("{\"expire_time\":759,\"msg\":\"Success\",\"ret\":0,\"seq\":\"" + Seq + "\"}"); } } } diff --git a/nksrv/IntlServer/GetNoticeContent.cs b/nksrv/IntlServer/GetNoticeContent.cs index af8e95f..b9e2bc9 100644 --- a/nksrv/IntlServer/GetNoticeContent.cs +++ b/nksrv/IntlServer/GetNoticeContent.cs @@ -1,11 +1,4 @@ -using Google.Api; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.IntlServer +namespace nksrv.IntlServer { public class GetNoticeContent : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlAccountRedirect.cs b/nksrv/IntlServer/IntlAccountRedirect.cs index 402bc1c..1360e46 100644 --- a/nksrv/IntlServer/IntlAccountRedirect.cs +++ b/nksrv/IntlServer/IntlAccountRedirect.cs @@ -1,12 +1,6 @@ -using EmbedIO; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; +using nksrv.Utils; using System.Net; using System.Net.Http.Headers; -using System.Text; -using System.Threading.Tasks; namespace nksrv.IntlServer { diff --git a/nksrv/IntlServer/IntlAccountRegisterEndpoint.cs b/nksrv/IntlServer/IntlAccountRegisterEndpoint.cs index 040c31c..4f4c5d0 100644 --- a/nksrv/IntlServer/IntlAccountRegisterEndpoint.cs +++ b/nksrv/IntlServer/IntlAccountRegisterEndpoint.cs @@ -1,15 +1,8 @@ using EmbedIO; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http.Headers; -using System.Net; -using System.Text; -using System.Threading.Tasks; -using static nksrv.IntlServer.IntlLogin2Endpoint; using Newtonsoft.Json; -using static nksrv.IntlServer.IntlLogin1Endpoint; using nksrv.Utils; +using System.Net; +using static nksrv.IntlServer.IntlLogin2Endpoint; namespace nksrv.IntlServer { @@ -43,7 +36,7 @@ namespace nksrv.IntlServer } } - var user = new User() { ID = uid, Password = ep.password, RegisterTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds(), Username = ep.account, PlayerName = "Player_"+Rng.RandomString(8) }; + var user = new User() { ID = uid, Password = ep.password, RegisterTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds(), Username = ep.account, PlayerName = "Player_" + Rng.RandomString(8) }; JsonDb.Instance.Users.Add(user); diff --git a/nksrv/IntlServer/IntlGetAccountInfo.cs b/nksrv/IntlServer/IntlGetAccountInfo.cs index f4452b7..f313657 100644 --- a/nksrv/IntlServer/IntlGetAccountInfo.cs +++ b/nksrv/IntlServer/IntlGetAccountInfo.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.IntlServer +namespace nksrv.IntlServer { internal class IntlGetAccountInfo : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlGetProfileInfo.cs b/nksrv/IntlServer/IntlGetProfileInfo.cs index d39d976..f39c18d 100644 --- a/nksrv/IntlServer/IntlGetProfileInfo.cs +++ b/nksrv/IntlServer/IntlGetProfileInfo.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.IntlServer +namespace nksrv.IntlServer { public class IntlGetProfileInfo : IntlMsgHandler { @@ -15,7 +9,7 @@ namespace nksrv.IntlServer if (User == null) throw new Exception("no user"); // should never happen - await WriteJsonStringAsync("{\"bind_list\":[{\"channel_info\":{\"birthday\":\"1970-01\",\"email\":\""+User.Username+"\",\"is_receive_email\":1,\"lang_type\":\"en\",\"last_login_time\":1719075003,\"nick_name\":\"\",\"phone\":\"\",\"phone_area_code\":\"\",\"region\":\"724\",\"register_account\":\""+User.Username+"\",\"register_account_type\":1,\"register_time\":"+User.RegisterTime+",\"seq\":\"abc\",\"uid\":\""+User.ID+"\",\"user_name\":\""+User.PlayerName+"\",\"username_pass_verify\":0},\"channelid\":131,\"email\":\"" + User.Username + "\",\"picture_url\":\"\",\"user_name\":\""+User.PlayerName+"\"}],\"birthday\":\"1970-01\",\"email\":\"" + User.Username + "\",\"gender\":0,\"msg\":\"success\",\"picture_url\":\"\",\"ret\":0,\"seq\":\"" + Seq + "\",\"user_name\":\"" + User.PlayerName + "\"}"); + await WriteJsonStringAsync("{\"bind_list\":[{\"channel_info\":{\"birthday\":\"1970-01\",\"email\":\"" + User.Username + "\",\"is_receive_email\":1,\"lang_type\":\"en\",\"last_login_time\":1719075003,\"nick_name\":\"\",\"phone\":\"\",\"phone_area_code\":\"\",\"region\":\"724\",\"register_account\":\"" + User.Username + "\",\"register_account_type\":1,\"register_time\":" + User.RegisterTime + ",\"seq\":\"abc\",\"uid\":\"" + User.ID + "\",\"user_name\":\"" + User.PlayerName + "\",\"username_pass_verify\":0},\"channelid\":131,\"email\":\"" + User.Username + "\",\"picture_url\":\"\",\"user_name\":\"" + User.PlayerName + "\"}],\"birthday\":\"1970-01\",\"email\":\"" + User.Username + "\",\"gender\":0,\"msg\":\"success\",\"picture_url\":\"\",\"ret\":0,\"seq\":\"" + Seq + "\",\"user_name\":\"" + User.PlayerName + "\"}"); } } } diff --git a/nksrv/IntlServer/IntlHandler.cs b/nksrv/IntlServer/IntlHandler.cs index ee29e00..a6a0363 100644 --- a/nksrv/IntlServer/IntlHandler.cs +++ b/nksrv/IntlServer/IntlHandler.cs @@ -1,12 +1,5 @@ using EmbedIO; using nksrv.Utils; -using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Numerics; -using System.Text; -using System.Threading.Tasks; namespace nksrv.IntlServer { diff --git a/nksrv/IntlServer/IntlLogin1Endpoint.cs b/nksrv/IntlServer/IntlLogin1Endpoint.cs index e3b637c..a6229c9 100644 --- a/nksrv/IntlServer/IntlLogin1Endpoint.cs +++ b/nksrv/IntlServer/IntlLogin1Endpoint.cs @@ -1,12 +1,7 @@ using EmbedIO; using Newtonsoft.Json; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; using System.Net; -using System.Text; -using System.Threading.Tasks; using static nksrv.IntlServer.IntlLogin2Endpoint; namespace nksrv.IntlServer diff --git a/nksrv/IntlServer/IntlMsgHandler.cs b/nksrv/IntlServer/IntlMsgHandler.cs index 79ba98a..b97b5c3 100644 --- a/nksrv/IntlServer/IntlMsgHandler.cs +++ b/nksrv/IntlServer/IntlMsgHandler.cs @@ -1,13 +1,8 @@ using EmbedIO; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using nksrv.Utils; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; namespace nksrv.IntlServer { @@ -28,7 +23,7 @@ namespace nksrv.IntlServer { var x = JsonConvert.DeserializeObject(Content); string tokToCheck = ""; - if(x != null && x.channel_info != null && !string.IsNullOrEmpty(x.channel_info.account_token)) + if (x != null && x.channel_info != null && !string.IsNullOrEmpty(x.channel_info.account_token)) { tokToCheck = x.channel_info.account_token; } diff --git a/nksrv/IntlServer/IntlQueryAccountInfo.cs b/nksrv/IntlServer/IntlQueryAccountInfo.cs index db2a6d3..c4f5f48 100644 --- a/nksrv/IntlServer/IntlQueryAccountInfo.cs +++ b/nksrv/IntlServer/IntlQueryAccountInfo.cs @@ -1,13 +1,4 @@ -using EmbedIO; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Http.Headers; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.IntlServer +namespace nksrv.IntlServer { internal class IntlQueryAccountInfo : IntlMsgHandler { diff --git a/nksrv/IntlServer/IntlReturnJsonHandler.cs b/nksrv/IntlServer/IntlReturnJsonHandler.cs index b50bb62..fdc6bc6 100644 --- a/nksrv/IntlServer/IntlReturnJsonHandler.cs +++ b/nksrv/IntlServer/IntlReturnJsonHandler.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using EmbedIO; -using Swan; - -namespace nksrv.IntlServer +namespace nksrv.IntlServer { public class IntlReturnJsonHandler : IntlMsgHandler { diff --git a/nksrv/IntlServer/SendCodeEndpoint.cs b/nksrv/IntlServer/SendCodeEndpoint.cs index d4c1032..63125fd 100644 --- a/nksrv/IntlServer/SendCodeEndpoint.cs +++ b/nksrv/IntlServer/SendCodeEndpoint.cs @@ -1,14 +1,7 @@ using EmbedIO; using Newtonsoft.Json; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; using System.Net; -using System.Net.Http.Headers; -using System.Text; -using System.Threading.Tasks; -using static nksrv.IntlServer.IntlLogin1Endpoint; using static nksrv.IntlServer.IntlLogin2Endpoint; namespace nksrv.IntlServer diff --git a/nksrv/LobbyServer/LobbyHandler.cs b/nksrv/LobbyServer/LobbyHandler.cs index cbcdeb9..0168588 100644 --- a/nksrv/LobbyServer/LobbyHandler.cs +++ b/nksrv/LobbyServer/LobbyHandler.cs @@ -1,7 +1,6 @@ using ASodium; using EmbedIO; using Google.Protobuf; -using nksrv.Net; using nksrv.Utils; using Swan.Logging; @@ -115,7 +114,7 @@ namespace nksrv.LobbyServer LobbyJukebox = 2, InfraCoreExp = user.InfraCoreExp, InfraCoreLv = user.InfraCoreLvl, - + }; diff --git a/nksrv/LobbyServer/LobbyMsgHandler.cs b/nksrv/LobbyServer/LobbyMsgHandler.cs index d57929c..57766a0 100644 --- a/nksrv/LobbyServer/LobbyMsgHandler.cs +++ b/nksrv/LobbyServer/LobbyMsgHandler.cs @@ -1,11 +1,6 @@ using EmbedIO; using Google.Protobuf; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer { diff --git a/nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs b/nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs index 409906c..6d34126 100644 --- a/nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs +++ b/nksrv/LobbyServer/Msgs/Antibot/BattleReportData.cs @@ -1,10 +1,4 @@ -using nksrv.Net; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs.Antibot { diff --git a/nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs b/nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs index 5a3e384..9d39ad0 100644 --- a/nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs +++ b/nksrv/LobbyServer/Msgs/Antibot/RecieveAntibotData.cs @@ -1,5 +1,4 @@ -using nksrv.Net; -using nksrv.Utils; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs.Antibot { diff --git a/nksrv/LobbyServer/Msgs/Archive/GetArchives.cs b/nksrv/LobbyServer/Msgs/Archive/GetArchives.cs index 1eb71f3..9bd6bea 100644 --- a/nksrv/LobbyServer/Msgs/Archive/GetArchives.cs +++ b/nksrv/LobbyServer/Msgs/Archive/GetArchives.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Archive { diff --git a/nksrv/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs b/nksrv/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs index 0e421a6..97f53e2 100644 --- a/nksrv/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs +++ b/nksrv/LobbyServer/Msgs/Arena/GetArenaBanInfo.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Arena { diff --git a/nksrv/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs b/nksrv/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs index 23489ac..d5840f0 100644 --- a/nksrv/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs +++ b/nksrv/LobbyServer/Msgs/Arena/ShowSpecialArenaReward.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Arena { diff --git a/nksrv/LobbyServer/Msgs/Auth/AuthLogout.cs b/nksrv/LobbyServer/Msgs/Auth/AuthLogout.cs index 63fbb15..d40dfb7 100644 --- a/nksrv/LobbyServer/Msgs/Auth/AuthLogout.cs +++ b/nksrv/LobbyServer/Msgs/Auth/AuthLogout.cs @@ -1,11 +1,4 @@ -using Google.Protobuf.WellKnownTypes; -using Google.Protobuf; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs.Auth { diff --git a/nksrv/LobbyServer/Msgs/Auth/DoEnterServer.cs b/nksrv/LobbyServer/Msgs/Auth/DoEnterServer.cs index 737269f..67f1983 100644 --- a/nksrv/LobbyServer/Msgs/Auth/DoEnterServer.cs +++ b/nksrv/LobbyServer/Msgs/Auth/DoEnterServer.cs @@ -1,12 +1,7 @@ -using Google.Protobuf.WellKnownTypes; +using EmbedIO; using Google.Protobuf; +using Google.Protobuf.WellKnownTypes; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using EmbedIO; namespace nksrv.LobbyServer.Msgs.Auth { diff --git a/nksrv/LobbyServer/Msgs/Badge/DeleteBadge.cs b/nksrv/LobbyServer/Msgs/Badge/DeleteBadge.cs index 0c7f1c2..1295b55 100644 --- a/nksrv/LobbyServer/Msgs/Badge/DeleteBadge.cs +++ b/nksrv/LobbyServer/Msgs/Badge/DeleteBadge.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Badge { diff --git a/nksrv/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs b/nksrv/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs index 9d4d630..ba1ece7 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs +++ b/nksrv/LobbyServer/Msgs/Campaign/CampaignPackageGetAll.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Campaign { diff --git a/nksrv/LobbyServer/Msgs/Campaign/GetCampaignField.cs b/nksrv/LobbyServer/Msgs/Campaign/GetCampaignField.cs index 5c8661c..0f8d71d 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/GetCampaignField.cs +++ b/nksrv/LobbyServer/Msgs/Campaign/GetCampaignField.cs @@ -1,12 +1,6 @@ using nksrv.LobbyServer.Msgs.Stage; using nksrv.StaticInfo; using nksrv.Utils; -using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Campaign { @@ -17,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Campaign { var req = await ReadData(); var user = GetUser(); - + Console.WriteLine("Map ID: " + req.MapId); var response = new ResGetCampaignFieldData(); diff --git a/nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs b/nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs index 0e9d110..4b1b272 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs +++ b/nksrv/LobbyServer/Msgs/Campaign/ObtainItem.cs @@ -1,10 +1,5 @@ using nksrv.StaticInfo; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Campaign { @@ -25,7 +20,7 @@ namespace nksrv.LobbyServer.Msgs.Campaign // TODO response.Reward = new(); - + await WriteDataAsync(response); diff --git a/nksrv/LobbyServer/Msgs/Campaign/SaveField.cs b/nksrv/LobbyServer/Msgs/Campaign/SaveField.cs index 015f5ef..c3e6ccc 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/SaveField.cs +++ b/nksrv/LobbyServer/Msgs/Campaign/SaveField.cs @@ -20,7 +20,7 @@ namespace nksrv.LobbyServer.Msgs.Campaign } else { - user.MapJson[req.MapId] = req.Json; + user.MapJson[req.MapId] = req.Json; } await WriteDataAsync(response); diff --git a/nksrv/LobbyServer/Msgs/Campaign/SaveFieldObject.cs b/nksrv/LobbyServer/Msgs/Campaign/SaveFieldObject.cs index ef1399f..09d2f6b 100644 --- a/nksrv/LobbyServer/Msgs/Campaign/SaveFieldObject.cs +++ b/nksrv/LobbyServer/Msgs/Campaign/SaveFieldObject.cs @@ -1,10 +1,5 @@ using nksrv.StaticInfo; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Campaign { diff --git a/nksrv/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs b/nksrv/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs index edcb3af..650ad12 100644 --- a/nksrv/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs +++ b/nksrv/LobbyServer/Msgs/Character/GetCharacterAttractiveList.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Character { diff --git a/nksrv/LobbyServer/Msgs/Character/GetCharacterCostume.cs b/nksrv/LobbyServer/Msgs/Character/GetCharacterCostume.cs index 4083db3..2a1171f 100644 --- a/nksrv/LobbyServer/Msgs/Character/GetCharacterCostume.cs +++ b/nksrv/LobbyServer/Msgs/Character/GetCharacterCostume.cs @@ -1,10 +1,5 @@ using nksrv.StaticInfo; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Character { diff --git a/nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs b/nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs index b6675e0..897402f 100644 --- a/nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs +++ b/nksrv/LobbyServer/Msgs/Character/GetSynchrodevice.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Character { diff --git a/nksrv/LobbyServer/Msgs/Character/LevelUp.cs b/nksrv/LobbyServer/Msgs/Character/LevelUp.cs index d960ba4..2b5530a 100644 --- a/nksrv/LobbyServer/Msgs/Character/LevelUp.cs +++ b/nksrv/LobbyServer/Msgs/Character/LevelUp.cs @@ -1,11 +1,6 @@ using nksrv.StaticInfo; using nksrv.Utils; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Character { diff --git a/nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs b/nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs index ba782fc..660a968 100644 --- a/nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs +++ b/nksrv/LobbyServer/Msgs/Character/SetCharacterCostume.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Character { diff --git a/nksrv/LobbyServer/Msgs/Event/CompleteEventScenario.cs b/nksrv/LobbyServer/Msgs/Event/CompleteEventScenario.cs index 987113e..c1d8dfa 100644 --- a/nksrv/LobbyServer/Msgs/Event/CompleteEventScenario.cs +++ b/nksrv/LobbyServer/Msgs/Event/CompleteEventScenario.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Event { @@ -31,7 +26,7 @@ namespace nksrv.LobbyServer.Msgs.Event // TODO reward - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Event/EnterEventField.cs b/nksrv/LobbyServer/Msgs/Event/EnterEventField.cs index 9138d16..d7e423a 100644 --- a/nksrv/LobbyServer/Msgs/Event/EnterEventField.cs +++ b/nksrv/LobbyServer/Msgs/Event/EnterEventField.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Event { @@ -18,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Event // TOOD - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Event/GetClearedMission.cs b/nksrv/LobbyServer/Msgs/Event/GetClearedMission.cs index dbaff81..7c4a81d 100644 --- a/nksrv/LobbyServer/Msgs/Event/GetClearedMission.cs +++ b/nksrv/LobbyServer/Msgs/Event/GetClearedMission.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Event { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Event var response = new ResGetEventMissionClear(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Event/GetEventScenario.cs b/nksrv/LobbyServer/Msgs/Event/GetEventScenario.cs index f996028..3d89425 100644 --- a/nksrv/LobbyServer/Msgs/Event/GetEventScenario.cs +++ b/nksrv/LobbyServer/Msgs/Event/GetEventScenario.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Event { @@ -26,7 +21,7 @@ namespace nksrv.LobbyServer.Msgs.Event user.EventInfo.Add(req.EventID, new EventData()); } - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Event/GetJoinedEvent.cs b/nksrv/LobbyServer/Msgs/Event/GetJoinedEvent.cs index a3cc1b8..6435635 100644 --- a/nksrv/LobbyServer/Msgs/Event/GetJoinedEvent.cs +++ b/nksrv/LobbyServer/Msgs/Event/GetJoinedEvent.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Event { @@ -69,7 +64,7 @@ namespace nksrv.LobbyServer.Msgs.Event JoinAt = 0 }); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Event/ListEvents.cs b/nksrv/LobbyServer/Msgs/Event/ListEvents.cs index 5e861d1..fe56a50 100644 --- a/nksrv/LobbyServer/Msgs/Event/ListEvents.cs +++ b/nksrv/LobbyServer/Msgs/Event/ListEvents.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Event { @@ -102,7 +97,7 @@ namespace nksrv.LobbyServer.Msgs.Event EventEndDate = DateTime.Now.AddDays(20).Ticks, EventDisableDate = DateTime.Now.AddDays(20).Ticks, }); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs b/nksrv/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs index 72d2326..ed7a653 100644 --- a/nksrv/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs +++ b/nksrv/LobbyServer/Msgs/FavoriteItem/GetFavoriteItemLibrary.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.FavoriteItem { diff --git a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs b/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs index b9a5274..02d7b2f 100644 --- a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs +++ b/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItem.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.FavoriteItem { diff --git a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs b/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs index 3aa493c..64ac7ef 100644 --- a/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs +++ b/nksrv/LobbyServer/Msgs/FavoriteItem/ListFavoriteItemQuests.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.FavoriteItem { diff --git a/nksrv/LobbyServer/Msgs/Friend/GetFriends.cs b/nksrv/LobbyServer/Msgs/Friend/GetFriends.cs index c4e7c7b..f877dca 100644 --- a/nksrv/LobbyServer/Msgs/Friend/GetFriends.cs +++ b/nksrv/LobbyServer/Msgs/Friend/GetFriends.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Friend { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Friend var response = new ResGetFriendData(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs b/nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs index 3e2916a..8799b55 100644 --- a/nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs +++ b/nksrv/LobbyServer/Msgs/Gacha/CheckGachaDailyEvent.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Gacha { diff --git a/nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs b/nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs index 391b830..269c42d 100644 --- a/nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs +++ b/nksrv/LobbyServer/Msgs/Gacha/ExecGacha.cs @@ -1,10 +1,5 @@ using nksrv.StaticInfo; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Gacha { diff --git a/nksrv/LobbyServer/Msgs/GetCurrentTime.cs b/nksrv/LobbyServer/Msgs/GetCurrentTime.cs index 512c3b7..6fbcdaa 100644 --- a/nksrv/LobbyServer/Msgs/GetCurrentTime.cs +++ b/nksrv/LobbyServer/Msgs/GetCurrentTime.cs @@ -16,7 +16,7 @@ namespace nksrv.LobbyServer.Msgs response.CheatShiftDuration = Duration.FromTimeSpan(TimeSpan.FromSeconds(0)); // todo: validate response with actual server - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/GetGacha.cs b/nksrv/LobbyServer/Msgs/GetGacha.cs index 2cb773f..5129b4f 100644 --- a/nksrv/LobbyServer/Msgs/GetGacha.cs +++ b/nksrv/LobbyServer/Msgs/GetGacha.cs @@ -1,10 +1,4 @@ -using Google.Protobuf.WellKnownTypes; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs { @@ -19,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs var response = new ResGetGachaData(); if (user.GachaTutorialPlayCount > 0) response.Gacha.Add(new NetUserGachaData() { GachaType = 3, PlayCount = 1 }); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs b/nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs index 1a5a2e7..99061c3 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs +++ b/nksrv/LobbyServer/Msgs/Inventory/ClearAllEquipment.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Inventory { diff --git a/nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs b/nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs index 390ee58..554d768 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs +++ b/nksrv/LobbyServer/Msgs/Inventory/ClearEquipment.cs @@ -1,10 +1,4 @@ -using nksrv.LobbyServer.Msgs.User; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs.Inventory { diff --git a/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs b/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs index 9f85f39..660c19b 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs +++ b/nksrv/LobbyServer/Msgs/Inventory/GetInventoryData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Inventory { diff --git a/nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs b/nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs index c997632..bc0b367 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs +++ b/nksrv/LobbyServer/Msgs/Inventory/WearEquipment.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Inventory { @@ -38,7 +33,7 @@ namespace nksrv.LobbyServer.Msgs.Inventory } } JsonDb.Save(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs b/nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs index 30753a2..ddb4135 100644 --- a/nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs +++ b/nksrv/LobbyServer/Msgs/Inventory/WearEquipmentList.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Inventory { diff --git a/nksrv/LobbyServer/Msgs/Liberate/GetLiberateData.cs b/nksrv/LobbyServer/Msgs/Liberate/GetLiberateData.cs index 094bd61..b1bced8 100644 --- a/nksrv/LobbyServer/Msgs/Liberate/GetLiberateData.cs +++ b/nksrv/LobbyServer/Msgs/Liberate/GetLiberateData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Liberate { diff --git a/nksrv/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs b/nksrv/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs index bf97655..ec062b9 100644 --- a/nksrv/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs +++ b/nksrv/LobbyServer/Msgs/Lostsector/GetLostSectorData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Lostsector { diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetDailyMessage.cs b/nksrv/LobbyServer/Msgs/Messenger/GetDailyMessage.cs index 40f0776..e7cad7e 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetDailyMessage.cs +++ b/nksrv/LobbyServer/Msgs/Messenger/GetDailyMessage.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Messenger { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Messenger // TODO: save these things var response = new ResPickTodayDailyMessage(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs b/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs index 0e1e573..a2efb43 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs +++ b/nksrv/LobbyServer/Msgs/Messenger/GetMessages.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Messenger { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Messenger // TODO: save these things var response = new ResGetMessages(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetPickedMessage.cs b/nksrv/LobbyServer/Msgs/Messenger/GetPickedMessage.cs index d1caef4..3442936 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetPickedMessage.cs +++ b/nksrv/LobbyServer/Msgs/Messenger/GetPickedMessage.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Messenger { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Messenger // TODO: get proper response var response = new ResGetPickedMessageList(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Messenger/GetRandomPick.cs b/nksrv/LobbyServer/Msgs/Messenger/GetRandomPick.cs index 644120a..ec63563 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/GetRandomPick.cs +++ b/nksrv/LobbyServer/Msgs/Messenger/GetRandomPick.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Messenger { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Messenger // TODO: get proper response var response = new ResForcePickTodayRandomMessage(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Messenger/ProceedMsg.cs b/nksrv/LobbyServer/Msgs/Messenger/ProceedMsg.cs index f341c67..3578c4e 100644 --- a/nksrv/LobbyServer/Msgs/Messenger/ProceedMsg.cs +++ b/nksrv/LobbyServer/Msgs/Messenger/ProceedMsg.cs @@ -12,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Messenger // TODO: save these things var response = new ResProceedMessage(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs b/nksrv/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs index 1e61cdf..5dd47da 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs +++ b/nksrv/LobbyServer/Msgs/Minigame/Dave/GetAllDaveTrigger.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Minigame.Dave { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Minigame.Dave var response = new ResGetAllMiniGameDaveTriggers(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs b/nksrv/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs index e4fd8db..425e3b6 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs +++ b/nksrv/LobbyServer/Msgs/Minigame/GetNksv2Minigame.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Minigame { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Minigame var response = new ResGetMiniGameNKSV2Data(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs b/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs index 363cf56..d2b65a2 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs +++ b/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetFishingStepUpRewardStatus.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure var response = new ResGetIslandAdventureFishingStepUpRewardStatus(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs b/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs index 131877d..a74b1f6 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs +++ b/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/GetPhotoStepUpRewardStatus.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure var response = new ResGetIslandAdventurePhotoStepUpRewardStatus(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs b/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs index 7c45fdc..6cc9f15 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs +++ b/nksrv/LobbyServer/Msgs/Minigame/IslandAdventure/ListMission.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Minigame.IslandAdventure var response = new ResGetIslandAdventureMissionProgress(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs b/nksrv/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs index bde507f..790240e 100644 --- a/nksrv/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs +++ b/nksrv/LobbyServer/Msgs/Minigame/PlaySoda/GetChallengeInfo.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Minigame.PlaySoda { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Minigame.PlaySoda var response = new ResGetPlaySodaChallengeModeInfo(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Misc/EnterLobbyPing.cs b/nksrv/LobbyServer/Msgs/Misc/EnterLobbyPing.cs index 4d45806..397d04f 100644 --- a/nksrv/LobbyServer/Msgs/Misc/EnterLobbyPing.cs +++ b/nksrv/LobbyServer/Msgs/Misc/EnterLobbyPing.cs @@ -11,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Misc var response = new ResEnterLobbyPing(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs b/nksrv/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs index e3f7ded..19d7ce6 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs +++ b/nksrv/LobbyServer/Msgs/Misc/GachaGetAllShutdownFlags.cs @@ -14,8 +14,8 @@ namespace nksrv.LobbyServer.Msgs.Misc if (user.GachaTutorialPlayCount > 0) response.Unavailables.Add(3); - // TODO: Validate response from real server and pull info from user info - await WriteDataAsync(response); + // TODO: Validate response from real server and pull info from user info + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Misc/GetFeatureFlags.cs b/nksrv/LobbyServer/Msgs/Misc/GetFeatureFlags.cs index 571d2a8..ae63cd6 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetFeatureFlags.cs +++ b/nksrv/LobbyServer/Msgs/Misc/GetFeatureFlags.cs @@ -1,11 +1,4 @@ -using Google.Protobuf; -using nksrv.StaticInfo; -using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs.Misc { @@ -19,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Misc var r = new ResGetFeatureFlag(); r.IsOpen = true; - await WriteDataAsync(r); + await WriteDataAsync(r); } } } diff --git a/nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs b/nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs index ead32a4..9c73e46 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs +++ b/nksrv/LobbyServer/Msgs/Misc/GetMaintenanceNotice.cs @@ -1,11 +1,5 @@ -using Google.Protobuf; -using nksrv.Net; +using nksrv.Net; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Misc { diff --git a/nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs b/nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs index dcc267f..69571d7 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs +++ b/nksrv/LobbyServer/Msgs/Misc/GetResourceHosts2.cs @@ -1,10 +1,5 @@ using nksrv.Net; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Misc { diff --git a/nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs b/nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs index 805a31d..b96d632 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs +++ b/nksrv/LobbyServer/Msgs/Misc/GetSentryParams.cs @@ -1,10 +1,5 @@ using nksrv.Net; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Misc { diff --git a/nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs b/nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs index 25e805b..a4a3d5b 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs +++ b/nksrv/LobbyServer/Msgs/Misc/GetServerInfo.cs @@ -1,5 +1,5 @@ -using nksrv.Utils; -using nksrv.Net; +using nksrv.Net; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs.Misc { @@ -14,7 +14,7 @@ namespace nksrv.LobbyServer.Msgs.Misc r.MatchUrl = "https://global-match.nikke-kr.com"; r.WorldId = 84; - await WriteDataAsync(r); + await WriteDataAsync(r); } } } diff --git a/nksrv/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs b/nksrv/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs index 1df290f..cc691ca 100644 --- a/nksrv/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs +++ b/nksrv/LobbyServer/Msgs/Misc/GetUserOnlineStateLog.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Misc { diff --git a/nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs b/nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs index 732a5eb..8033d36 100644 --- a/nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs +++ b/nksrv/LobbyServer/Msgs/Mission/GetAchievementRewardedData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Mission { diff --git a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs b/nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs index 99e8dd3..9c42557 100644 --- a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs +++ b/nksrv/LobbyServer/Msgs/Mission/Rewards/GetDailyRewards.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Mission.Rewards { diff --git a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs b/nksrv/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs index 5d8cd36..900e2cf 100644 --- a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs +++ b/nksrv/LobbyServer/Msgs/Mission/Rewards/GetJukeboxRewards.cs @@ -12,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost // TODO: save these things var response = new ResGetJukeboxRewardedData(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs b/nksrv/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs index 42fa036..147ce56 100644 --- a/nksrv/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs +++ b/nksrv/LobbyServer/Msgs/Mission/Rewards/GetWeeklyRewards.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Mission.Rewards { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Mission.Rewards // TODO: implement var response = new ResGetWeeklyRewardedData(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs b/nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs index ed802e5..8e13c13 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/CheckInfracore.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Outpost { diff --git a/nksrv/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs b/nksrv/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs index a245c2e..244a1b3 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/ClearTacticAcademyLesson.cs @@ -2,11 +2,6 @@ using nksrv.StaticInfo; using nksrv.Utils; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Outpost { diff --git a/nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs b/nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs index 2d7fe88..0911553 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/DoWipeout.cs @@ -1,10 +1,5 @@ using nksrv.Net; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Outpost { diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetDispatchList.cs b/nksrv/LobbyServer/Msgs/Outpost/GetDispatchList.cs index 91006d1..e738160 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetDispatchList.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/GetDispatchList.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Outpost { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost var response = new ResGetDispatchList(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetOutpostData.cs b/nksrv/LobbyServer/Msgs/Outpost/GetOutpostData.cs index b541c27..0edf8b6 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetOutpostData.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/GetOutpostData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Outpost { @@ -23,7 +18,10 @@ namespace nksrv.LobbyServer.Msgs.Outpost { OutpostBattleLevel = new NetOutpostBattleLevel() { Level = 1 }, CommanderBgm = new NetUserJukeboxDataV2() { CommandBgm = new() { Type = NetJukeboxBgmType.JukeboxTableId, JukeboxTableId = 5 } }, - BattleTime = 864000000000, Jukebox = new(), MaxBattleTime = 864000000000, SkinGroupId = 1000 + BattleTime = 864000000000, + Jukebox = new(), + MaxBattleTime = 864000000000, + SkinGroupId = 1000 }; response.OutpostBattleLevel = user.OutpostBattleLevel; @@ -41,7 +39,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost response.Data.Add(new NetUserOutpostData() { SlotId = 38, BuildingId = 33601, IsDone = true, StartAt = 638549982076760660, CompleteAt = 638549982076760660 }); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs b/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs index 79b7918..ba88c9c 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/GetRecycleRoomData.cs @@ -12,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost // TODO: save these things var response = new ResGetRecycleRoomData(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs b/nksrv/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs index 610b454..eaa9b1a 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/GetTacticAcademyData.cs @@ -1,10 +1,5 @@ using nksrv.Net; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Outpost { @@ -18,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost var response = new GetTacticAcademyDataResponse(); response.CompletedLessons.AddRange(user.CompletedTacticAcademyLessons); - + await WriteDataAsync(response); } } diff --git a/nksrv/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs b/nksrv/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs index 480b38b..32119a4 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/MemorialGetMemoryList.cs @@ -11,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost var response = new ResGetMemoryList(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Outpost/ShowBattleReward.cs b/nksrv/LobbyServer/Msgs/Outpost/ShowBattleReward.cs index cae0d6d..34298d7 100644 --- a/nksrv/LobbyServer/Msgs/Outpost/ShowBattleReward.cs +++ b/nksrv/LobbyServer/Msgs/Outpost/ShowBattleReward.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Outpost { @@ -21,7 +16,7 @@ namespace nksrv.LobbyServer.Msgs.Outpost var response = new ResShowOutpostBattleReward(); response.OutpostBattleLevel = user.OutpostBattleLevel; response.OutpostBattleTime = new NetOutpostBattleTime() { MaxBattleTime = 864000000000, MaxOverBattleTime = 12096000000000, BattleTime = battleTimeMs }; - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs b/nksrv/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs index 5e61c32..0dfbbe4 100644 --- a/nksrv/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs +++ b/nksrv/LobbyServer/Msgs/PartyMatch/ListPartyMatchInvitations.cs @@ -12,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.PartyMatch var response = new ResListInvitation(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs b/nksrv/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs index 02322e6..9d9b5da 100644 --- a/nksrv/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs +++ b/nksrv/LobbyServer/Msgs/Pass/GetActiveEventPassData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Pass { @@ -18,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Pass // TODO: Support events - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Pass/GetActivePassData.cs b/nksrv/LobbyServer/Msgs/Pass/GetActivePassData.cs index e2ba377..fd61e89 100644 --- a/nksrv/LobbyServer/Msgs/Pass/GetActivePassData.cs +++ b/nksrv/LobbyServer/Msgs/Pass/GetActivePassData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Pass { @@ -18,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Pass // TODO: Support events - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Ranking/UpdateServerReward.cs b/nksrv/LobbyServer/Msgs/Ranking/UpdateServerReward.cs index 92b1535..d54d816 100644 --- a/nksrv/LobbyServer/Msgs/Ranking/UpdateServerReward.cs +++ b/nksrv/LobbyServer/Msgs/Ranking/UpdateServerReward.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Ranking { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Ranking var response = new ResUpdateRankingServerReward(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/GetProductList.cs b/nksrv/LobbyServer/Msgs/Shop/GetProductList.cs index 5be957e..4c739e7 100644 --- a/nksrv/LobbyServer/Msgs/Shop/GetProductList.cs +++ b/nksrv/LobbyServer/Msgs/Shop/GetProductList.cs @@ -1,10 +1,5 @@ using nksrv.Utils; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop { @@ -22,9 +17,9 @@ namespace nksrv.LobbyServer.Msgs.Shop { response.ProductInfoList.Add(new NetJupiterProductInfo() { CurrencyCode = "US", CurrencySymbol = "$", MicroPrice = 0, Price = "1", ProductId = item }); } - await WriteDataAsync(response); + await WriteDataAsync(response); } - catch(Exception ex) + catch (Exception ex) { Logger.Error("Error while handling GetProductList request. Have you replaced sodium library?" + ex); } diff --git a/nksrv/LobbyServer/Msgs/Shop/GetShopProductList.cs b/nksrv/LobbyServer/Msgs/Shop/GetShopProductList.cs index f6aaf24..24e8d55 100644 --- a/nksrv/LobbyServer/Msgs/Shop/GetShopProductList.cs +++ b/nksrv/LobbyServer/Msgs/Shop/GetShopProductList.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop { @@ -14,8 +9,8 @@ namespace nksrv.LobbyServer.Msgs.Shop { var req = await ReadData(); var response = new ResShopProductList(); - - await WriteDataAsync(response); + + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs b/nksrv/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs index ea6179a..2bd1a4e 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs +++ b/nksrv/LobbyServer/Msgs/Shop/InApp/GetInAppSubscription.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop.InApp { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.InApp var response = new ResGetSubscription(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs b/nksrv/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs index b37616a..ff65288 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs +++ b/nksrv/LobbyServer/Msgs/Shop/InApp/GetMarketingDetail.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop.InApp { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.InApp var response = new ResGetJupiterMarketingDetail(); response.MarketingDetail = "{}"; - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs b/nksrv/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs index 15bf0c3..83a53a4 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs +++ b/nksrv/LobbyServer/Msgs/Shop/InApp/GetMonthlySubscriptionReward.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop.InApp { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.InApp var response = new ResGetMonthlySubscriptionReward(); // TODO: Validate response from real server - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs b/nksrv/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs index 80c0735..442cf75 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs +++ b/nksrv/LobbyServer/Msgs/Shop/InApp/GetProductListInApp.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop.InApp { @@ -18,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.InApp // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs b/nksrv/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs index 3e02f76..ce2bc72 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs +++ b/nksrv/LobbyServer/Msgs/Shop/InApp/GetRetrivableProductList.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop.InApp { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.InApp var response = new ResGetInAppShopReceivableProductList(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs b/nksrv/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs index e0144a6..07bc051 100644 --- a/nksrv/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs +++ b/nksrv/LobbyServer/Msgs/Shop/InApp/GetSetupDataForCustomPackage.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop.InApp { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.InApp var response = new ResGetCustomPackageSetupData(); // TODO: Validate response from real server and pull info from user info - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs b/nksrv/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs index 2514b57..bab1b2d 100644 --- a/nksrv/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs +++ b/nksrv/LobbyServer/Msgs/Shop/PackageShop/GetPackagePopupState.cs @@ -10,7 +10,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.PackageShop var req = await ReadData(); var response = new ResGetPopupPackageState(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs b/nksrv/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs index 1b721fa..13e034e 100644 --- a/nksrv/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs +++ b/nksrv/LobbyServer/Msgs/Shop/PackageShop/PackageShopGetCampaignPackage.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Shop.PackageShop { @@ -17,7 +12,7 @@ namespace nksrv.LobbyServer.Msgs.Shop.PackageShop var response = new ResGetCampaignPackage(); // TODO: Validate response from real server and pull info from user info - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Sidestory/ListSideStory.cs b/nksrv/LobbyServer/Msgs/Sidestory/ListSideStory.cs index d0c4b38..2476054 100644 --- a/nksrv/LobbyServer/Msgs/Sidestory/ListSideStory.cs +++ b/nksrv/LobbyServer/Msgs/Sidestory/ListSideStory.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Sidestory { diff --git a/nksrv/LobbyServer/Msgs/Simroom/GetSimRoomData.cs b/nksrv/LobbyServer/Msgs/Simroom/GetSimRoomData.cs index 870875a..fe5c517 100644 --- a/nksrv/LobbyServer/Msgs/Simroom/GetSimRoomData.cs +++ b/nksrv/LobbyServer/Msgs/Simroom/GetSimRoomData.cs @@ -1,10 +1,5 @@ using Google.Protobuf.WellKnownTypes; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Simroom { @@ -15,19 +10,23 @@ namespace nksrv.LobbyServer.Msgs.Simroom { var req = await ReadData(); - var response = new ResGetSimRoom() { - OverclockData = new() { - CurrentSeasonData = new() { - SeasonStartDate = Timestamp.FromDateTimeOffset(DateTime.UtcNow), + var response = new ResGetSimRoom() + { + OverclockData = new() + { + CurrentSeasonData = new() + { + SeasonStartDate = Timestamp.FromDateTimeOffset(DateTime.UtcNow), SeasonEndDate = Timestamp.FromDateTimeOffset(DateTime.UtcNow.AddDays(7)) }, - CurrentSeasonHighScore = new(), - CurrentSubSeasonHighScore = new(), - LatestOption = new() + CurrentSeasonHighScore = new(), + CurrentSubSeasonHighScore = new(), + LatestOption = new() }, - NextLegacyBuffResetDate = Timestamp.FromDateTimeOffset(DateTime.UtcNow.AddDays(7)) }; + NextLegacyBuffResetDate = Timestamp.FromDateTimeOffset(DateTime.UtcNow.AddDays(7)) + }; // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs b/nksrv/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs index 1ef1894..e237cc0 100644 --- a/nksrv/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs +++ b/nksrv/LobbyServer/Msgs/Soloraid/GetSoloraidPeriod.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Soloraid { @@ -17,10 +12,10 @@ namespace nksrv.LobbyServer.Msgs.Soloraid var response = new ResGetSoloRaidPeriod(); response.Period = new NetSoloRaidPeriodData { - + }; // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Stage/CheckCleared.cs b/nksrv/LobbyServer/Msgs/Stage/CheckCleared.cs index a9a7ec8..d79b008 100644 --- a/nksrv/LobbyServer/Msgs/Stage/CheckCleared.cs +++ b/nksrv/LobbyServer/Msgs/Stage/CheckCleared.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Stage { @@ -30,7 +25,7 @@ namespace nksrv.LobbyServer.Msgs.Stage - await WriteDataAsync(response); + await WriteDataAsync(response); } } diff --git a/nksrv/LobbyServer/Msgs/Stage/EnterStage.cs b/nksrv/LobbyServer/Msgs/Stage/EnterStage.cs index d5881fb..cf1aa06 100644 --- a/nksrv/LobbyServer/Msgs/Stage/EnterStage.cs +++ b/nksrv/LobbyServer/Msgs/Stage/EnterStage.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Stage { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.Stage var response = new ResEnterStage(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Stage/GetStage.cs b/nksrv/LobbyServer/Msgs/Stage/GetStage.cs index c7f3d64..b4755f7 100644 --- a/nksrv/LobbyServer/Msgs/Stage/GetStage.cs +++ b/nksrv/LobbyServer/Msgs/Stage/GetStage.cs @@ -1,5 +1,4 @@ -using nksrv.Net; -using nksrv.Utils; +using nksrv.Utils; namespace nksrv.LobbyServer.Msgs.Stage { @@ -12,14 +11,14 @@ namespace nksrv.LobbyServer.Msgs.Stage var user = GetUser(); var response = new ResGetStageData(); - + response.Field = CreateFieldInfo(user, req.Chapter - 1, req.Mod == 0 ? "Normal" : "Hard"); response.HasChapterBossEntered = true; response.SquadData = ""; - await WriteDataAsync(response); + await WriteDataAsync(response); } public static NetFieldObjectData CreateFieldInfo(Utils.User user, int chapter, string mod) diff --git a/nksrv/LobbyServer/Msgs/Subquest/ListSubquests.cs b/nksrv/LobbyServer/Msgs/Subquest/ListSubquests.cs index 0cdc1e1..d6ec344 100644 --- a/nksrv/LobbyServer/Msgs/Subquest/ListSubquests.cs +++ b/nksrv/LobbyServer/Msgs/Subquest/ListSubquests.cs @@ -13,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.Subquest // TOOD - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Team/GetTeamData.cs b/nksrv/LobbyServer/Msgs/Team/GetTeamData.cs index b981fc4..03c7b37 100644 --- a/nksrv/LobbyServer/Msgs/Team/GetTeamData.cs +++ b/nksrv/LobbyServer/Msgs/Team/GetTeamData.cs @@ -1,10 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static Google.Rpc.Context.AttributeContext.Types; namespace nksrv.LobbyServer.Msgs.Team { diff --git a/nksrv/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs b/nksrv/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs index 5b7cd69..e3b25b2 100644 --- a/nksrv/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs +++ b/nksrv/LobbyServer/Msgs/Team/ListSupportCharacterCount.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Team { @@ -15,11 +10,13 @@ namespace nksrv.LobbyServer.Msgs.Team var req = await ReadData(); var response = new ResListSupportCharacterUsedCount(); + + // TODO: Limit temportary participation foreach (var item in req.TeamTypeList) { Console.WriteLine("support character used: " + item); } - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Team/SetTeam.cs b/nksrv/LobbyServer/Msgs/Team/SetTeam.cs index 5007387..2bff5ea 100644 --- a/nksrv/LobbyServer/Msgs/Team/SetTeam.cs +++ b/nksrv/LobbyServer/Msgs/Team/SetTeam.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Team { @@ -34,7 +29,7 @@ namespace nksrv.LobbyServer.Msgs.Team } JsonDb.Save(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Tower/GetTowerData.cs b/nksrv/LobbyServer/Msgs/Tower/GetTowerData.cs index 426c3bb..ef1abbb 100644 --- a/nksrv/LobbyServer/Msgs/Tower/GetTowerData.cs +++ b/nksrv/LobbyServer/Msgs/Tower/GetTowerData.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Tower { @@ -36,7 +31,7 @@ namespace nksrv.LobbyServer.Msgs.Tower response.Data.Add(t3); response.Data.Add(t4); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs b/nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs index 07bd3fe..3f48e66 100644 --- a/nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs +++ b/nksrv/LobbyServer/Msgs/Trigger/FinishMainQuest.cs @@ -1,10 +1,5 @@ using nksrv.StaticInfo; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Trigger { @@ -23,7 +18,7 @@ namespace nksrv.LobbyServer.Msgs.Trigger JsonDb.Save(); var response = new ResFinMainQuest(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Trigger/GetMainQuestData.cs b/nksrv/LobbyServer/Msgs/Trigger/GetMainQuestData.cs index a132de4..f2910bf 100644 --- a/nksrv/LobbyServer/Msgs/Trigger/GetMainQuestData.cs +++ b/nksrv/LobbyServer/Msgs/Trigger/GetMainQuestData.cs @@ -15,8 +15,8 @@ namespace nksrv.LobbyServer.Msgs.Trigger { response.MainQuestList.Add(new NetMainQuestData() { IsReceived = item.Value, Tid = item.Key }); } - - await WriteDataAsync(response); + + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/Trigger/TriggerSync.cs b/nksrv/LobbyServer/Msgs/Trigger/TriggerSync.cs index 570c59c..5f31224 100644 --- a/nksrv/LobbyServer/Msgs/Trigger/TriggerSync.cs +++ b/nksrv/LobbyServer/Msgs/Trigger/TriggerSync.cs @@ -10,7 +10,7 @@ namespace nksrv.LobbyServer.Msgs.Trigger var req = ReadData(); var response = new ResSyncTrigger(); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs b/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs index 4d7ef7f..0068262 100644 --- a/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs +++ b/nksrv/LobbyServer/Msgs/User/EnterLobbyServer.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/GetAllFeatureFlags.cs b/nksrv/LobbyServer/Msgs/User/GetAllFeatureFlags.cs index 57900ce..79d6f26 100644 --- a/nksrv/LobbyServer/Msgs/User/GetAllFeatureFlags.cs +++ b/nksrv/LobbyServer/Msgs/User/GetAllFeatureFlags.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { @@ -51,7 +46,7 @@ namespace nksrv.LobbyServer.Msgs.User new NetFeatureFlag() { FeatureKind = NetFeatureKind.Ce002MiniGame, IsOpen = true }, new NetFeatureFlag() { FeatureKind = NetFeatureKind.SoloRaid, IsOpen = true }, ]); - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/User/GetFieldTalkList.cs b/nksrv/LobbyServer/Msgs/User/GetFieldTalkList.cs index d1c6e41..34e45cb 100644 --- a/nksrv/LobbyServer/Msgs/User/GetFieldTalkList.cs +++ b/nksrv/LobbyServer/Msgs/User/GetFieldTalkList.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { @@ -18,7 +13,7 @@ namespace nksrv.LobbyServer.Msgs.User var response = new ResGetFieldTalkList(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/User/GetMail.cs b/nksrv/LobbyServer/Msgs/User/GetMail.cs index 3efcde3..f6de663 100644 --- a/nksrv/LobbyServer/Msgs/User/GetMail.cs +++ b/nksrv/LobbyServer/Msgs/User/GetMail.cs @@ -1,10 +1,5 @@ using nksrv.Utils; using Swan; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { @@ -20,17 +15,17 @@ namespace nksrv.LobbyServer.Msgs.User { Msn = 3, - Nickname ="nick", + Nickname = "nick", Title = new() { IsPlain = true, String = "Our Server Fell" }, - Text = new() { IsPlain = true, String = "Our Game Was Down For 1 Second because the HP Laptop Which Hosted the Server Got Shut Down by the Lid Closing. As for the Reward for the Inconvience, free paid gems"}, - HasReward =true, + Text = new() { IsPlain = true, String = "Our Game Was Down For 1 Second because the HP Laptop Which Hosted the Server Got Shut Down by the Lid Closing. As for the Reward for the Inconvience, free paid gems" }, + HasReward = true, Sender = 102 }); r.Mail[0].Items.Add(new NetMailRewardItem() { ExpiredAt = DateTime.UtcNow.AddYears(10).ToUnixEpochDate(), RewardID = 1, RewardType = (int)CurrencyType.ChargeCash, RewardValue = 100000 }); - await WriteDataAsync(r); + await WriteDataAsync(r); } } } diff --git a/nksrv/LobbyServer/Msgs/User/GetProfileCardPossession.cs b/nksrv/LobbyServer/Msgs/User/GetProfileCardPossession.cs index d71884d..0f2a56a 100644 --- a/nksrv/LobbyServer/Msgs/User/GetProfileCardPossession.cs +++ b/nksrv/LobbyServer/Msgs/User/GetProfileCardPossession.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { @@ -16,7 +11,7 @@ namespace nksrv.LobbyServer.Msgs.User var response = new ResProfileCardObjectList(); // TODO - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs b/nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs index 49ff325..a57db0b 100644 --- a/nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs +++ b/nksrv/LobbyServer/Msgs/User/GetProfileDecoration.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/GetProfileFrame.cs b/nksrv/LobbyServer/Msgs/User/GetProfileFrame.cs index 11048db..1533c8d 100644 --- a/nksrv/LobbyServer/Msgs/User/GetProfileFrame.cs +++ b/nksrv/LobbyServer/Msgs/User/GetProfileFrame.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { @@ -15,8 +10,8 @@ namespace nksrv.LobbyServer.Msgs.User var req = await ReadData(); var response = new ResGetProfileFrame(); - - await WriteDataAsync(response); + + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/User/GetScenarioList.cs b/nksrv/LobbyServer/Msgs/User/GetScenarioList.cs index c61d037..52ede9e 100644 --- a/nksrv/LobbyServer/Msgs/User/GetScenarioList.cs +++ b/nksrv/LobbyServer/Msgs/User/GetScenarioList.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { @@ -24,7 +19,7 @@ namespace nksrv.LobbyServer.Msgs.User response.ScenarioList.Add(item); } - await WriteDataAsync(response); + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/User/GetUser.cs b/nksrv/LobbyServer/Msgs/User/GetUser.cs index f0b7d21..4a986b1 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUser.cs +++ b/nksrv/LobbyServer/Msgs/User/GetUser.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { @@ -32,7 +27,7 @@ namespace nksrv.LobbyServer.Msgs.User response.RepresentationTeam = user.RepresentationTeamData; response.LastClearedNormalMainStageId = user.LastNormalStageCleared; - + // Restore completed tutorials. GroupID is the first 4 digits of the Table ID. foreach (var item in user.ClearedTutorialData) { @@ -44,8 +39,8 @@ namespace nksrv.LobbyServer.Msgs.User response.CommanderRoomJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 2, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.CommanderRoom }; response.LobbyJukeboxBgm = new NetJukeboxBgm() { JukeboxTableId = 2, Type = NetJukeboxBgmType.JukeboxTableId, Location = NetJukeboxLocation.Lobby }; - - await WriteDataAsync(response); + + await WriteDataAsync(response); } } } diff --git a/nksrv/LobbyServer/Msgs/User/GetUserProfile.cs b/nksrv/LobbyServer/Msgs/User/GetUserProfile.cs index e87283b..1f5a757 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserProfile.cs +++ b/nksrv/LobbyServer/Msgs/User/GetUserProfile.cs @@ -1,10 +1,5 @@ using nksrv.Utils; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/GetUserScenarioExist.cs b/nksrv/LobbyServer/Msgs/User/GetUserScenarioExist.cs index 860b79b..b47c276 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserScenarioExist.cs +++ b/nksrv/LobbyServer/Msgs/User/GetUserScenarioExist.cs @@ -1,10 +1,5 @@ using nksrv.Utils; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/GetUserTitle.cs b/nksrv/LobbyServer/Msgs/User/GetUserTitle.cs index 5d92c20..1963f6f 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserTitle.cs +++ b/nksrv/LobbyServer/Msgs/User/GetUserTitle.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/GetUserTitleCounter.cs b/nksrv/LobbyServer/Msgs/User/GetUserTitleCounter.cs index 8f59611..f5157a2 100644 --- a/nksrv/LobbyServer/Msgs/User/GetUserTitleCounter.cs +++ b/nksrv/LobbyServer/Msgs/User/GetUserTitleCounter.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/GetWallpaper.cs b/nksrv/LobbyServer/Msgs/User/GetWallpaper.cs index 10a6e02..94e9d04 100644 --- a/nksrv/LobbyServer/Msgs/User/GetWallpaper.cs +++ b/nksrv/LobbyServer/Msgs/User/GetWallpaper.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/GetWallpaperInventory.cs b/nksrv/LobbyServer/Msgs/User/GetWallpaperInventory.cs index 6a8f76a..410ce42 100644 --- a/nksrv/LobbyServer/Msgs/User/GetWallpaperInventory.cs +++ b/nksrv/LobbyServer/Msgs/User/GetWallpaperInventory.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/ReadMail.cs b/nksrv/LobbyServer/Msgs/User/ReadMail.cs index 8a1284b..e88412e 100644 --- a/nksrv/LobbyServer/Msgs/User/ReadMail.cs +++ b/nksrv/LobbyServer/Msgs/User/ReadMail.cs @@ -1,10 +1,4 @@ using nksrv.Utils; -using Swan; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/SetNickname.cs b/nksrv/LobbyServer/Msgs/User/SetNickname.cs index ff6c0cb..ab1138d 100644 --- a/nksrv/LobbyServer/Msgs/User/SetNickname.cs +++ b/nksrv/LobbyServer/Msgs/User/SetNickname.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/SetProfileIcon.cs b/nksrv/LobbyServer/Msgs/User/SetProfileIcon.cs index 70e47fc..c03623e 100644 --- a/nksrv/LobbyServer/Msgs/User/SetProfileIcon.cs +++ b/nksrv/LobbyServer/Msgs/User/SetProfileIcon.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/SetScenarioCompleted.cs b/nksrv/LobbyServer/Msgs/User/SetScenarioCompleted.cs index 9824aaf..2eda203 100644 --- a/nksrv/LobbyServer/Msgs/User/SetScenarioCompleted.cs +++ b/nksrv/LobbyServer/Msgs/User/SetScenarioCompleted.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/SetWallpaper.cs b/nksrv/LobbyServer/Msgs/User/SetWallpaper.cs index 449d2a5..88b30ba 100644 --- a/nksrv/LobbyServer/Msgs/User/SetWallpaper.cs +++ b/nksrv/LobbyServer/Msgs/User/SetWallpaper.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User { diff --git a/nksrv/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs b/nksrv/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs index 65c168a..f2f8704 100644 --- a/nksrv/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs +++ b/nksrv/LobbyServer/Msgs/User/Tutorial/SetTutorial.cs @@ -1,10 +1,5 @@ using nksrv.StaticInfo; using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.User.Tutorial { diff --git a/nksrv/LobbyServer/Msgs/Wallet/GetWallet.cs b/nksrv/LobbyServer/Msgs/Wallet/GetWallet.cs index 8e684bd..d07a9a9 100644 --- a/nksrv/LobbyServer/Msgs/Wallet/GetWallet.cs +++ b/nksrv/LobbyServer/Msgs/Wallet/GetWallet.cs @@ -1,9 +1,4 @@ using nksrv.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.LobbyServer.Msgs.Wallet { diff --git a/nksrv/Program.cs b/nksrv/Program.cs index 6da8cd6..4959ec5 100644 --- a/nksrv/Program.cs +++ b/nksrv/Program.cs @@ -1,27 +1,15 @@ using EmbedIO; using EmbedIO.Actions; -using Google.Protobuf; -using Google.Protobuf.WellKnownTypes; +using EmbedIO.WebApi; using nksrv.IntlServer; using nksrv.LobbyServer; +using nksrv.LobbyServer.Msgs.Stage; +using nksrv.StaticInfo; using nksrv.Utils; using Swan.Logging; -using System.IO; -using System.IO.Compression; -using System.Net; using System.Net.Http.Headers; using System.Security.Cryptography.X509Certificates; using System.Text; -using System.Net.Http.Formatting; -using System.Net.Security; -using Swan.Parsers; -using System.Net.Sockets; -using Newtonsoft.Json.Linq; -using Swan; -using Google.Api; -using nksrv.StaticInfo; -using EmbedIO.WebApi; -using nksrv.LobbyServer.Msgs.Stage; namespace nksrv { @@ -50,7 +38,7 @@ namespace nksrv CliLoop(); } - catch(Exception ex) + catch (Exception ex) { Logger.Error("Fatal error:"); Logger.Error(ex.ToString()); diff --git a/nksrv/StaticInfo/JsonStaticData.cs b/nksrv/StaticInfo/JsonStaticData.cs index eeb4a28..a1f5d4a 100644 --- a/nksrv/StaticInfo/JsonStaticData.cs +++ b/nksrv/StaticInfo/JsonStaticData.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.StaticInfo +namespace nksrv.StaticInfo { public class MainQuestCompletionData { diff --git a/nksrv/StaticInfo/StaticDataParser.cs b/nksrv/StaticInfo/StaticDataParser.cs index b0cc9e2..2526c26 100644 --- a/nksrv/StaticInfo/StaticDataParser.cs +++ b/nksrv/StaticInfo/StaticDataParser.cs @@ -1,19 +1,9 @@ -using nksrv.Utils; -using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; -using ICSharpCode.SharpZipLib.Core; -using ICSharpCode.SharpZipLib.Zip; -using Newtonsoft.Json.Linq; -using Swan.Parsers; +using ICSharpCode.SharpZipLib.Zip; using Newtonsoft.Json; -using System.Drawing; -using Google.Protobuf.WellKnownTypes; +using Newtonsoft.Json.Linq; +using nksrv.Utils; +using Swan.Logging; +using System.Security.Cryptography; namespace nksrv.StaticInfo { diff --git a/nksrv/Utils/AssetDownloadUtil.cs b/nksrv/Utils/AssetDownloadUtil.cs index 5dbb78c..64ee6df 100644 --- a/nksrv/Utils/AssetDownloadUtil.cs +++ b/nksrv/Utils/AssetDownloadUtil.cs @@ -1,11 +1,6 @@ using DnsClient; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; using System.Net; -using System.Text; -using System.Threading.Tasks; namespace nksrv.Utils { diff --git a/nksrv/Utils/GameConfig.cs b/nksrv/Utils/GameConfig.cs index fed731a..2dbfefa 100644 --- a/nksrv/Utils/GameConfig.cs +++ b/nksrv/Utils/GameConfig.cs @@ -1,10 +1,5 @@ using Newtonsoft.Json; using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.Utils { diff --git a/nksrv/Utils/GreatLogger.cs b/nksrv/Utils/GreatLogger.cs index d30df73..a48c2f0 100644 --- a/nksrv/Utils/GreatLogger.cs +++ b/nksrv/Utils/GreatLogger.cs @@ -1,9 +1,4 @@ using Swan.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace nksrv.Utils { diff --git a/nksrv/Utils/JsonDb.cs b/nksrv/Utils/JsonDb.cs index 52f3b4a..41e4941 100644 --- a/nksrv/Utils/JsonDb.cs +++ b/nksrv/Utils/JsonDb.cs @@ -1,6 +1,5 @@ using Newtonsoft.Json; using nksrv.LobbyServer; -using nksrv.Net; using nksrv.StaticInfo; using Swan.Logging; diff --git a/nksrv/Utils/LoggingHttpHandler.cs b/nksrv/Utils/LoggingHttpHandler.cs index d8edf2e..5ffaf58 100644 --- a/nksrv/Utils/LoggingHttpHandler.cs +++ b/nksrv/Utils/LoggingHttpHandler.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.Utils +namespace nksrv.Utils { public class LoggingHttpHandler(HttpMessageHandler innerHandler) : DelegatingHandler(innerHandler) { diff --git a/nksrv/Utils/NetUtils.cs b/nksrv/Utils/NetUtils.cs index e37bd9b..3c6dc4c 100644 --- a/nksrv/Utils/NetUtils.cs +++ b/nksrv/Utils/NetUtils.cs @@ -1,5 +1,4 @@ -using nksrv.Net; -using nksrv.StaticInfo; +using nksrv.StaticInfo; using Swan.Logging; namespace nksrv.Utils @@ -56,7 +55,7 @@ namespace nksrv.Utils if (item.Isn == isn) { var subType = StaticDataParser.Instance.GetItemSubType(item.ItemType); - switch(subType) + switch (subType) { case "Module_A": return 0; diff --git a/nksrv/Utils/PacketDecryption.cs b/nksrv/Utils/PacketDecryption.cs index ca09650..b5755bf 100644 --- a/nksrv/Utils/PacketDecryption.cs +++ b/nksrv/Utils/PacketDecryption.cs @@ -1,15 +1,9 @@ using EmbedIO; -using Microsoft.AspNetCore.DataProtection.KeyManagement; using nksrv.LobbyServer; using Sodium; -using System; using System.Buffers.Binary; -using System.Collections.Generic; using System.IO.Compression; -using System.Linq; -using System.Numerics; using System.Text; -using System.Threading.Tasks; namespace nksrv.Utils { diff --git a/nksrv/Utils/PacketPathAttribute.cs b/nksrv/Utils/PacketPathAttribute.cs index ca46e55..c08271a 100644 --- a/nksrv/Utils/PacketPathAttribute.cs +++ b/nksrv/Utils/PacketPathAttribute.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.Utils +namespace nksrv.Utils { /// /// Represents that this class handles a message diff --git a/nksrv/Utils/Rng.cs b/nksrv/Utils/Rng.cs index a48bf08..3fc3833 100644 --- a/nksrv/Utils/Rng.cs +++ b/nksrv/Utils/Rng.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace nksrv.Utils +namespace nksrv.Utils { public class Rng {