From 7cccd2a81c4691b1f740b6e73d484f5c09cc8892 Mon Sep 17 00:00:00 2001 From: bob <605277374@qq.com> Date: Mon, 14 Jul 2025 17:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/Json/Server/WorldConfigData.Json | 2 +- Entity/Entity.csproj | 2 +- Entity/Model/DB/Members/ActivityInfo.cs | 7 + Entity/Model/DB/Members/BasicInfo.cs | 31 ++ Entity/Model/DB/Members/Currency.cs | 16 ++ Entity/Model/DB/Members/DayFlags.cs | 5 + Entity/Model/DB/Members/Fish.cs | 7 + Entity/Model/DB/Members/GamingInfo.cs | 21 ++ Entity/Model/DB/Members/Guide.cs | 26 ++ Entity/Model/DB/Members/Item.cs | 21 ++ Entity/Model/DB/Members/MapMatter.cs | 7 + Entity/Model/DB/Members/MissionInfo.cs | 7 + Entity/Model/DB/Members/Skill.cs | 7 + Entity/Model/DB/Members/UserStatisticsInfo.cs | 28 ++ Entity/Model/DB/UserInfo.cs | 60 +++- Entity/Model/User.cs | 11 - .../Generate/NetworkProtocol/RoamingType.cs | 8 + .../Config/NetworkProtocol/RoamingType.Config | 1 + .../Config/NetworkProtocol/RouteType.Config | 1 + .../Generate/NetworkProtocol/RoamingType.cs | 8 + Hotfix/Hotfix.csproj | 2 +- .../C2G_CreateAddressableRequestHandler.cs | 0 .../C2G_SendAddressableToMapHandler.cs | 0 .../Addresable/C2M_MoveToMapRequestHandler.cs | 0 .../Addresable/C2M_TestMessageHandler.cs | 0 .../Addresable/C2M_TestRequestHandler.cs | 0 .../G2M_SendAddressableMessageHandler.cs | 0 .../Addresable/M2M_SendUnitRequestHandler.cs | 0 .../Gate/C2G_TestMessageHandler.cs | 0 .../Gate/C2G_TestRequestHandler.cs | 0 .../Gate/C2G_TestRequestPushMessageHandler.cs | 0 .../C2Chat_TestRPCRoamingRequestHandler.cs | 0 .../Chat/C2Chat_TestRoamingMessageHandler.cs | 0 .../Chat/C2Chat_TestSendMapMessageHandler.cs | 0 .../Gate/C2G_ConnectRoamingRequestHandler.cs | 0 .../Map/C2Map_PushMessageToClientHandler.cs | 0 .../Map/C2Map_TestRoamingMessageHandler.cs | 0 .../Map/C2Map_TestTransferRequestHandler.cs | 0 .../Roaming/Map/Chat2M_TestMessageHandler.cs | 0 .../RouteMessage/C2Chat_TestMessageHandler.cs | 0 .../C2Chat_TestMessageRequestHandler.cs | 0 .../C2Chat_TestRequestPushMessageHandler.cs | 0 .../C2G_CreateChatRouteRequestHandler.cs | 0 ...CreateSubSceneAddressableRequestHandler.cs | 0 .../C2G_CreateSubSceneRequestHandler.cs | 0 .../C2G_SendToSubSceneMessageHandler.cs | 0 .../C2SubScene_TestDisposeMessageHandler.cs | 0 .../SubScene/C2SubScene_TestMessageHandler.cs | 0 Hotfix/Outer/Gate/C2G_LoginMessageHandler.cs | 14 + Server.sln.DotSettings.user | 1 + Tools/Exporter/NetworkProtocol/Run.bat | 4 +- Tools/NetworkProtocol/CommandLine.dll | Bin 0 -> 225280 bytes Tools/NetworkProtocol/ExporterSettings.json | 29 ++ .../Fantasy.Tools.NetworkProtocol | Bin 0 -> 123264 bytes .../Fantasy.Tools.NetworkProtocol.deps.json | 264 ++++++++++++++++++ .../Fantasy.Tools.NetworkProtocol.dll | Bin 0 -> 51200 bytes .../Fantasy.Tools.NetworkProtocol.pdb | Bin 0 -> 25840 bytes ...y.Tools.NetworkProtocol.runtimeconfig.json | 12 + ....Extensions.Configuration.Abstractions.dll | Bin 0 -> 28424 bytes ...xtensions.Configuration.FileExtensions.dll | Bin 0 -> 28432 bytes ...icrosoft.Extensions.Configuration.Json.dll | Bin 0 -> 27400 bytes .../Microsoft.Extensions.Configuration.dll | Bin 0 -> 44328 bytes ....Extensions.FileProviders.Abstractions.dll | Bin 0 -> 22832 bytes ...soft.Extensions.FileProviders.Physical.dll | Bin 0 -> 45336 bytes ...icrosoft.Extensions.FileSystemGlobbing.dll | Bin 0 -> 45832 bytes .../Microsoft.Extensions.Primitives.dll | Bin 0 -> 44336 bytes Tools/NetworkProtocol/Newtonsoft.Json.dll | Bin 0 -> 712464 bytes Tools/NetworkProtocol/Run.bat | 23 ++ Tools/NetworkProtocol/Run.sh | 24 ++ Tools/NetworkProtocol/System.IO.Pipelines.dll | Bin 0 -> 77616 bytes .../System.Text.Encodings.Web.dll | Bin 0 -> 70968 bytes Tools/NetworkProtocol/System.Text.Json.dll | Bin 0 -> 643848 bytes .../lib/net8.0/System.Text.Encodings.Web.dll | Bin 0 -> 70936 bytes 73 files changed, 629 insertions(+), 20 deletions(-) create mode 100644 Entity/Model/DB/Members/ActivityInfo.cs create mode 100644 Entity/Model/DB/Members/BasicInfo.cs create mode 100644 Entity/Model/DB/Members/Currency.cs create mode 100644 Entity/Model/DB/Members/DayFlags.cs create mode 100644 Entity/Model/DB/Members/Fish.cs create mode 100644 Entity/Model/DB/Members/GamingInfo.cs create mode 100644 Entity/Model/DB/Members/Guide.cs create mode 100644 Entity/Model/DB/Members/Item.cs create mode 100644 Entity/Model/DB/Members/MapMatter.cs create mode 100644 Entity/Model/DB/Members/MissionInfo.cs create mode 100644 Entity/Model/DB/Members/Skill.cs create mode 100644 Entity/Model/DB/Members/UserStatisticsInfo.cs delete mode 100644 Entity/Model/User.cs create mode 100644 Examples/Client/Unity/Assets/Scripts/Hotfix/Generate/NetworkProtocol/RoamingType.cs create mode 100644 Examples/Config/NetworkProtocol/RoamingType.Config create mode 100644 Examples/Config/NetworkProtocol/RouteType.Config create mode 100644 Examples/Server/Entity/Generate/NetworkProtocol/RoamingType.cs rename Hotfix/Outer/{ => Demo}/Addresable/C2G_CreateAddressableRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Addresable/C2G_SendAddressableToMapHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Addresable/C2M_MoveToMapRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Addresable/C2M_TestMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Addresable/C2M_TestRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Addresable/G2M_SendAddressableMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Addresable/M2M_SendUnitRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/NormalMessage/Gate/C2G_TestMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/NormalMessage/Gate/C2G_TestRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/NormalMessage/Gate/C2G_TestRequestPushMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Chat/C2Chat_TestRPCRoamingRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Chat/C2Chat_TestRoamingMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Chat/C2Chat_TestSendMapMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Gate/C2G_ConnectRoamingRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Map/C2Map_PushMessageToClientHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Map/C2Map_TestRoamingMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Map/C2Map_TestTransferRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/Roaming/Map/Chat2M_TestMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/RouteMessage/C2Chat_TestMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/RouteMessage/C2Chat_TestMessageRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/RouteMessage/C2Chat_TestRequestPushMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/RouteMessage/C2G_CreateChatRouteRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/SubScene/C2G_CreateSubSceneAddressableRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/SubScene/C2G_CreateSubSceneRequestHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/SubScene/C2G_SendToSubSceneMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/SubScene/C2SubScene_TestDisposeMessageHandler.cs (100%) rename Hotfix/Outer/{ => Demo}/SubScene/C2SubScene_TestMessageHandler.cs (100%) create mode 100644 Hotfix/Outer/Gate/C2G_LoginMessageHandler.cs create mode 100644 Tools/NetworkProtocol/CommandLine.dll create mode 100644 Tools/NetworkProtocol/ExporterSettings.json create mode 100644 Tools/NetworkProtocol/Fantasy.Tools.NetworkProtocol create mode 100644 Tools/NetworkProtocol/Fantasy.Tools.NetworkProtocol.deps.json create mode 100644 Tools/NetworkProtocol/Fantasy.Tools.NetworkProtocol.dll create mode 100644 Tools/NetworkProtocol/Fantasy.Tools.NetworkProtocol.pdb create mode 100644 Tools/NetworkProtocol/Fantasy.Tools.NetworkProtocol.runtimeconfig.json create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.Configuration.Abstractions.dll create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.Configuration.FileExtensions.dll create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.Configuration.Json.dll create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.Configuration.dll create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.FileProviders.Abstractions.dll create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.FileProviders.Physical.dll create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.FileSystemGlobbing.dll create mode 100644 Tools/NetworkProtocol/Microsoft.Extensions.Primitives.dll create mode 100644 Tools/NetworkProtocol/Newtonsoft.Json.dll create mode 100644 Tools/NetworkProtocol/Run.bat create mode 100644 Tools/NetworkProtocol/Run.sh create mode 100644 Tools/NetworkProtocol/System.IO.Pipelines.dll create mode 100644 Tools/NetworkProtocol/System.Text.Encodings.Web.dll create mode 100644 Tools/NetworkProtocol/System.Text.Json.dll create mode 100644 Tools/NetworkProtocol/runtimes/browser/lib/net8.0/System.Text.Encodings.Web.dll diff --git a/Config/Json/Server/WorldConfigData.Json b/Config/Json/Server/WorldConfigData.Json index 60dd090..580dfa9 100644 --- a/Config/Json/Server/WorldConfigData.Json +++ b/Config/Json/Server/WorldConfigData.Json @@ -1,3 +1,3 @@ {"List":[ -{"Id":1,"WorldName":"测试服","DbConnection":null,"DbName":"fantasy_main","DbType":"MongoDB"} +{"Id":1,"WorldName":"测试服","DbConnection":"mongodb://127.0.0.1","DbName":"fantasy_main","DbType":"MongoDB"} ]} diff --git a/Entity/Entity.csproj b/Entity/Entity.csproj index ecb0c64..7011de8 100644 --- a/Entity/Entity.csproj +++ b/Entity/Entity.csproj @@ -2,7 +2,7 @@ enable - enable + disable Linux default net9.0 diff --git a/Entity/Model/DB/Members/ActivityInfo.cs b/Entity/Model/DB/Members/ActivityInfo.cs new file mode 100644 index 0000000..23b7f3a --- /dev/null +++ b/Entity/Model/DB/Members/ActivityInfo.cs @@ -0,0 +1,7 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class Activity : Entity +{ +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/BasicInfo.cs b/Entity/Model/DB/Members/BasicInfo.cs new file mode 100644 index 0000000..787dabb --- /dev/null +++ b/Entity/Model/DB/Members/BasicInfo.cs @@ -0,0 +1,31 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class BasicInfo : Entity +{ + /// + /// 昵称 + /// + public string NickName; + + /// + /// 头像 + /// + public string Head; + + /// + /// 国家 + /// + public string Country; + + /// + /// 等级 + /// + public int Level; + + /// + /// 当前经验 + /// + public int Exp; +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/Currency.cs b/Entity/Model/DB/Members/Currency.cs new file mode 100644 index 0000000..c157bc4 --- /dev/null +++ b/Entity/Model/DB/Members/Currency.cs @@ -0,0 +1,16 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class Currency : Entity +{ + /// + /// 配置id + /// + public int ConfigId; + + /// + /// 拥有的数量 + /// + public int Count; +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/DayFlags.cs b/Entity/Model/DB/Members/DayFlags.cs new file mode 100644 index 0000000..6f3055e --- /dev/null +++ b/Entity/Model/DB/Members/DayFlags.cs @@ -0,0 +1,5 @@ +namespace Fantasy; + +public class DayFlags +{ +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/Fish.cs b/Entity/Model/DB/Members/Fish.cs new file mode 100644 index 0000000..afb0ff6 --- /dev/null +++ b/Entity/Model/DB/Members/Fish.cs @@ -0,0 +1,7 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class Fish : Entity +{ +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/GamingInfo.cs b/Entity/Model/DB/Members/GamingInfo.cs new file mode 100644 index 0000000..0b00b33 --- /dev/null +++ b/Entity/Model/DB/Members/GamingInfo.cs @@ -0,0 +1,21 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class GamingInfo : Entity +{ + /// + /// 地图 + /// + public int Map; + + /// + /// 位置 + /// + public int Pos; + + /// + /// 进入时间 + /// + public int Time; +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/Guide.cs b/Entity/Model/DB/Members/Guide.cs new file mode 100644 index 0000000..8f0220a --- /dev/null +++ b/Entity/Model/DB/Members/Guide.cs @@ -0,0 +1,26 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class Guide : Entity +{ + /// + /// 排序 + /// + public int Sort; + + /// + /// 配置id + /// + public int ConfigId; + + /// + /// 步骤 + /// + public int Step; + + /// + /// 触发时间 + /// + public long GetTime; +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/Item.cs b/Entity/Model/DB/Members/Item.cs new file mode 100644 index 0000000..ccdb841 --- /dev/null +++ b/Entity/Model/DB/Members/Item.cs @@ -0,0 +1,21 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class Item : Entity +{ + /// + /// 配置id + /// + public int ConfigId; + + /// + /// 拥有的数量 + /// + public int Count; + + /// + /// 耐久度 + /// + public int Durability; +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/MapMatter.cs b/Entity/Model/DB/Members/MapMatter.cs new file mode 100644 index 0000000..58beb5b --- /dev/null +++ b/Entity/Model/DB/Members/MapMatter.cs @@ -0,0 +1,7 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class MapMatter : Entity +{ +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/MissionInfo.cs b/Entity/Model/DB/Members/MissionInfo.cs new file mode 100644 index 0000000..d8e59ef --- /dev/null +++ b/Entity/Model/DB/Members/MissionInfo.cs @@ -0,0 +1,7 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class Mission : Entity +{ +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/Skill.cs b/Entity/Model/DB/Members/Skill.cs new file mode 100644 index 0000000..db1c645 --- /dev/null +++ b/Entity/Model/DB/Members/Skill.cs @@ -0,0 +1,7 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class Skill : Entity +{ +} \ No newline at end of file diff --git a/Entity/Model/DB/Members/UserStatisticsInfo.cs b/Entity/Model/DB/Members/UserStatisticsInfo.cs new file mode 100644 index 0000000..7ea946d --- /dev/null +++ b/Entity/Model/DB/Members/UserStatisticsInfo.cs @@ -0,0 +1,28 @@ +using Fantasy.Entitas; + +namespace Fantasy; + +public class UserStatisticsInfo : Entity +{ + /// + /// 登录次数 + /// + public uint LoginCount; + + /// + /// 最后登录时间 + /// + public long LoginTime; + + /// + /// 在线时间 + /// + public long OnlineTime; + + /// + /// 账号创建时间 + /// + public long CreateTime; + + public int FishCount; +} \ No newline at end of file diff --git a/Entity/Model/DB/UserInfo.cs b/Entity/Model/DB/UserInfo.cs index 9a02c91..a29d331 100644 --- a/Entity/Model/DB/UserInfo.cs +++ b/Entity/Model/DB/UserInfo.cs @@ -5,12 +5,62 @@ namespace Fantasy; public class UserInfo : Entity { /// - /// 昵称 + /// 基础信息 /// - public string NickName { get; set; } - + public BasicInfo BasicInfo; + /// - /// 余额 + /// 统计信息 /// - public long Money { get; set; } + public UserStatisticsInfo Statistics; + + /// + /// 游戏信息 + /// + public GamingInfo GamingInfo; + + /// + /// 货币信息 + /// + public List Currency; + + /// + /// 拥有的物品 + /// + public List Items; + + /// + /// 鱼护 + /// + public List Fishes; + + /// + /// 参与的活动 + /// + public List Activity; + + /// + /// 任务列表 + /// + public List Missions; + + /// + /// 账号标识 + /// + public DayFlags DayFlags; + + /// + /// 拥有的技能 + /// + public List Abilities; + + /// + /// 引导情况 + /// + public List Guides; + + /// + /// 地图情况 + /// + public List MapMatters; } \ No newline at end of file diff --git a/Entity/Model/User.cs b/Entity/Model/User.cs deleted file mode 100644 index 43f1865..0000000 --- a/Entity/Model/User.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Fantasy.Entitas; - -namespace Fantasy.Model; - -public sealed class User : Entity -{ - public string NickName { get; set; } - public string Head { get; set; } - public string Country { get; set; } - -} \ No newline at end of file diff --git a/Examples/Client/Unity/Assets/Scripts/Hotfix/Generate/NetworkProtocol/RoamingType.cs b/Examples/Client/Unity/Assets/Scripts/Hotfix/Generate/NetworkProtocol/RoamingType.cs new file mode 100644 index 0000000..ce3008c --- /dev/null +++ b/Examples/Client/Unity/Assets/Scripts/Hotfix/Generate/NetworkProtocol/RoamingType.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; +namespace Fantasy +{ + // Roaming协议定义(需要定义10000以上、因为10000以内的框架预留) + public static class RoamingType + { + } +} diff --git a/Examples/Config/NetworkProtocol/RoamingType.Config b/Examples/Config/NetworkProtocol/RoamingType.Config new file mode 100644 index 0000000..3b89ab1 --- /dev/null +++ b/Examples/Config/NetworkProtocol/RoamingType.Config @@ -0,0 +1 @@ +// Roaming协议定义(需要定义10000以上、因为10000以内的框架预留) diff --git a/Examples/Config/NetworkProtocol/RouteType.Config b/Examples/Config/NetworkProtocol/RouteType.Config new file mode 100644 index 0000000..b8424a1 --- /dev/null +++ b/Examples/Config/NetworkProtocol/RouteType.Config @@ -0,0 +1 @@ +// Route协议定义(需要定义1000以上、因为1000以内的框架预留) diff --git a/Examples/Server/Entity/Generate/NetworkProtocol/RoamingType.cs b/Examples/Server/Entity/Generate/NetworkProtocol/RoamingType.cs new file mode 100644 index 0000000..ce3008c --- /dev/null +++ b/Examples/Server/Entity/Generate/NetworkProtocol/RoamingType.cs @@ -0,0 +1,8 @@ +using System.Collections.Generic; +namespace Fantasy +{ + // Roaming协议定义(需要定义10000以上、因为10000以内的框架预留) + public static class RoamingType + { + } +} diff --git a/Hotfix/Hotfix.csproj b/Hotfix/Hotfix.csproj index f45c1b8..b39f153 100644 --- a/Hotfix/Hotfix.csproj +++ b/Hotfix/Hotfix.csproj @@ -13,7 +13,7 @@ - + diff --git a/Hotfix/Outer/Addresable/C2G_CreateAddressableRequestHandler.cs b/Hotfix/Outer/Demo/Addresable/C2G_CreateAddressableRequestHandler.cs similarity index 100% rename from Hotfix/Outer/Addresable/C2G_CreateAddressableRequestHandler.cs rename to Hotfix/Outer/Demo/Addresable/C2G_CreateAddressableRequestHandler.cs diff --git a/Hotfix/Outer/Addresable/C2G_SendAddressableToMapHandler.cs b/Hotfix/Outer/Demo/Addresable/C2G_SendAddressableToMapHandler.cs similarity index 100% rename from Hotfix/Outer/Addresable/C2G_SendAddressableToMapHandler.cs rename to Hotfix/Outer/Demo/Addresable/C2G_SendAddressableToMapHandler.cs diff --git a/Hotfix/Outer/Addresable/C2M_MoveToMapRequestHandler.cs b/Hotfix/Outer/Demo/Addresable/C2M_MoveToMapRequestHandler.cs similarity index 100% rename from Hotfix/Outer/Addresable/C2M_MoveToMapRequestHandler.cs rename to Hotfix/Outer/Demo/Addresable/C2M_MoveToMapRequestHandler.cs diff --git a/Hotfix/Outer/Addresable/C2M_TestMessageHandler.cs b/Hotfix/Outer/Demo/Addresable/C2M_TestMessageHandler.cs similarity index 100% rename from Hotfix/Outer/Addresable/C2M_TestMessageHandler.cs rename to Hotfix/Outer/Demo/Addresable/C2M_TestMessageHandler.cs diff --git a/Hotfix/Outer/Addresable/C2M_TestRequestHandler.cs b/Hotfix/Outer/Demo/Addresable/C2M_TestRequestHandler.cs similarity index 100% rename from Hotfix/Outer/Addresable/C2M_TestRequestHandler.cs rename to Hotfix/Outer/Demo/Addresable/C2M_TestRequestHandler.cs diff --git a/Hotfix/Outer/Addresable/G2M_SendAddressableMessageHandler.cs b/Hotfix/Outer/Demo/Addresable/G2M_SendAddressableMessageHandler.cs similarity index 100% rename from Hotfix/Outer/Addresable/G2M_SendAddressableMessageHandler.cs rename to Hotfix/Outer/Demo/Addresable/G2M_SendAddressableMessageHandler.cs diff --git a/Hotfix/Outer/Addresable/M2M_SendUnitRequestHandler.cs b/Hotfix/Outer/Demo/Addresable/M2M_SendUnitRequestHandler.cs similarity index 100% rename from Hotfix/Outer/Addresable/M2M_SendUnitRequestHandler.cs rename to Hotfix/Outer/Demo/Addresable/M2M_SendUnitRequestHandler.cs diff --git a/Hotfix/Outer/NormalMessage/Gate/C2G_TestMessageHandler.cs b/Hotfix/Outer/Demo/NormalMessage/Gate/C2G_TestMessageHandler.cs similarity index 100% rename from Hotfix/Outer/NormalMessage/Gate/C2G_TestMessageHandler.cs rename to Hotfix/Outer/Demo/NormalMessage/Gate/C2G_TestMessageHandler.cs diff --git a/Hotfix/Outer/NormalMessage/Gate/C2G_TestRequestHandler.cs b/Hotfix/Outer/Demo/NormalMessage/Gate/C2G_TestRequestHandler.cs similarity index 100% rename from Hotfix/Outer/NormalMessage/Gate/C2G_TestRequestHandler.cs rename to Hotfix/Outer/Demo/NormalMessage/Gate/C2G_TestRequestHandler.cs diff --git a/Hotfix/Outer/NormalMessage/Gate/C2G_TestRequestPushMessageHandler.cs b/Hotfix/Outer/Demo/NormalMessage/Gate/C2G_TestRequestPushMessageHandler.cs similarity index 100% rename from Hotfix/Outer/NormalMessage/Gate/C2G_TestRequestPushMessageHandler.cs rename to Hotfix/Outer/Demo/NormalMessage/Gate/C2G_TestRequestPushMessageHandler.cs diff --git a/Hotfix/Outer/Roaming/Chat/C2Chat_TestRPCRoamingRequestHandler.cs b/Hotfix/Outer/Demo/Roaming/Chat/C2Chat_TestRPCRoamingRequestHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Chat/C2Chat_TestRPCRoamingRequestHandler.cs rename to Hotfix/Outer/Demo/Roaming/Chat/C2Chat_TestRPCRoamingRequestHandler.cs diff --git a/Hotfix/Outer/Roaming/Chat/C2Chat_TestRoamingMessageHandler.cs b/Hotfix/Outer/Demo/Roaming/Chat/C2Chat_TestRoamingMessageHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Chat/C2Chat_TestRoamingMessageHandler.cs rename to Hotfix/Outer/Demo/Roaming/Chat/C2Chat_TestRoamingMessageHandler.cs diff --git a/Hotfix/Outer/Roaming/Chat/C2Chat_TestSendMapMessageHandler.cs b/Hotfix/Outer/Demo/Roaming/Chat/C2Chat_TestSendMapMessageHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Chat/C2Chat_TestSendMapMessageHandler.cs rename to Hotfix/Outer/Demo/Roaming/Chat/C2Chat_TestSendMapMessageHandler.cs diff --git a/Hotfix/Outer/Roaming/Gate/C2G_ConnectRoamingRequestHandler.cs b/Hotfix/Outer/Demo/Roaming/Gate/C2G_ConnectRoamingRequestHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Gate/C2G_ConnectRoamingRequestHandler.cs rename to Hotfix/Outer/Demo/Roaming/Gate/C2G_ConnectRoamingRequestHandler.cs diff --git a/Hotfix/Outer/Roaming/Map/C2Map_PushMessageToClientHandler.cs b/Hotfix/Outer/Demo/Roaming/Map/C2Map_PushMessageToClientHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Map/C2Map_PushMessageToClientHandler.cs rename to Hotfix/Outer/Demo/Roaming/Map/C2Map_PushMessageToClientHandler.cs diff --git a/Hotfix/Outer/Roaming/Map/C2Map_TestRoamingMessageHandler.cs b/Hotfix/Outer/Demo/Roaming/Map/C2Map_TestRoamingMessageHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Map/C2Map_TestRoamingMessageHandler.cs rename to Hotfix/Outer/Demo/Roaming/Map/C2Map_TestRoamingMessageHandler.cs diff --git a/Hotfix/Outer/Roaming/Map/C2Map_TestTransferRequestHandler.cs b/Hotfix/Outer/Demo/Roaming/Map/C2Map_TestTransferRequestHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Map/C2Map_TestTransferRequestHandler.cs rename to Hotfix/Outer/Demo/Roaming/Map/C2Map_TestTransferRequestHandler.cs diff --git a/Hotfix/Outer/Roaming/Map/Chat2M_TestMessageHandler.cs b/Hotfix/Outer/Demo/Roaming/Map/Chat2M_TestMessageHandler.cs similarity index 100% rename from Hotfix/Outer/Roaming/Map/Chat2M_TestMessageHandler.cs rename to Hotfix/Outer/Demo/Roaming/Map/Chat2M_TestMessageHandler.cs diff --git a/Hotfix/Outer/RouteMessage/C2Chat_TestMessageHandler.cs b/Hotfix/Outer/Demo/RouteMessage/C2Chat_TestMessageHandler.cs similarity index 100% rename from Hotfix/Outer/RouteMessage/C2Chat_TestMessageHandler.cs rename to Hotfix/Outer/Demo/RouteMessage/C2Chat_TestMessageHandler.cs diff --git a/Hotfix/Outer/RouteMessage/C2Chat_TestMessageRequestHandler.cs b/Hotfix/Outer/Demo/RouteMessage/C2Chat_TestMessageRequestHandler.cs similarity index 100% rename from Hotfix/Outer/RouteMessage/C2Chat_TestMessageRequestHandler.cs rename to Hotfix/Outer/Demo/RouteMessage/C2Chat_TestMessageRequestHandler.cs diff --git a/Hotfix/Outer/RouteMessage/C2Chat_TestRequestPushMessageHandler.cs b/Hotfix/Outer/Demo/RouteMessage/C2Chat_TestRequestPushMessageHandler.cs similarity index 100% rename from Hotfix/Outer/RouteMessage/C2Chat_TestRequestPushMessageHandler.cs rename to Hotfix/Outer/Demo/RouteMessage/C2Chat_TestRequestPushMessageHandler.cs diff --git a/Hotfix/Outer/RouteMessage/C2G_CreateChatRouteRequestHandler.cs b/Hotfix/Outer/Demo/RouteMessage/C2G_CreateChatRouteRequestHandler.cs similarity index 100% rename from Hotfix/Outer/RouteMessage/C2G_CreateChatRouteRequestHandler.cs rename to Hotfix/Outer/Demo/RouteMessage/C2G_CreateChatRouteRequestHandler.cs diff --git a/Hotfix/Outer/SubScene/C2G_CreateSubSceneAddressableRequestHandler.cs b/Hotfix/Outer/Demo/SubScene/C2G_CreateSubSceneAddressableRequestHandler.cs similarity index 100% rename from Hotfix/Outer/SubScene/C2G_CreateSubSceneAddressableRequestHandler.cs rename to Hotfix/Outer/Demo/SubScene/C2G_CreateSubSceneAddressableRequestHandler.cs diff --git a/Hotfix/Outer/SubScene/C2G_CreateSubSceneRequestHandler.cs b/Hotfix/Outer/Demo/SubScene/C2G_CreateSubSceneRequestHandler.cs similarity index 100% rename from Hotfix/Outer/SubScene/C2G_CreateSubSceneRequestHandler.cs rename to Hotfix/Outer/Demo/SubScene/C2G_CreateSubSceneRequestHandler.cs diff --git a/Hotfix/Outer/SubScene/C2G_SendToSubSceneMessageHandler.cs b/Hotfix/Outer/Demo/SubScene/C2G_SendToSubSceneMessageHandler.cs similarity index 100% rename from Hotfix/Outer/SubScene/C2G_SendToSubSceneMessageHandler.cs rename to Hotfix/Outer/Demo/SubScene/C2G_SendToSubSceneMessageHandler.cs diff --git a/Hotfix/Outer/SubScene/C2SubScene_TestDisposeMessageHandler.cs b/Hotfix/Outer/Demo/SubScene/C2SubScene_TestDisposeMessageHandler.cs similarity index 100% rename from Hotfix/Outer/SubScene/C2SubScene_TestDisposeMessageHandler.cs rename to Hotfix/Outer/Demo/SubScene/C2SubScene_TestDisposeMessageHandler.cs diff --git a/Hotfix/Outer/SubScene/C2SubScene_TestMessageHandler.cs b/Hotfix/Outer/Demo/SubScene/C2SubScene_TestMessageHandler.cs similarity index 100% rename from Hotfix/Outer/SubScene/C2SubScene_TestMessageHandler.cs rename to Hotfix/Outer/Demo/SubScene/C2SubScene_TestMessageHandler.cs diff --git a/Hotfix/Outer/Gate/C2G_LoginMessageHandler.cs b/Hotfix/Outer/Gate/C2G_LoginMessageHandler.cs new file mode 100644 index 0000000..40ac137 --- /dev/null +++ b/Hotfix/Outer/Gate/C2G_LoginMessageHandler.cs @@ -0,0 +1,14 @@ +// using Fantasy.Async; +// using Fantasy.Network; +// using Fantasy.Network.Interface; +// +// namespace Fantasy.Gate; +// +// public class C2G_LoginMessageHandler : Message +// { +// protected override async FTask Run(Session session, C2G_TestMessage message) +// { +// Log.Debug($"Receive C2G_TestMessage Tag={message.Tag}"); +// await FTask.CompletedTask; +// } +// } \ No newline at end of file diff --git a/Server.sln.DotSettings.user b/Server.sln.DotSettings.user index 0988c93..38edbbb 100644 --- a/Server.sln.DotSettings.user +++ b/Server.sln.DotSettings.user @@ -36,6 +36,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded diff --git a/Tools/Exporter/NetworkProtocol/Run.bat b/Tools/Exporter/NetworkProtocol/Run.bat index fe41258..e762f8d 100644 --- a/Tools/Exporter/NetworkProtocol/Run.bat +++ b/Tools/Exporter/NetworkProtocol/Run.bat @@ -18,4 +18,6 @@ if "%choice%"=="1" ( dotnet Fantasy.Tools.NetworkProtocol.dll --p 3 ) else ( echo Invalid option -) \ No newline at end of file +) + +PAUSE \ No newline at end of file diff --git a/Tools/NetworkProtocol/CommandLine.dll b/Tools/NetworkProtocol/CommandLine.dll new file mode 100644 index 0000000000000000000000000000000000000000..3eab2be274359223f5640b0af04b2af375cce752 GIT binary patch literal 225280 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