diff --git a/Fanatsy.sln b/Fanatsy.sln
index a2d648e5..d8ecc28e 100644
--- a/Fanatsy.sln
+++ b/Fanatsy.sln
@@ -14,7 +14,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Tools.ExporterNetwo
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Net", "Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj", "{4782A7D1-2B43-48DD-AF50-EDC773436E20}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Console", "Fantays.Console\Fantasy.Console\Fantasy.Console.csproj", "{4E463740-00D2-4B4F-AC5B-A09B24487D35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Console", "Fantays.Console\Fantasy.Console.csproj", "{4E463740-00D2-4B4F-AC5B-A09B24487D35}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{0CEB6A4D-8CE9-4EA7-A918-61FA62D6F6F0}"
EndProject
@@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Tools.ConfigTable",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Tools.NetworkProtocol", "Tools\SourceCode\Fantasy.Tools.NetworkProtocol\Fantasy.Tools.NetworkProtocol.csproj", "{1951BC8A-0B3E-42F8-950B-DC142988B225}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Benchmark", "Fantasy.Benchmark\Fantasy.Benchmark.csproj", "{C228C5CC-81B9-4323-B4BD-F3C1FB129676}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -73,5 +75,9 @@ Global
{1951BC8A-0B3E-42F8-950B-DC142988B225}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1951BC8A-0B3E-42F8-950B-DC142988B225}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1951BC8A-0B3E-42F8-950B-DC142988B225}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C228C5CC-81B9-4323-B4BD-F3C1FB129676}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C228C5CC-81B9-4323-B4BD-F3C1FB129676}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C228C5CC-81B9-4323-B4BD-F3C1FB129676}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C228C5CC-81B9-4323-B4BD-F3C1FB129676}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
diff --git a/Fanatsy.sln.DotSettings.user b/Fanatsy.sln.DotSettings.user
new file mode 100644
index 00000000..ab7f6a0c
--- /dev/null
+++ b/Fanatsy.sln.DotSettings.user
@@ -0,0 +1,2 @@
+
+ ForceIncluded
\ No newline at end of file
diff --git a/Fantasy.Benchmark/ConsoleLog.cs b/Fantasy.Benchmark/ConsoleLog.cs
new file mode 100644
index 00000000..4fa540fb
--- /dev/null
+++ b/Fantasy.Benchmark/ConsoleLog.cs
@@ -0,0 +1,138 @@
+
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
+namespace Fantasy
+{
+ ///
+ /// 标准的控制台Log
+ ///
+ public sealed class ConsoleLog : ILog
+ {
+
+ ///
+ /// 记录跟踪级别的日志消息。
+ ///
+ /// 日志消息。
+ public void Trace(string message)
+ {
+ System.Console.ForegroundColor = ConsoleColor.White;
+ System.Console.WriteLine(message);
+ }
+
+ ///
+ /// 记录警告级别的日志消息。
+ ///
+ /// 日志消息。
+ public void Warning(string message)
+ {
+ System.Console.ForegroundColor = ConsoleColor.Yellow;
+ System.Console.WriteLine(message);
+ }
+
+ ///
+ /// 记录信息级别的日志消息。
+ ///
+ /// 日志消息。
+ public void Info(string message)
+ {
+ System.Console.ForegroundColor = ConsoleColor.Gray;
+ System.Console.WriteLine(message);
+ }
+
+ ///
+ /// 记录调试级别的日志消息。
+ ///
+ /// 日志消息。
+ public void Debug(string message)
+ {
+ System.Console.ForegroundColor = ConsoleColor.DarkGreen;
+ System.Console.WriteLine(message);
+ }
+
+ ///
+ /// 记录错误级别的日志消息。
+ ///
+ /// 日志消息。
+ public void Error(string message)
+ {
+ System.Console.ForegroundColor = ConsoleColor.DarkRed;
+ System.Console.WriteLine(message);
+ }
+
+ ///
+ /// 记录严重错误级别的日志消息。
+ ///
+ /// 日志消息。
+ public void Fatal(string message)
+ {
+ System.Console.ForegroundColor = ConsoleColor.Red;
+ System.Console.WriteLine(message);
+ }
+
+ ///
+ /// 记录跟踪级别的格式化日志消息。
+ ///
+ /// 日志消息模板。
+ /// 格式化参数。
+ public void Trace(string message, params object[] args)
+ {
+ System.Console.ForegroundColor = ConsoleColor.White;
+ System.Console.WriteLine(message, args);
+ }
+
+ ///
+ /// 记录警告级别的格式化日志消息。
+ ///
+ /// 日志消息模板。
+ /// 格式化参数。
+ public void Warning(string message, params object[] args)
+ {
+ System.Console.ForegroundColor = ConsoleColor.Yellow;
+ System.Console.WriteLine(message, args);
+ }
+
+ ///
+ /// 记录信息级别的格式化日志消息。
+ ///
+ /// 日志消息模板。
+ /// 格式化参数。
+ public void Info(string message, params object[] args)
+ {
+ System.Console.ForegroundColor = ConsoleColor.Gray;
+ System.Console.WriteLine(message, args);
+ }
+
+ ///
+ /// 记录调试级别的格式化日志消息。
+ ///
+ /// 日志消息模板。
+ /// 格式化参数。
+ public void Debug(string message, params object[] args)
+ {
+ System.Console.ForegroundColor = ConsoleColor.DarkGreen;
+ System.Console.WriteLine(message, args);
+ }
+
+ ///
+ /// 记录错误级别的格式化日志消息。
+ ///
+ /// 日志消息模板。
+ /// 格式化参数。
+ public void Error(string message, params object[] args)
+ {
+ System.Console.ForegroundColor = ConsoleColor.DarkRed;
+ System.Console.WriteLine(message, args);
+ }
+
+ ///
+ /// 记录严重错误级别的格式化日志消息。
+ ///
+ /// 日志消息模板。
+ /// 格式化参数。
+ public void Fatal(string message, params object[] args)
+ {
+ System.Console.ForegroundColor = ConsoleColor.Red;
+ System.Console.WriteLine(message, args);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Fantasy.Benchmark/Fantasy.Benchmark.csproj b/Fantasy.Benchmark/Fantasy.Benchmark.csproj
new file mode 100644
index 00000000..61e1f056
--- /dev/null
+++ b/Fantasy.Benchmark/Fantasy.Benchmark.csproj
@@ -0,0 +1,32 @@
+
+
+
+ Exe
+ net8.0
+ enable
+ enable
+
+
+
+ TRACE;FANTASY_CONSOLE
+ true
+
+
+
+ TRACE;FANTASY_CONSOLE
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Fantasy.Benchmark/NetworkBenchmark.cs b/Fantasy.Benchmark/NetworkBenchmark.cs
new file mode 100644
index 00000000..0a6953c9
--- /dev/null
+++ b/Fantasy.Benchmark/NetworkBenchmark.cs
@@ -0,0 +1,45 @@
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Running;
+using Fantasy.Async;
+using Fantasy.InnerMessage;
+using Fantasy.Network;
+using Fantasy.Platform.Console;
+
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+
+namespace Fantasy.Benchmark;
+[SimpleJob(RuntimeMoniker.Net80, baseline: true)]
+public class NetworkBenchmark
+{
+ private static Scene _scene;
+ private static Session _session;
+ private readonly BenchmarkRequest _benchmarkRequest = new BenchmarkRequest();
+
+ public static async FTask Initialize()
+ {
+ // 注册日志实例到框架中
+ Log.Register(new ConsoleLog());
+ // 初始化框架
+ Entry.Initialize();
+ // 执行StartUpdate方法
+ Entry.StartUpdate();
+ _scene = await Entry.CreateScene();
+ // 创建远程连接
+ _session = _scene.Connect("127.0.0.1:20000", NetworkProtocolType.KCP,
+ () =>
+ {
+ Log.Debug("连接到目标服务器成功");
+ var summary = BenchmarkRunner.Run();
+ Console.WriteLine(summary);
+ },
+ () => { Log.Debug("无法连接到目标服务器"); },
+ () => { Log.Debug("与服务器断开连接"); }, false);
+ }
+
+ [Benchmark]
+ public async FTask Call()
+ {
+ await _session.Call(_benchmarkRequest);
+ }
+}
\ No newline at end of file
diff --git a/Fantasy.Benchmark/Program.cs b/Fantasy.Benchmark/Program.cs
new file mode 100644
index 00000000..30d8cf37
--- /dev/null
+++ b/Fantasy.Benchmark/Program.cs
@@ -0,0 +1,2 @@
+Fantasy.Benchmark.NetworkBenchmark.Initialize().Coroutine();
+Console.ReadKey();
\ No newline at end of file
diff --git a/Fantasy.Benchmark/README.md b/Fantasy.Benchmark/README.md
new file mode 100644
index 00000000..8315cc44
--- /dev/null
+++ b/Fantasy.Benchmark/README.md
@@ -0,0 +1,6 @@
+# Fantasy.Benchmark
+使用 Fantasy.Benchmark 工具,我们能够快速评估框架网络的处理性能。目前,该工具提供的基准测试主要集中在 RPC(远程过程调用)消息 方面。这一项测试能够有效测量系统在处理远程调用时的响应时间、吞吐量和资源利用率,帮助开发者优化网络通信性能,确保在高负载情况下系统依然能够稳定运行
+## 操作步骤
+- 1.打开位于 Examples/Server/Server.sln 的解决方案文件。
+- 2.在解决方案中选择并启动 Main 项目。
+- 3.接着,启动 Fantasy.Benchmark 应用程序,并耐心等待其测试结果的生成。
diff --git a/Fantasy.Net/Fantasy.Net/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs b/Fantasy.Net/Fantasy.Net/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs
new file mode 100644
index 00000000..85325479
--- /dev/null
+++ b/Fantasy.Net/Fantasy.Net/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs
@@ -0,0 +1,25 @@
+using Fantasy.Async;
+using Fantasy.InnerMessage;
+using Fantasy.Network.Interface;
+
+#if FANTASY_NET
+namespace Fantasy.Network.Benchmark.Handler;
+
+///
+/// BenchmarkRequestHandler
+///
+public sealed class BenchmarkRequestHandler : MessageRPC
+{
+ ///
+ /// Run方法
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected override async FTask Run(Session session, BenchmarkRequest request, BenchmarkResponse response, Action reply)
+ {
+ await FTask.CompletedTask;
+ }
+}
+#endif
diff --git a/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/InnerMessage.cs b/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/InnerMessage.cs
index d30a2755..8910a34e 100644
--- a/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/InnerMessage.cs
+++ b/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/InnerMessage.cs
@@ -10,6 +10,38 @@
namespace Fantasy.InnerMessage
{
[ProtoContract]
+ public sealed partial class BenchmarkMessage : AMessage, IMessage
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkMessage;
+ }
+ }
+ [ProtoContract]
+ public partial class BenchmarkRequest : AMessage, IRequest
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkRequest;
+ }
+ [ProtoIgnore]
+ public BenchmarkResponse ResponseType { get; set; }
+ [ProtoMember(1)]
+ public long RpcId { get; set; }
+ }
+
+ [ProtoContract]
+ public partial class BenchmarkResponse : AMessage, IResponse
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkResponse;
+ }
+ [ProtoMember(1)]
+ public long RpcId { get; set; }
+ [ProtoMember(2)]
+ public uint ErrorCode { get; set; }
+ }
public sealed partial class Response : AMessage, IResponse
{
public uint OpCode()
diff --git a/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/PacketParser/OpCode.cs b/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/PacketParser/OpCode.cs
index ee1510d7..d02105d9 100644
--- a/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/PacketParser/OpCode.cs
+++ b/Fantasy.Net/Fantasy.Net/Runtime/Core/Network/Message/PacketParser/OpCode.cs
@@ -78,6 +78,9 @@ public static class OpCodeType
public static class OpCode
{
+ public static readonly uint BenchmarkMessage = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterMessage, 8388607);
+ public static readonly uint BenchmarkRequest = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterRequest, 8388607);
+ public static readonly uint BenchmarkResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterResponse, 8388607);
public static readonly uint PingRequest = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterPingRequest, 1);
public static readonly uint PingResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterPingResponse, 1);
public static readonly uint DefaultResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.InnerResponse, 1);
diff --git a/Fantasy.Net/Fantasy.Net/Runtime/Core/Platform/Console/Entry.cs b/Fantasy.Net/Fantasy.Net/Runtime/Core/Platform/Console/Entry.cs
index e49e5ed4..3f461326 100644
--- a/Fantasy.Net/Fantasy.Net/Runtime/Core/Platform/Console/Entry.cs
+++ b/Fantasy.Net/Fantasy.Net/Runtime/Core/Platform/Console/Entry.cs
@@ -55,6 +55,7 @@ public static void StartUpdate()
while (_isInit)
{
ThreadScheduler.Update();
+ Thread.Sleep(1);
}
})
{
diff --git a/Fantasy.Net/Fantasy.Net/Runtime/Core/Serialize/Interface/ASerialize.cs b/Fantasy.Net/Fantasy.Net/Runtime/Core/Serialize/Interface/ASerialize.cs
index 23d0345b..7487b86d 100644
--- a/Fantasy.Net/Fantasy.Net/Runtime/Core/Serialize/Interface/ASerialize.cs
+++ b/Fantasy.Net/Fantasy.Net/Runtime/Core/Serialize/Interface/ASerialize.cs
@@ -2,13 +2,12 @@
using System.ComponentModel;
using System.Runtime.Serialization;
using Fantasy.Pool;
-#if FANTASY_NET
+#if FANTASY_NET || FANTASY_UNITY || FANTASY_CONSOLE
using MongoDB.Bson.Serialization.Attributes;
#endif
using Newtonsoft.Json;
using ProtoBuf;
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark.meta b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark.meta
new file mode 100644
index 00000000..cfe3201a
--- /dev/null
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 160974fcbccd74d0eafedf8762807588
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler.meta b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler.meta
new file mode 100644
index 00000000..cfda7e8e
--- /dev/null
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 91eb4278fcdd44b6d8a782ca42107e4c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs
new file mode 100644
index 00000000..85325479
--- /dev/null
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs
@@ -0,0 +1,25 @@
+using Fantasy.Async;
+using Fantasy.InnerMessage;
+using Fantasy.Network.Interface;
+
+#if FANTASY_NET
+namespace Fantasy.Network.Benchmark.Handler;
+
+///
+/// BenchmarkRequestHandler
+///
+public sealed class BenchmarkRequestHandler : MessageRPC
+{
+ ///
+ /// Run方法
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected override async FTask Run(Session session, BenchmarkRequest request, BenchmarkResponse response, Action reply)
+ {
+ await FTask.CompletedTask;
+ }
+}
+#endif
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs.meta b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs.meta
new file mode 100644
index 00000000..e0451e32
--- /dev/null
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0b5a936197cf64719b8d6b44158e0d91
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/InnerMessage.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/InnerMessage.cs
index d30a2755..8910a34e 100644
--- a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/InnerMessage.cs
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/InnerMessage.cs
@@ -10,6 +10,38 @@
namespace Fantasy.InnerMessage
{
[ProtoContract]
+ public sealed partial class BenchmarkMessage : AMessage, IMessage
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkMessage;
+ }
+ }
+ [ProtoContract]
+ public partial class BenchmarkRequest : AMessage, IRequest
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkRequest;
+ }
+ [ProtoIgnore]
+ public BenchmarkResponse ResponseType { get; set; }
+ [ProtoMember(1)]
+ public long RpcId { get; set; }
+ }
+
+ [ProtoContract]
+ public partial class BenchmarkResponse : AMessage, IResponse
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkResponse;
+ }
+ [ProtoMember(1)]
+ public long RpcId { get; set; }
+ [ProtoMember(2)]
+ public uint ErrorCode { get; set; }
+ }
public sealed partial class Response : AMessage, IResponse
{
public uint OpCode()
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/PacketParser/OpCode.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/PacketParser/OpCode.cs
index ee1510d7..d02105d9 100644
--- a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/PacketParser/OpCode.cs
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Message/PacketParser/OpCode.cs
@@ -78,6 +78,9 @@ public static class OpCodeType
public static class OpCode
{
+ public static readonly uint BenchmarkMessage = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterMessage, 8388607);
+ public static readonly uint BenchmarkRequest = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterRequest, 8388607);
+ public static readonly uint BenchmarkResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterResponse, 8388607);
public static readonly uint PingRequest = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterPingRequest, 1);
public static readonly uint PingResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterPingResponse, 1);
public static readonly uint DefaultResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.InnerResponse, 1);
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
index 6fc101df..d6a8caa4 100644
--- a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
@@ -202,7 +202,6 @@ public static void Scheduler(this ProcessSession session, Type messageType, uint
if (entity == null || entity.IsDisposed)
{
sceneMessageDispatcherComponent.FailRouteResponse(session, message.GetType(), InnerErrorCode.ErrNotFoundRoute, rpcId);
-
return;
}
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Platform/Console/Entry.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Platform/Console/Entry.cs
index e49e5ed4..3f461326 100644
--- a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Platform/Console/Entry.cs
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Platform/Console/Entry.cs
@@ -55,6 +55,7 @@ public static void StartUpdate()
while (_isInit)
{
ThreadScheduler.Update();
+ Thread.Sleep(1);
}
})
{
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Scene/Scene.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Scene/Scene.cs
index f91696d5..803c1a80 100644
--- a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Scene/Scene.cs
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Scene/Scene.cs
@@ -502,13 +502,13 @@ public Session GetSession(long runTimeId)
_processSessionInfos.Remove(sceneId);
}
- // if (Process.IsInAppliaction(ref sceneId))
- // {
- // // 如果在同一个Process下,不需要通过Socket发送了,直接通过Process下转发。
- // var processSession = Session.CreateInnerSession(Scene);
- // _processSessionInfos.Add(sceneId, new ProcessSessionInfo(processSession, null));
- // return processSession;
- // }
+ if (Process.IsInAppliaction(ref sceneId))
+ {
+ // 如果在同一个Process下,不需要通过Socket发送了,直接通过Process下转发。
+ var processSession = Session.CreateInnerSession(Scene);
+ _processSessionInfos.Add(sceneId, new ProcessSessionInfo(processSession, null));
+ return processSession;
+ }
if (!SceneConfigData.Instance.TryGet(sceneId, out var sceneConfig))
{
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/Interface/ASerialize.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/Interface/ASerialize.cs
index 55c3e540..fbda1d4a 100644
--- a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/Interface/ASerialize.cs
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/Interface/ASerialize.cs
@@ -2,7 +2,9 @@
using System.ComponentModel;
using System.Runtime.Serialization;
using Fantasy.Pool;
+#if FANTASY_NET || FANTASY_UNITY || FANTASY_CONSOLE
using MongoDB.Bson.Serialization.Attributes;
+#endif
using Newtonsoft.Json;
using ProtoBuf;
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
@@ -38,7 +40,9 @@ public void SetScene(Scene scene)
_scene = scene;
}
#endif
+#if FANTASY_NET
[BsonIgnore]
+#endif
[JsonIgnore]
[IgnoreDataMember]
[ProtoIgnore]
diff --git a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/SerializerManager.cs b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/SerializerManager.cs
index 56d01243..8c7a0b30 100644
--- a/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/SerializerManager.cs
+++ b/Fantasy.Unity/Fantasy.Unity/Runtime/Core/Serialize/SerializerManager.cs
@@ -2,7 +2,9 @@
using System.Collections.Generic;
using Fantasy.Assembly;
using Fantasy.Helper;
+#if !FANTASY_EXPORTER
using Fantasy.Network;
+#endif
using ProtoBuf;
#pragma warning disable CS8604 // Possible null reference argument.
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
diff --git a/Fantays.Console/Fantasy.Console/Fantasy.Console.csproj b/Fantays.Console/Fantasy.Console.csproj
similarity index 86%
rename from Fantays.Console/Fantasy.Console/Fantasy.Console.csproj
rename to Fantays.Console/Fantasy.Console.csproj
index 3a92ff0d..9a5f8b71 100644
--- a/Fantays.Console/Fantasy.Console/Fantasy.Console.csproj
+++ b/Fantays.Console/Fantasy.Console.csproj
@@ -7,13 +7,13 @@
- TRACE;FANTASY_CONSOLE;FANTASY_KCPUNSAFE;
+ TRACE;FANTASY_CONSOLE
true
true
- TRACE;FANTASY_CONSOLE;FANTASY_KCPUNSAFE
+ TRACE;FANTASY_CONSOLE
true
diff --git a/Fantays.Console/Fantasy.Console.sln b/Fantays.Console/Fantasy.Console.sln
deleted file mode 100644
index b51ba545..00000000
--- a/Fantays.Console/Fantasy.Console.sln
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Console", "Fantasy.Console\Fantasy.Console.csproj", "{B08C2D16-82FF-46C7-9724-3BBE6F745132}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {B08C2D16-82FF-46C7-9724-3BBE6F745132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B08C2D16-82FF-46C7-9724-3BBE6F745132}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B08C2D16-82FF-46C7-9724-3BBE6F745132}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B08C2D16-82FF-46C7-9724-3BBE6F745132}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
-EndGlobal
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Assembly/AssemblyInfo.cs b/Fantays.Console/Runtime/Core/Assembly/AssemblyInfo.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Assembly/AssemblyInfo.cs
rename to Fantays.Console/Runtime/Core/Assembly/AssemblyInfo.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Assembly/AssemblySystem.cs b/Fantays.Console/Runtime/Core/Assembly/AssemblySystem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Assembly/AssemblySystem.cs
rename to Fantays.Console/Runtime/Core/Assembly/AssemblySystem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Assembly/IAssembly.cs b/Fantays.Console/Runtime/Core/Assembly/IAssembly.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Assembly/IAssembly.cs
rename to Fantays.Console/Runtime/Core/Assembly/IAssembly.cs
diff --git a/Fantays.Console/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs b/Fantays.Console/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs
new file mode 100644
index 00000000..85325479
--- /dev/null
+++ b/Fantays.Console/Runtime/Core/Benchmark/Handler/BenchmarkRequestHandler.cs
@@ -0,0 +1,25 @@
+using Fantasy.Async;
+using Fantasy.InnerMessage;
+using Fantasy.Network.Interface;
+
+#if FANTASY_NET
+namespace Fantasy.Network.Benchmark.Handler;
+
+///
+/// BenchmarkRequestHandler
+///
+public sealed class BenchmarkRequestHandler : MessageRPC
+{
+ ///
+ /// Run方法
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected override async FTask Run(Session session, BenchmarkRequest request, BenchmarkResponse response, Action reply)
+ {
+ await FTask.CompletedTask;
+ }
+}
+#endif
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataBase/IDateBase.cs b/Fantays.Console/Runtime/Core/DataBase/IDateBase.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataBase/IDateBase.cs
rename to Fantays.Console/Runtime/Core/DataBase/IDateBase.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataBase/MongoDataBase.cs b/Fantays.Console/Runtime/Core/DataBase/MongoDataBase.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataBase/MongoDataBase.cs
rename to Fantays.Console/Runtime/Core/DataBase/MongoDataBase.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataBase/World.cs b/Fantays.Console/Runtime/Core/DataBase/World.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataBase/World.cs
rename to Fantays.Console/Runtime/Core/DataBase/World.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/CircularBuffer.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/CircularBuffer.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/CircularBuffer.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/CircularBuffer.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyListPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyListPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyListPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyListPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyQueuePool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyQueuePool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyQueuePool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/ConcurrentOneToManyQueuePool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/HashSetPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/HashSetPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/HashSetPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/HashSetPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ListPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/ListPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ListPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/ListPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/OneToManyHashSetPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/OneToManyHashSetPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/OneToManyHashSetPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/OneToManyHashSetPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/OneToManyListPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/OneToManyListPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/OneToManyListPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/OneToManyListPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/OneToManyQueuePool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/OneToManyQueuePool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/OneToManyQueuePool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/OneToManyQueuePool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ReuseList.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/ReuseList.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/ReuseList.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/ReuseList.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/SortedConcurrentOneToManyListPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/SortedConcurrentOneToManyListPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/SortedConcurrentOneToManyListPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/SortedConcurrentOneToManyListPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyHashSetPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyHashSetPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyHashSetPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyHashSetPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyListPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyListPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyListPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Collection/SortedOneToManyListPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/DictionaryExtensions.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/DictionaryExtensions.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/DictionaryExtensions.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/DictionaryExtensions.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/DictionaryPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/DictionaryPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/DictionaryPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/DictionaryPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/DoubleMapDictionaryPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/DoubleMapDictionaryPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/DoubleMapDictionaryPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/DoubleMapDictionaryPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/EntityDictionary.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/EntityDictionary.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/EntityDictionary.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/EntityDictionary.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/OneToManyDictionaryPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/OneToManyDictionaryPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/OneToManyDictionaryPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/OneToManyDictionaryPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/OneToManySortedDictionaryPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/OneToManySortedDictionaryPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/OneToManySortedDictionaryPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/OneToManySortedDictionaryPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/ReuseDictionary.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/ReuseDictionary.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/ReuseDictionary.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/ReuseDictionary.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/SortedDictionaryPool.cs b/Fantays.Console/Runtime/Core/DataStructure/Dictionary/SortedDictionaryPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/Dictionary/SortedDictionaryPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/Dictionary/SortedDictionaryPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/LICENSE b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/LICENSE
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/LICENSE
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/LICENSE
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/BitOperationsHelpers.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/BitOperationsHelpers.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/BitOperationsHelpers.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/BitOperationsHelpers.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/HashHelpers.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/HashHelpers.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/HashHelpers.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/HashHelpers.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArray.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArray.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArray.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArray.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayPool.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayReference.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayReference.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayReference.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArrayReference.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArraySegment.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArraySegment.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArraySegment.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeArraySegment.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBitArray.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBitArray.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBitArray.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBitArray.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBuddyMemoryPool.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBuddyMemoryPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBuddyMemoryPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeBuddyMemoryPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentDictionary.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentDictionary.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentDictionary.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentDictionary.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentHashSet.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentHashSet.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentHashSet.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentHashSet.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentQueue.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentQueue.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentQueue.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentQueue.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentSpinLock.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentSpinLock.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentSpinLock.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentSpinLock.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentStack.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentStack.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentStack.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeConcurrentStack.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeDictionary.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeDictionary.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeDictionary.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeDictionary.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeHashSet.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeHashSet.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeHashSet.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeHashSet.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeList.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeList.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeList.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeList.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryAllocator.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryAllocator.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryAllocator.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryAllocator.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryArray.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryArray.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryArray.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryArray.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryBucket.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryBucket.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryBucket.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryBucket.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryPool.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryPool.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReader.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReader.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReader.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReader.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReaderExtensions.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReaderExtensions.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReaderExtensions.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryReaderExtensions.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryStream.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryStream.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryStream.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryStream.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryWriter.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryWriter.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryWriter.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMemoryWriter.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMonitorLock.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMonitorLock.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMonitorLock.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeMonitorLock.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativePriorityQueue.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativePriorityQueue.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativePriorityQueue.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativePriorityQueue.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeQueue.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeQueue.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeQueue.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeQueue.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeReference.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeReference.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeReference.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeReference.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedDictionary.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedDictionary.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedDictionary.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedDictionary.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedList.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedList.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedList.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedList.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedSet.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedSet.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedSet.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeSortedSet.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeStack.cs b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeStack.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeStack.cs
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/NativeCollections/NativeStack.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/README.md b/Fantays.Console/Runtime/Core/DataStructure/NativeCollections/README.md
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/NativeCollections/README.md
rename to Fantays.Console/Runtime/Core/DataStructure/NativeCollections/README.md
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueGenerics.cs b/Fantays.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueGenerics.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueGenerics.cs
rename to Fantays.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueGenerics.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueItem.cs b/Fantays.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueItem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueItem.cs
rename to Fantays.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueItem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueSimple.cs b/Fantays.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueSimple.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueSimple.cs
rename to Fantays.Console/Runtime/Core/DataStructure/PriorityQueue/PriorityQueueSimple.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTable.cs b/Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTable.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTable.cs
rename to Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTable.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTableBase.cs b/Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTableBase.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTableBase.cs
rename to Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTableBase.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTableDesc.cs b/Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTableDesc.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTableDesc.cs
rename to Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTableDesc.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTableNode.cs b/Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTableNode.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/DataStructure/SkipTable/SkipTableNode.cs
rename to Fantays.Console/Runtime/Core/DataStructure/SkipTable/SkipTableNode.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLock.cs b/Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLock.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLock.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLock.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockComponent.cs b/Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockComponent.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockQueue.cs b/Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockQueue.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockQueue.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/CoroutineLockQueue.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/WaitCoroutineLock.cs b/Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/WaitCoroutineLock.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/CoroutineLock/WaitCoroutineLock.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/CoroutineLock/WaitCoroutineLock.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/EntityComponent.cs b/Fantays.Console/Runtime/Core/Entitas/Component/EntityComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/EntityComponent.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/EntityComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/EventComponent/EventComponent.cs b/Fantays.Console/Runtime/Core/Entitas/Component/EventComponent/EventComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/EventComponent/EventComponent.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/EventComponent/EventComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/EventComponent/Interface/IEvent.cs b/Fantays.Console/Runtime/Core/Entitas/Component/EventComponent/Interface/IEvent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/EventComponent/Interface/IEvent.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/EventComponent/Interface/IEvent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/MessagePoolComponent.cs b/Fantays.Console/Runtime/Core/Entitas/Component/MessagePoolComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/MessagePoolComponent.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/MessagePoolComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/SingleCollectionComponent/SingleCollectionComponent.cs b/Fantays.Console/Runtime/Core/Entitas/Component/SingleCollectionComponent/SingleCollectionComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/SingleCollectionComponent/SingleCollectionComponent.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/SingleCollectionComponent/SingleCollectionComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/Interface/TimerHandler.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/Interface/TimerHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/Interface/TimerHandler.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/Interface/TimerHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/ScheduledTask.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/ScheduledTask.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/ScheduledTask.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/ScheduledTask.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/TimeWheel.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/TimeWheel.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/TimeWheel.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimeWheel/TimeWheel.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerAction.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerAction.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerAction.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerAction.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerComponent.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerComponent.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNet.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNet.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNet.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNet.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNetUnity.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNetUnity.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNetUnity.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerScheduler/TimerSchedulerNetUnity.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerType.cs b/Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerType.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerType.cs
rename to Fantays.Console/Runtime/Core/Entitas/Component/TimerComponent/TimerType.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Entity.cs b/Fantays.Console/Runtime/Core/Entitas/Entity.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Entity.cs
rename to Fantays.Console/Runtime/Core/Entitas/Entity.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/EntityPool.cs b/Fantays.Console/Runtime/Core/Entitas/EntityPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/EntityPool.cs
rename to Fantays.Console/Runtime/Core/Entitas/EntityPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/EntityReference.cs b/Fantays.Console/Runtime/Core/Entitas/EntityReference.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/EntityReference.cs
rename to Fantays.Console/Runtime/Core/Entitas/EntityReference.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISingleCollectionRoot.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISingleCollectionRoot.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISingleCollectionRoot.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISingleCollectionRoot.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedDataBase.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedDataBase.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedDataBase.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedDataBase.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedMultiEntity.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedMultiEntity.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedMultiEntity.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedMultiEntity.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedSingleCollection.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedSingleCollection.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedSingleCollection.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedSingleCollection.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedTransfer.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedTransfer.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedTransfer.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/Supported/ISupportedTransfer.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IAwakeSystem.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/System/IAwakeSystem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IAwakeSystem.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/System/IAwakeSystem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IDeserializeSystem.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/System/IDeserializeSystem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IDeserializeSystem.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/System/IDeserializeSystem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IDestroySystem.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/System/IDestroySystem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IDestroySystem.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/System/IDestroySystem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IEntitiesSystem.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/System/IEntitiesSystem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IEntitiesSystem.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/System/IEntitiesSystem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IFrameUpdateSystem.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/System/IFrameUpdateSystem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IFrameUpdateSystem.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/System/IFrameUpdateSystem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IUpdateSystem.cs b/Fantays.Console/Runtime/Core/Entitas/Interface/System/IUpdateSystem.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Entitas/Interface/System/IUpdateSystem.cs
rename to Fantays.Console/Runtime/Core/Entitas/Interface/System/IUpdateSystem.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Builder/AsyncFTaskCompletedMethodBuilder.cs b/Fantays.Console/Runtime/Core/FTask/Builder/AsyncFTaskCompletedMethodBuilder.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Builder/AsyncFTaskCompletedMethodBuilder.cs
rename to Fantays.Console/Runtime/Core/FTask/Builder/AsyncFTaskCompletedMethodBuilder.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Builder/AsyncFTaskMethodBuilder.cs b/Fantays.Console/Runtime/Core/FTask/Builder/AsyncFTaskMethodBuilder.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Builder/AsyncFTaskMethodBuilder.cs
rename to Fantays.Console/Runtime/Core/FTask/Builder/AsyncFTaskMethodBuilder.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Builder/AsyncFVoidMethodBuilder.cs b/Fantays.Console/Runtime/Core/FTask/Builder/AsyncFVoidMethodBuilder.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Builder/AsyncFVoidMethodBuilder.cs
rename to Fantays.Console/Runtime/Core/FTask/Builder/AsyncFVoidMethodBuilder.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.Extension.cs b/Fantays.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.Extension.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.Extension.cs
rename to Fantays.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.Extension.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.cs b/Fantays.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.cs
rename to Fantays.Console/Runtime/Core/FTask/FCancellationToken/FCancellationToken.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FTask.Extension/FTask.Factory.cs b/Fantays.Console/Runtime/Core/FTask/FTask.Extension/FTask.Factory.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FTask.Extension/FTask.Factory.cs
rename to Fantays.Console/Runtime/Core/FTask/FTask.Extension/FTask.Factory.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FTask.Extension/FTask.Token.cs b/Fantays.Console/Runtime/Core/FTask/FTask.Extension/FTask.Token.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FTask.Extension/FTask.Token.cs
rename to Fantays.Console/Runtime/Core/FTask/FTask.Extension/FTask.Token.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FTask.Extension/FTask.Tools.cs b/Fantays.Console/Runtime/Core/FTask/FTask.Extension/FTask.Tools.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/FTask.Extension/FTask.Tools.cs
rename to Fantays.Console/Runtime/Core/FTask/FTask.Extension/FTask.Tools.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Interface/IFTask.cs b/Fantays.Console/Runtime/Core/FTask/Interface/IFTask.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Interface/IFTask.cs
rename to Fantays.Console/Runtime/Core/FTask/Interface/IFTask.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Task/FTask.cs b/Fantays.Console/Runtime/Core/FTask/Task/FTask.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Task/FTask.cs
rename to Fantays.Console/Runtime/Core/FTask/Task/FTask.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Task/FTaskCompleted.cs b/Fantays.Console/Runtime/Core/FTask/Task/FTaskCompleted.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Task/FTaskCompleted.cs
rename to Fantays.Console/Runtime/Core/FTask/Task/FTaskCompleted.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Task/FVoid.cs b/Fantays.Console/Runtime/Core/FTask/Task/FVoid.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/FTask/Task/FVoid.cs
rename to Fantays.Console/Runtime/Core/FTask/Task/FVoid.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/ByteHelper.cs b/Fantays.Console/Runtime/Core/Helper/ByteHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/ByteHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/ByteHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/ADownload.cs b/Fantays.Console/Runtime/Core/Helper/Download/ADownload.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/ADownload.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/ADownload.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/ADownload.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/ADownload.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/ADownload.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/ADownload.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/Download.cs b/Fantays.Console/Runtime/Core/Helper/Download/Download.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/Download.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/Download.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/Download.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/Download.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/Download.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/Download.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs b/Fantays.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadAssetBundle.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs b/Fantays.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadAudioClip.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadByte.cs b/Fantays.Console/Runtime/Core/Helper/Download/DownloadByte.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadByte.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadByte.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadByte.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/DownloadByte.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadByte.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadByte.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadSprite.cs b/Fantays.Console/Runtime/Core/Helper/Download/DownloadSprite.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadSprite.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadSprite.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadSprite.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/DownloadSprite.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadSprite.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadSprite.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadText.cs b/Fantays.Console/Runtime/Core/Helper/Download/DownloadText.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadText.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadText.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadText.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/DownloadText.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadText.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadText.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadTexture.cs b/Fantays.Console/Runtime/Core/Helper/Download/DownloadTexture.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadTexture.cs
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadTexture.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadTexture.cs.meta b/Fantays.Console/Runtime/Core/Helper/Download/DownloadTexture.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/Download/DownloadTexture.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/Download/DownloadTexture.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/EncryptHelper.cs b/Fantays.Console/Runtime/Core/Helper/EncryptHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/EncryptHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/EncryptHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/FileHelper.cs b/Fantays.Console/Runtime/Core/Helper/FileHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/FileHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/FileHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HashCodeHelper.cs b/Fantays.Console/Runtime/Core/Helper/HashCodeHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HashCodeHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/HashCodeHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs b/Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs.meta b/Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientHelper.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs b/Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs
rename to Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs.meta b/Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/HttpClient/HttpClientPool.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs b/Fantays.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs
rename to Fantays.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs.meta b/Fantays.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/HttpClient/IJsonRpcRequest.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/JsonHelper.cs b/Fantays.Console/Runtime/Core/Helper/JsonHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/JsonHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/JsonHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/NetworkHelper.cs b/Fantays.Console/Runtime/Core/Helper/NetworkHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/NetworkHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/NetworkHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/RandomHelper.cs b/Fantays.Console/Runtime/Core/Helper/RandomHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/RandomHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/RandomHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/SocketHelper.cs b/Fantays.Console/Runtime/Core/Helper/SocketHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/SocketHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/SocketHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/TimeHelper.cs b/Fantays.Console/Runtime/Core/Helper/TimeHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/TimeHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/TimeHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs b/Fantays.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs.meta b/Fantays.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs.meta
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs.meta
rename to Fantays.Console/Runtime/Core/Helper/UnityWebRequest/UnityWebRequestHelper.cs.meta
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/WebSocketHelper.cs b/Fantays.Console/Runtime/Core/Helper/WebSocketHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/WebSocketHelper.cs
rename to Fantays.Console/Runtime/Core/Helper/WebSocketHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Helper/WinPeriod.cs b/Fantays.Console/Runtime/Core/Helper/WinPeriod.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Helper/WinPeriod.cs
rename to Fantays.Console/Runtime/Core/Helper/WinPeriod.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/IdFactory/EntityIdFactory.cs b/Fantays.Console/Runtime/Core/IdFactory/EntityIdFactory.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/IdFactory/EntityIdFactory.cs
rename to Fantays.Console/Runtime/Core/IdFactory/EntityIdFactory.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/IdFactory/RuntimeIdFactory.cs b/Fantays.Console/Runtime/Core/IdFactory/RuntimeIdFactory.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/IdFactory/RuntimeIdFactory.cs
rename to Fantays.Console/Runtime/Core/IdFactory/RuntimeIdFactory.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/InnerErrorCode.cs b/Fantays.Console/Runtime/Core/InnerErrorCode.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/InnerErrorCode.cs
rename to Fantays.Console/Runtime/Core/InnerErrorCode.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Log/ConsoleLog.cs b/Fantays.Console/Runtime/Core/Log/ConsoleLog.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Log/ConsoleLog.cs
rename to Fantays.Console/Runtime/Core/Log/ConsoleLog.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Log/ILog.cs b/Fantays.Console/Runtime/Core/Log/ILog.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Log/ILog.cs
rename to Fantays.Console/Runtime/Core/Log/ILog.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Log/Log.cs b/Fantays.Console/Runtime/Core/Log/Log.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Log/Log.cs
rename to Fantays.Console/Runtime/Core/Log/Log.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Log/UnityLog.cs b/Fantays.Console/Runtime/Core/Log/UnityLog.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Log/UnityLog.cs
rename to Fantays.Console/Runtime/Core/Log/UnityLog.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableHelper.cs b/Fantays.Console/Runtime/Core/Network/Addressable/AddressableHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableHelper.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/AddressableHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableManageComponent.cs b/Fantays.Console/Runtime/Core/Network/Addressable/AddressableManageComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableManageComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/AddressableManageComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableMessageComponent.cs b/Fantays.Console/Runtime/Core/Network/Addressable/AddressableMessageComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableMessageComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/AddressableMessageComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableRouteComponent.cs b/Fantays.Console/Runtime/Core/Network/Addressable/AddressableRouteComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableRouteComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/AddressableRouteComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableScene.cs b/Fantays.Console/Runtime/Core/Network/Addressable/AddressableScene.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/AddressableScene.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/AddressableScene.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableAddHandler.cs b/Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableAddHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableAddHandler.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableAddHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableGetHandler.cs b/Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableGetHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableGetHandler.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableGetHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableLockHandler.cs b/Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableLockHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableLockHandler.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableLockHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableRemoveHandler.cs b/Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableRemoveHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableRemoveHandler.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableRemoveHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableUnLockHandler.cs b/Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableUnLockHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableUnLockHandler.cs
rename to Fantays.Console/Runtime/Core/Network/Addressable/Handler/I_AddressableUnLockHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/MemoryStreamBufferPool.cs b/Fantays.Console/Runtime/Core/Network/MemoryStreamBufferPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/MemoryStreamBufferPool.cs
rename to Fantays.Console/Runtime/Core/Network/MemoryStreamBufferPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IMessageHandler.cs b/Fantays.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IMessageHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IMessageHandler.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IMessageHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IRouteMessageHandler.cs b/Fantays.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IRouteMessageHandler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IRouteMessageHandler.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Dispatcher/Interface/IRouteMessageHandler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Dispatcher/MessageDispatcherComponent.cs b/Fantays.Console/Runtime/Core/Network/Message/Dispatcher/MessageDispatcherComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Dispatcher/MessageDispatcherComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Dispatcher/MessageDispatcherComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/IMessage.cs b/Fantays.Console/Runtime/Core/Network/Message/IMessage.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/IMessage.cs
rename to Fantays.Console/Runtime/Core/Network/Message/IMessage.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/InnerMessage.cs b/Fantays.Console/Runtime/Core/Network/Message/InnerMessage.cs
similarity index 87%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/InnerMessage.cs
rename to Fantays.Console/Runtime/Core/Network/Message/InnerMessage.cs
index d30a2755..8910a34e 100644
--- a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/InnerMessage.cs
+++ b/Fantays.Console/Runtime/Core/Network/Message/InnerMessage.cs
@@ -10,6 +10,38 @@
namespace Fantasy.InnerMessage
{
[ProtoContract]
+ public sealed partial class BenchmarkMessage : AMessage, IMessage
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkMessage;
+ }
+ }
+ [ProtoContract]
+ public partial class BenchmarkRequest : AMessage, IRequest
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkRequest;
+ }
+ [ProtoIgnore]
+ public BenchmarkResponse ResponseType { get; set; }
+ [ProtoMember(1)]
+ public long RpcId { get; set; }
+ }
+
+ [ProtoContract]
+ public partial class BenchmarkResponse : AMessage, IResponse
+ {
+ public uint OpCode()
+ {
+ return Fantasy.Network.OpCode.BenchmarkResponse;
+ }
+ [ProtoMember(1)]
+ public long RpcId { get; set; }
+ [ProtoMember(2)]
+ public uint ErrorCode { get; set; }
+ }
public sealed partial class Response : AMessage, IResponse
{
public uint OpCode()
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/BufferPacketParser.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/BufferPacketParser.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/BufferPacketParser.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/BufferPacketParser.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/CircularBufferPacketParser.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/CircularBufferPacketParser.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/CircularBufferPacketParser.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/CircularBufferPacketParser.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/OuterBufferPacketParserHelper.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/OuterBufferPacketParserHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/OuterBufferPacketParserHelper.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/OuterBufferPacketParserHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/ReadOnlyMemoryPacketParser.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/ReadOnlyMemoryPacketParser.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Handler/ReadOnlyMemoryPacketParser.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Handler/ReadOnlyMemoryPacketParser.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Interface/APackInfo.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Interface/APackInfo.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Interface/APackInfo.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Interface/APackInfo.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Interface/APacketParser.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Interface/APacketParser.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Interface/APacketParser.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Interface/APacketParser.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/OpCode.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/OpCode.cs
similarity index 93%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/OpCode.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/OpCode.cs
index ee1510d7..d02105d9 100644
--- a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/OpCode.cs
+++ b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/OpCode.cs
@@ -78,6 +78,9 @@ public static class OpCodeType
public static class OpCode
{
+ public static readonly uint BenchmarkMessage = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterMessage, 8388607);
+ public static readonly uint BenchmarkRequest = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterRequest, 8388607);
+ public static readonly uint BenchmarkResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterResponse, 8388607);
public static readonly uint PingRequest = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterPingRequest, 1);
public static readonly uint PingResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.OuterPingResponse, 1);
public static readonly uint DefaultResponse = Create(OpCodeProtocolType.ProtoBuf, OpCodeType.InnerResponse, 1);
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Pack/InnerPackInfo.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Pack/InnerPackInfo.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Pack/InnerPackInfo.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Pack/InnerPackInfo.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Pack/OuterPackInfo.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Pack/OuterPackInfo.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Pack/OuterPackInfo.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Pack/OuterPackInfo.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Pack/ProcessPackInfo.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Pack/ProcessPackInfo.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Pack/ProcessPackInfo.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Pack/ProcessPackInfo.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Packet.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/Packet.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/Packet.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/Packet.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/PacketParserFactory.cs b/Fantays.Console/Runtime/Core/Network/Message/PacketParser/PacketParserFactory.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/PacketParser/PacketParserFactory.cs
rename to Fantays.Console/Runtime/Core/Network/Message/PacketParser/PacketParserFactory.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/ClientMessageScheduler.cs b/Fantays.Console/Runtime/Core/Network/Message/Scheduler/ClientMessageScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/ClientMessageScheduler.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Scheduler/ClientMessageScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/InnerMessageScheduler.cs b/Fantays.Console/Runtime/Core/Network/Message/Scheduler/InnerMessageScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/InnerMessageScheduler.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Scheduler/InnerMessageScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/Interface/ANetworkMessageScheduler.cs b/Fantays.Console/Runtime/Core/Network/Message/Scheduler/Interface/ANetworkMessageScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/Interface/ANetworkMessageScheduler.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Scheduler/Interface/ANetworkMessageScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/MessageSender.cs b/Fantays.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/MessageSender.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/MessageSender.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/MessageSender.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/NetworkMessagingComponent.cs b/Fantays.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/NetworkMessagingComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/NetworkMessagingComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/NetworkMessagingComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/OnNetworkMessageUpdateCheckTimeout.cs b/Fantays.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/OnNetworkMessageUpdateCheckTimeout.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/OnNetworkMessageUpdateCheckTimeout.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Scheduler/MessageHelper/OnNetworkMessageUpdateCheckTimeout.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/OuterMessageScheduler.cs b/Fantays.Console/Runtime/Core/Network/Message/Scheduler/OuterMessageScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Message/Scheduler/OuterMessageScheduler.cs
rename to Fantays.Console/Runtime/Core/Network/Message/Scheduler/OuterMessageScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Exception/ScanException.cs b/Fantays.Console/Runtime/Core/Network/Protocol/Exception/ScanException.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Exception/ScanException.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/Exception/ScanException.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/HTTP/HTTPServerNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/HTTP/HTTPServerNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/HTTP/HTTPServerNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/HTTP/HTTPServerNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/HTTP/SceneContextFilter.cs b/Fantays.Console/Runtime/Core/Network/Protocol/HTTP/SceneContextFilter.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/HTTP/SceneContextFilter.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/HTTP/SceneContextFilter.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/AClientNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/Interface/AClientNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/AClientNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/Interface/AClientNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/ANetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/Interface/ANetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/ANetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/Interface/ANetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/ANetworkServerChannel.cs b/Fantays.Console/Runtime/Core/Network/Protocol/Interface/ANetworkServerChannel.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/ANetworkServerChannel.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/Interface/ANetworkServerChannel.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/INetworkChannel.cs b/Fantays.Console/Runtime/Core/Network/Protocol/Interface/INetworkChannel.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/Interface/INetworkChannel.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/Interface/INetworkChannel.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Base/Kcp.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/Base/Kcp.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Base/Kcp.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/Base/Kcp.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcpc.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcpc.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcpc.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcpc.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcph.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcph.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcph.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/Base/ikcph.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Client/KCPClientNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/Client/KCPClientNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Client/KCPClientNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/Client/KCPClientNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/KCPSettings.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/KCPSettings.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/KCPSettings.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/KCPSettings.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/KcpHeader.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/KcpHeader.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/KcpHeader.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/KcpHeader.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetworkChannel.cs b/Fantays.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetworkChannel.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetworkChannel.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/KCP/Server/KCPServerNetworkChannel.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/NetworkProtocolFactory.cs b/Fantays.Console/Runtime/Core/Network/Protocol/NetworkProtocolFactory.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/NetworkProtocolFactory.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/NetworkProtocolFactory.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/NetworkProtocolType.cs b/Fantays.Console/Runtime/Core/Network/Protocol/NetworkProtocolType.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/NetworkProtocolType.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/NetworkProtocolType.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/TCP/Client/TCPClientNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/TCP/Client/TCPClientNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/TCP/Client/TCPClientNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/TCP/Client/TCPClientNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetworkChannel.cs b/Fantays.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetworkChannel.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetworkChannel.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/TCP/Server/TCPServerNetworkChannel.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetworkWebgl.cs b/Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetworkWebgl.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetworkWebgl.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Client/WebSocketClientNetworkWebgl.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetwork.cs b/Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetwork.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetwork.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetwork.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetworkChannel.cs b/Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetworkChannel.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetworkChannel.cs
rename to Fantays.Console/Runtime/Core/Network/Protocol/WebSocket/Server/WebSocketServerNetworkChannel.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Route/RouteComponent.cs b/Fantays.Console/Runtime/Core/Network/Route/RouteComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Route/RouteComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Route/RouteComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Component/ConsoleSessionHeartbeatComponent.cs b/Fantays.Console/Runtime/Core/Network/Session/Component/ConsoleSessionHeartbeatComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Component/ConsoleSessionHeartbeatComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Session/Component/ConsoleSessionHeartbeatComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Component/SessionIdleCheckerComponent.cs b/Fantays.Console/Runtime/Core/Network/Session/Component/SessionIdleCheckerComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Component/SessionIdleCheckerComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Session/Component/SessionIdleCheckerComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Component/UnitySessionHeartbeatComponent.cs b/Fantays.Console/Runtime/Core/Network/Session/Component/UnitySessionHeartbeatComponent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Component/UnitySessionHeartbeatComponent.cs
rename to Fantays.Console/Runtime/Core/Network/Session/Component/UnitySessionHeartbeatComponent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs b/Fantays.Console/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
similarity index 99%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
rename to Fantays.Console/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
index 6fc101df..d6a8caa4 100644
--- a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
+++ b/Fantays.Console/Runtime/Core/Network/Session/ProcessSession/ProcessScheduler.cs
@@ -202,7 +202,6 @@ public static void Scheduler(this ProcessSession session, Type messageType, uint
if (entity == null || entity.IsDisposed)
{
sceneMessageDispatcherComponent.FailRouteResponse(session, message.GetType(), InnerErrorCode.ErrNotFoundRoute, rpcId);
-
return;
}
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSession.cs b/Fantays.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSession.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSession.cs
rename to Fantays.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSession.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSessionInfo.cs b/Fantays.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSessionInfo.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSessionInfo.cs
rename to Fantays.Console/Runtime/Core/Network/Session/ProcessSession/ProcessSessionInfo.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Session.cs b/Fantays.Console/Runtime/Core/Network/Session/Session.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Network/Session/Session.cs
rename to Fantays.Console/Runtime/Core/Network/Session/Session.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Console/Entry.cs b/Fantays.Console/Runtime/Core/Platform/Console/Entry.cs
similarity index 98%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Console/Entry.cs
rename to Fantays.Console/Runtime/Core/Platform/Console/Entry.cs
index e49e5ed4..3f461326 100644
--- a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Console/Entry.cs
+++ b/Fantays.Console/Runtime/Core/Platform/Console/Entry.cs
@@ -55,6 +55,7 @@ public static void StartUpdate()
while (_isInit)
{
ThreadScheduler.Update();
+ Thread.Sleep(1);
}
})
{
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Console/ThreadSynchronizationContext.cs b/Fantays.Console/Runtime/Core/Platform/Console/ThreadSynchronizationContext.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Console/ThreadSynchronizationContext.cs
rename to Fantays.Console/Runtime/Core/Platform/Console/ThreadSynchronizationContext.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/MachineConfig.cs b/Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/MachineConfig.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/MachineConfig.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/MachineConfig.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/ProcessConfig.cs b/Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/ProcessConfig.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/ProcessConfig.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/ProcessConfig.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/SceneConfig.cs b/Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/SceneConfig.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/SceneConfig.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/SceneConfig.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/WorldConfig.cs b/Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/WorldConfig.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ConfigTable/WorldConfig.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/ConfigTable/WorldConfig.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/Entry.cs b/Fantays.Console/Runtime/Core/Platform/Net/Entry.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/Entry.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/Entry.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/Process.cs b/Fantays.Console/Runtime/Core/Platform/Net/Process.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/Process.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/Process.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ProcessDefine.cs b/Fantays.Console/Runtime/Core/Platform/Net/ProcessDefine.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ProcessDefine.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/ProcessDefine.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ThreadSynchronizationContext.cs b/Fantays.Console/Runtime/Core/Platform/Net/ThreadSynchronizationContext.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Net/ThreadSynchronizationContext.cs
rename to Fantays.Console/Runtime/Core/Platform/Net/ThreadSynchronizationContext.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/AppDefine.cs b/Fantays.Console/Runtime/Core/Platform/Unity/AppDefine.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/AppDefine.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/AppDefine.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonDefaultValueAttribute.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonDefaultValueAttribute.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonDefaultValueAttribute.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonDefaultValueAttribute.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonElementAttribute.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonElementAttribute.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonElementAttribute.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonElementAttribute.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIdAttribute.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIdAttribute.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIdAttribute.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIdAttribute.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreAttribute.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreAttribute.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreAttribute.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreAttribute.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfDefaultAttribute.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfDefaultAttribute.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfDefaultAttribute.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfDefaultAttribute.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfNullAttribute.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfNullAttribute.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfNullAttribute.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Attributes/BsonIgnoreIfNullAttribute.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Entry.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Entry.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Entry.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Entry.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Temp.cs b/Fantays.Console/Runtime/Core/Platform/Unity/Temp.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/Temp.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/Temp.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/ThreadSynchronizationContext.cs b/Fantays.Console/Runtime/Core/Platform/Unity/ThreadSynchronizationContext.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Platform/Unity/ThreadSynchronizationContext.cs
rename to Fantays.Console/Runtime/Core/Platform/Unity/ThreadSynchronizationContext.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Concurrent/MultiThreadPool.cs b/Fantays.Console/Runtime/Core/Pool/Concurrent/MultiThreadPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Concurrent/MultiThreadPool.cs
rename to Fantays.Console/Runtime/Core/Pool/Concurrent/MultiThreadPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Concurrent/MultiThreadPoolQueue.cs b/Fantays.Console/Runtime/Core/Pool/Concurrent/MultiThreadPoolQueue.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Concurrent/MultiThreadPoolQueue.cs
rename to Fantays.Console/Runtime/Core/Pool/Concurrent/MultiThreadPoolQueue.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Interface/IPool.cs b/Fantays.Console/Runtime/Core/Pool/Interface/IPool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Interface/IPool.cs
rename to Fantays.Console/Runtime/Core/Pool/Interface/IPool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Normal/Pool.cs b/Fantays.Console/Runtime/Core/Pool/Normal/Pool.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Normal/Pool.cs
rename to Fantays.Console/Runtime/Core/Pool/Normal/Pool.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Normal/PoolCore.cs b/Fantays.Console/Runtime/Core/Pool/Normal/PoolCore.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Normal/PoolCore.cs
rename to Fantays.Console/Runtime/Core/Pool/Normal/PoolCore.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Normal/PoolWithDisposable.cs b/Fantays.Console/Runtime/Core/Pool/Normal/PoolWithDisposable.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Pool/Normal/PoolWithDisposable.cs
rename to Fantays.Console/Runtime/Core/Pool/Normal/PoolWithDisposable.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Pool/PoolHelper.cs b/Fantays.Console/Runtime/Core/Pool/PoolHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Pool/PoolHelper.cs
rename to Fantays.Console/Runtime/Core/Pool/PoolHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/ISceneUpdate.cs b/Fantays.Console/Runtime/Core/Scene/ISceneUpdate.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/ISceneUpdate.cs
rename to Fantays.Console/Runtime/Core/Scene/ISceneUpdate.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/OnCreateSceneEvent.cs b/Fantays.Console/Runtime/Core/Scene/OnCreateSceneEvent.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/OnCreateSceneEvent.cs
rename to Fantays.Console/Runtime/Core/Scene/OnCreateSceneEvent.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scene.cs b/Fantays.Console/Runtime/Core/Scene/Scene.cs
similarity index 98%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scene.cs
rename to Fantays.Console/Runtime/Core/Scene/Scene.cs
index f91696d5..803c1a80 100644
--- a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scene.cs
+++ b/Fantays.Console/Runtime/Core/Scene/Scene.cs
@@ -502,13 +502,13 @@ public Session GetSession(long runTimeId)
_processSessionInfos.Remove(sceneId);
}
- // if (Process.IsInAppliaction(ref sceneId))
- // {
- // // 如果在同一个Process下,不需要通过Socket发送了,直接通过Process下转发。
- // var processSession = Session.CreateInnerSession(Scene);
- // _processSessionInfos.Add(sceneId, new ProcessSessionInfo(processSession, null));
- // return processSession;
- // }
+ if (Process.IsInAppliaction(ref sceneId))
+ {
+ // 如果在同一个Process下,不需要通过Socket发送了,直接通过Process下转发。
+ var processSession = Session.CreateInnerSession(Scene);
+ _processSessionInfos.Add(sceneId, new ProcessSessionInfo(processSession, null));
+ return processSession;
+ }
if (!SceneConfigData.Instance.TryGet(sceneId, out var sceneConfig))
{
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/ISceneScheduler.cs b/Fantays.Console/Runtime/Core/Scene/Scheduler/ISceneScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/ISceneScheduler.cs
rename to Fantays.Console/Runtime/Core/Scene/Scheduler/ISceneScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/MainScheduler.cs b/Fantays.Console/Runtime/Core/Scene/Scheduler/MainScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/MainScheduler.cs
rename to Fantays.Console/Runtime/Core/Scene/Scheduler/MainScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/MultiThreadScheduler.cs b/Fantays.Console/Runtime/Core/Scene/Scheduler/MultiThreadScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/MultiThreadScheduler.cs
rename to Fantays.Console/Runtime/Core/Scene/Scheduler/MultiThreadScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/ThreadPoolScheduler.cs b/Fantays.Console/Runtime/Core/Scene/Scheduler/ThreadPoolScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/ThreadPoolScheduler.cs
rename to Fantays.Console/Runtime/Core/Scene/Scheduler/ThreadPoolScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/ThreadScheduler.cs b/Fantays.Console/Runtime/Core/Scene/Scheduler/ThreadScheduler.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Scene/Scheduler/ThreadScheduler.cs
rename to Fantays.Console/Runtime/Core/Scene/Scheduler/ThreadScheduler.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/BsonPack/BsonPackHelper.cs b/Fantays.Console/Runtime/Core/Serialize/BsonPack/BsonPackHelper.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/BsonPack/BsonPackHelper.cs
rename to Fantays.Console/Runtime/Core/Serialize/BsonPack/BsonPackHelper.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/BsonPack/StructBsonSerialize.cs b/Fantays.Console/Runtime/Core/Serialize/BsonPack/StructBsonSerialize.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/BsonPack/StructBsonSerialize.cs
rename to Fantays.Console/Runtime/Core/Serialize/BsonPack/StructBsonSerialize.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/BsonPack/SupportInitializeChecker.cs b/Fantays.Console/Runtime/Core/Serialize/BsonPack/SupportInitializeChecker.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/BsonPack/SupportInitializeChecker.cs
rename to Fantays.Console/Runtime/Core/Serialize/BsonPack/SupportInitializeChecker.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/Interface/ASerialize.cs b/Fantays.Console/Runtime/Core/Serialize/Interface/ASerialize.cs
similarity index 94%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/Interface/ASerialize.cs
rename to Fantays.Console/Runtime/Core/Serialize/Interface/ASerialize.cs
index 55c3e540..7487b86d 100644
--- a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/Interface/ASerialize.cs
+++ b/Fantays.Console/Runtime/Core/Serialize/Interface/ASerialize.cs
@@ -2,11 +2,12 @@
using System.ComponentModel;
using System.Runtime.Serialization;
using Fantasy.Pool;
+#if FANTASY_NET || FANTASY_UNITY || FANTASY_CONSOLE
using MongoDB.Bson.Serialization.Attributes;
+#endif
using Newtonsoft.Json;
using ProtoBuf;
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-
#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
@@ -38,7 +39,9 @@ public void SetScene(Scene scene)
_scene = scene;
}
#endif
+#if FANTASY_NET
[BsonIgnore]
+#endif
[JsonIgnore]
[IgnoreDataMember]
[ProtoIgnore]
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/Interface/ISerialize.cs b/Fantays.Console/Runtime/Core/Serialize/Interface/ISerialize.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/Interface/ISerialize.cs
rename to Fantays.Console/Runtime/Core/Serialize/Interface/ISerialize.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/MemoryStreamBuffer.cs b/Fantays.Console/Runtime/Core/Serialize/MemoryStreamBuffer.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/MemoryStreamBuffer.cs
rename to Fantays.Console/Runtime/Core/Serialize/MemoryStreamBuffer.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/ProtoBufPackHelper/IProto.cs b/Fantays.Console/Runtime/Core/Serialize/ProtoBufPackHelper/IProto.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/ProtoBufPackHelper/IProto.cs
rename to Fantays.Console/Runtime/Core/Serialize/ProtoBufPackHelper/IProto.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperNet.cs b/Fantays.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperNet.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperNet.cs
rename to Fantays.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperNet.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperUnity.cs b/Fantays.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperUnity.cs
similarity index 100%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperUnity.cs
rename to Fantays.Console/Runtime/Core/Serialize/ProtoBufPackHelper/ProtoBufPackHelperUnity.cs
diff --git a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/SerializerManager.cs b/Fantays.Console/Runtime/Core/Serialize/SerializerManager.cs
similarity index 99%
rename from Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/SerializerManager.cs
rename to Fantays.Console/Runtime/Core/Serialize/SerializerManager.cs
index 56d01243..8c7a0b30 100644
--- a/Fantays.Console/Fantasy.Console/Runtime/Core/Serialize/SerializerManager.cs
+++ b/Fantays.Console/Runtime/Core/Serialize/SerializerManager.cs
@@ -2,7 +2,9 @@
using System.Collections.Generic;
using Fantasy.Assembly;
using Fantasy.Helper;
+#if !FANTASY_EXPORTER
using Fantasy.Network;
+#endif
using ProtoBuf;
#pragma warning disable CS8604 // Possible null reference argument.
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
diff --git a/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.dll b/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.dll
index 4e16c56c..691c3ecb 100644
Binary files a/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.dll and b/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.dll differ
diff --git a/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.pdb b/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.pdb
index 082e1264..e28ebf3c 100644
Binary files a/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.pdb and b/Tools/Exporter/ConfigTable/Fantasy.Tools.ConfigTable.pdb differ
diff --git a/Tools/Exporter/ConfigTable/Run.bat b/Tools/Exporter/ConfigTable/Run.bat
index d756e175..e166f0ec 100644
--- a/Tools/Exporter/ConfigTable/Run.bat
+++ b/Tools/Exporter/ConfigTable/Run.bat
@@ -9,13 +9,13 @@ set /p choice=Please select an option:
if "%choice%"=="1" (
echo Client
- dotnet Exporter.dll --ExportPlatform 1
+ dotnet Fantasy.Tools.ConfigTable.dll --ExportPlatform 1
) else if "%choice%"=="2" (
echo Server
- dotnet Exporter.dll --ExportPlatform 2
+ dotnet Fantasy.Tools.ConfigTable.dll --ExportPlatform 2
) else if "%choice%"=="3" (
echo All
- dotnet Exporter.dll --ExportPlatform 3
+ dotnet Fantasy.Tools.ConfigTable.dll --ExportPlatform 3
) else (
echo Invalid option
)
diff --git a/Tools/Exporter/NetworkProtocol/ExporterSettings.json b/Tools/Exporter/NetworkProtocol/ExporterSettings.json
old mode 100755
new mode 100644
diff --git a/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.dll b/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.dll
old mode 100755
new mode 100644
index 014a40f8..45004ebb
Binary files a/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.dll and b/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.dll differ
diff --git a/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.pdb b/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.pdb
old mode 100755
new mode 100644
index a64337f9..3f8b4ad6
Binary files a/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.pdb and b/Tools/Exporter/NetworkProtocol/Fantasy.Tools.NetworkProtocol.pdb differ
diff --git a/Tools/Exporter/NetworkProtocol/Run.bat b/Tools/Exporter/NetworkProtocol/Run.bat
old mode 100755
new mode 100644
diff --git a/Tools/Exporter/NetworkProtocol/Run.sh b/Tools/Exporter/NetworkProtocol/Run.sh
old mode 100755
new mode 100644
diff --git a/examples/Console/Fantasy.Console.Entity/Entry.cs b/examples/Console/Fantasy.Console.Entity/Entry.cs
index 3e327c09..a9e9ad3c 100644
--- a/examples/Console/Fantasy.Console.Entity/Entry.cs
+++ b/examples/Console/Fantasy.Console.Entity/Entry.cs
@@ -5,12 +5,12 @@ namespace Fantasy.Console.Entity;
public static class Entry
{
- public static Scene Scene;
- private static Session Session;
+ private static Scene _scene;
+ private static Session _session;
public static async FTask Show()
{
- Scene = await Fantasy.Scene.Create(SceneRuntimeType.MainThread);
- Session = Scene.Connect(
+ _scene = await Fantasy.Scene.Create(SceneRuntimeType.MainThread);
+ _session = _scene.Connect(
"127.0.0.1:20000",
NetworkProtocolType.KCP,
OnConnectComplete,
@@ -22,11 +22,12 @@ public static async FTask Show()
private static void OnConnectComplete()
{
Log.Debug("连接成功");
+ // Session.AddComponent();
// 添加心跳组件给Session。
// Start(2000)就是2000毫秒。
- Session.AddComponent().Start(2000);
-
- Session.Send(new C2G_TestMessage()
+ _session.AddComponent().Start(2000);
+
+ _session.Send(new C2G_TestMessage()
{
Tag = "111111111111"
});
diff --git a/examples/Console/Fantasy.Console.Main/Program.cs b/examples/Console/Fantasy.Console.Main/Program.cs
index d532db7e..7d98c30f 100644
--- a/examples/Console/Fantasy.Console.Main/Program.cs
+++ b/examples/Console/Fantasy.Console.Main/Program.cs
@@ -1,10 +1,7 @@
-// See https://aka.ms/new-console-template for more information
-
-using Fantasy;
+using Fantasy;
using Fantasy.Console.Entity;
-
Fantasy.Log.Register(new ConsoleLog());
Fantasy.Platform.Console.Entry.Initialize(typeof(Fantasy.Console.Entity.Entry).Assembly);
-
-Thread.Sleep(3000);
-await Entry.Show();
\ No newline at end of file
+Fantasy.Platform.Console.Entry.StartUpdate();
+Entry.Show().Coroutine();
+Console.ReadKey();
\ No newline at end of file
diff --git a/examples/Console/Fantasy.Console.sln.DotSettings.user b/examples/Console/Fantasy.Console.sln.DotSettings.user
new file mode 100644
index 00000000..37d33c7a
--- /dev/null
+++ b/examples/Console/Fantasy.Console.sln.DotSettings.user
@@ -0,0 +1,2 @@
+
+ ForceIncluded
\ No newline at end of file
diff --git a/examples/Server/Fantasy.Generator/Class1.cs b/examples/Server/Fantasy.Generator/Class1.cs
deleted file mode 100644
index 0248611a..00000000
--- a/examples/Server/Fantasy.Generator/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Fantasy.Generator
-{
- public class Class1
- {
- }
-}
\ No newline at end of file
diff --git a/examples/Server/Fantasy.Generator/Fantasy.Generator.csproj b/examples/Server/Fantasy.Generator/Fantasy.Generator.csproj
deleted file mode 100644
index 1b35273c..00000000
--- a/examples/Server/Fantasy.Generator/Fantasy.Generator.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- netstandard2.0
- 11
-
-
-