diff --git a/AscNet.GameServer/Handlers/AccountModule.cs b/AscNet.GameServer/Handlers/AccountModule.cs index 5dc66c5..582dbcf 100644 --- a/AscNet.GameServer/Handlers/AccountModule.cs +++ b/AscNet.GameServer/Handlers/AccountModule.cs @@ -199,11 +199,11 @@ namespace AscNet.GameServer.Handlers }; session.SendPush(notifySocialData); - // NotifyTaskData notifyTaskData = JsonConvert.DeserializeObject(File.ReadAllText("Data/NotifyTaskData.json"))!; - NotifyTaskData notifyTaskData = new() - { - TaskData = { } - }; + NotifyTaskData notifyTaskData = JsonConvert.DeserializeObject(File.ReadAllText("Data/NotifyTaskData.json"))!; + //NotifyTaskData notifyTaskData = new() + //{ + // TaskData = { } + //}; session.SendPush(notifyTaskData); NotifyActivenessStatus notifyActivenessStatus = new() diff --git a/AscNet.Test/Program.cs b/AscNet.Test/Program.cs index 9e69a52..47a09de 100644 --- a/AscNet.Test/Program.cs +++ b/AscNet.Test/Program.cs @@ -1,10 +1,6 @@ using AscNet.Common.MsgPack; -using System.Text.Json; using Newtonsoft.Json; using System.Reflection; -using AscNet.GameServer; -using MessagePack; -using static AscNet.GameServer.Packet; namespace AscNet.Test { @@ -12,14 +8,14 @@ namespace AscNet.Test { static void Main(string[] args) { - string lines = File.ReadAllText("Data/NotifyLogin.json"); - NotifyLogin notifyLogin = System.Text.Json.JsonSerializer.Deserialize(lines)!; - NotifyLogin notifyLoginNew = JsonConvert.DeserializeObject(lines)!; - - foreach (PropertyCompareResult resultItem in Compare(notifyLogin, notifyLoginNew)) + try { - Console.WriteLine(" Property name: {0} -- old: {1}, new: {2}", - resultItem.Name, resultItem.OldValue ?? "", resultItem.NewValue ?? ""); + NotifyLogin notifyLoginNew = JsonConvert.DeserializeObject(File.ReadAllText("Data/NotifyLogin.json"))!; + NotifyTaskData notifyTaskData = JsonConvert.DeserializeObject(File.ReadAllText("Data/NotifyTaskData.json"))!; + } + catch (Exception ex) + { + Console.WriteLine(ex.ToString()); } }