migrate everything to new tablereader

This commit is contained in:
rfi
2023-12-10 09:22:33 +07:00
parent 847b3efd4a
commit 259c744f23
6 changed files with 26 additions and 187 deletions

View File

@@ -1,5 +1,6 @@
using AscNet.Common.MsgPack;
using AscNet.Table.share.fuben;
using AscNet.Common.Util;
using AscNet.Table.V2.share.fuben;
namespace AscNet.GameServer.Commands
{
@@ -18,7 +19,7 @@ namespace AscNet.GameServer.Commands
if (TargetStage == "all")
{
session.stage.Stages.Clear();
foreach (var stageData in StageTableReader.Instance.All)
foreach (var stageData in TableReaderV2.Parse<StageTable>())
{
session.stage.Stages.Add(stageData.StageId, new()
{
@@ -43,7 +44,7 @@ namespace AscNet.GameServer.Commands
}
else
{
StageTable? stageData = StageTableReader.Instance.FromStageId(int.Parse(TargetStage));
StageTable? stageData = TableReaderV2.Parse<StageTable>().Find(x => x.StageId == int.Parse(TargetStage));
if (stageData is not null && !session.stage.Stages.ContainsKey(stageData.StageId))
{
StageDatum stage = new()

View File

@@ -1,9 +1,8 @@
using AscNet.Common.Database;
using AscNet.Common.MsgPack;
using AscNet.Common.Util;
using AscNet.Table.share.chat;
using AscNet.Table.share.guide;
using AscNet.Table.share.item;
using AscNet.Table.V2.share.chat;
using AscNet.Table.V2.share.guide;
using MessagePack;
using System.Diagnostics;
@@ -146,7 +145,7 @@ namespace AscNet.GameServer.Handlers
notifyLogin.FashionList.AddRange(session.character.Fashions);
#if DEBUG
notifyLogin.PlayerData.GuideData = GuideGroupTableReader.Instance.All.Select(x => (long)x.Id).ToList();
notifyLogin.PlayerData.GuideData = TableReaderV2.Parse<GuideGroupTable>().Select(x => (long)x.Id).ToList();
#endif
NotifyStageData notifyStageData = new()
@@ -192,7 +191,7 @@ namespace AscNet.GameServer.Handlers
NotifyChatLoginData notifyChatLoginData = new()
{
RefreshTime = ((DateTimeOffset)Process.GetCurrentProcess().StartTime).ToUnixTimeSeconds(),
UnlockEmojis = EmojiTableReader.Instance.All.Select(x => new NotifyChatLoginData.NotifyChatLoginDataUnlockEmoji() { Id = (uint)x.Id }).ToList()
UnlockEmojis = TableReaderV2.Parse<EmojiTable>().Select(x => new NotifyChatLoginData.NotifyChatLoginDataUnlockEmoji() { Id = (uint)x.Id }).ToList()
};
NotifyItemDataList notifyItemDataList = new()

View File

@@ -1,6 +1,7 @@
using AscNet.Common.MsgPack;
using AscNet.Common.Util;
using AscNet.GameServer.Commands;
using AscNet.Table.share.chat;
using AscNet.Table.V2.share.chat;
using MessagePack;
namespace AscNet.GameServer.Handlers
@@ -219,7 +220,7 @@ namespace AscNet.GameServer.Handlers
session.SendResponse(new GetEmojiPackageIdResponse()
{
Code = 0,
OrderEmojiPackageIds = EmojiPackTableReader.Instance.All.Select(x => x.Id).ToList()
OrderEmojiPackageIds = TableReaderV2.Parse<EmojiPackTable>().Select(x => x.Id).ToList()
}, packet.Id);
}
#endregion