调整目录结构

Apps/App/Apps.App.csproj → DotNet/App/DotNet.App.csproj

@@ -32,6 +32,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Model\Apps.Model.csproj" />
+    <ProjectReference Include="..\Model\DotNet.Model.csproj" />
   </ItemGroup>
 </Project>

Apps/Core/Apps.Core.csproj → DotNet/Core/DotNet.Core.csproj

@@ -6,6 +6,11 @@
         <Nullable>disable</Nullable>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    </PropertyGroup>
+
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <DefineConstants>TRACE;APPS</DefineConstants>
@@ -21,13 +26,13 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <Compile Include="..\..\Unity\Assets\Core\**\*.cs">
+        <Compile Include="..\..\Unity\Assets\Scripts\Core\**\*.cs">
             <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
     </ItemGroup>
     
     <ItemGroup>
-      <ProjectReference Include="..\ThirdParty\Apps.ThirdParty.csproj" />
+      <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
     </ItemGroup>
 
 </Project>

Apps/Hotfix/AppStart_Init.cs → DotNet/Hotfix/AppStart_Init.cs

@@ -1,12 +1,13 @@
-using System;
 using System.Net;
+using ET.Server;
+using ET.Client;
 
 namespace ET
 {
     [Event(SceneType.Process)]
-    public class AppStart_Init: AEvent<Scene, EventType.AppStart>
+    public class AppStart_Init: AEvent<Scene, ET.EventType.AppStart>
     {
-        protected override async ETTask Run(Scene scene, EventType.AppStart args)
+        protected override async ETTask Run(Scene scene, ET.EventType.AppStart args)
         {
             Game.Scene.AddComponent<ConfigComponent>();
             await ConfigComponent.Instance.LoadAsync();
@@ -31,7 +32,7 @@ namespace ET
 
             #region 机器人使用
 
-            Game.Scene.AddComponent<Client.ClientSceneManagerComponent>();
+            Game.Scene.AddComponent<ClientSceneManagerComponent>();
             Game.Scene.AddComponent<RobotCaseDispatcherComponent>();
             Game.Scene.AddComponent<RobotCaseComponent>();
 

Apps/Hotfix/Apps.Hotfix.csproj → DotNet/Hotfix/DotNet.Hotfix.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework> 
         <RootNamespace>ET</RootNamespace>
         <LangVersion>10</LangVersion>
         <AssemblyName>Hotfix</AssemblyName>
@@ -34,7 +34,10 @@
         </Compile>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Model\Apps.Model.csproj" />
         <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\Model\DotNet.Model.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Server\Scenes" />
     </ItemGroup>
 </Project>

Apps/Hotfix/Module/AOI/AOIEntitySystem.cs → DotNet/Hotfix/Server/Module/AOI/AOIEntitySystem.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(AOIEntity))]
     [FriendOf(typeof(Cell))]

Apps/Hotfix/Module/AOI/AOIHelper.cs → DotNet/Hotfix/Server/Module/AOI/AOIHelper.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(AOIEntity))]
     public static class AOIHelper

Apps/Hotfix/Module/AOI/AOIManagerComponentSystem.cs → DotNet/Hotfix/Server/Module/AOI/AOIManagerComponentSystem.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(AOIManagerComponent))]
     [FriendOf(typeof(AOIEntity))]

Apps/Hotfix/Module/AOI/AOISeeCheckHelper.cs → DotNet/Hotfix/Server/Module/AOI/AOISeeCheckHelper.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
     public static class AOISeeCheckHelper
     {

Apps/Hotfix/Module/AOI/CellSystem.cs → DotNet/Hotfix/Server/Module/AOI/CellSystem.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(Cell))]
     public static class CellSystem

Apps/Hotfix/Module/Actor/ActorHelper.cs → DotNet/Hotfix/Server/Module/Actor/ActorHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace ET
+namespace ET.Server
 {
     public static class ActorHelper
     {

Apps/Hotfix/Module/Actor/ActorMessageDispatcherComponentSystem.cs → DotNet/Hotfix/Server/Module/Actor/ActorMessageDispatcherComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     /// <summary>
     /// Actor消息分发组件

Apps/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs → DotNet/Hotfix/Server/Module/Actor/ActorMessageSenderComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(ActorMessageSenderComponent))]
     public static class ActorMessageSenderComponentSystem

Apps/Hotfix/Module/Actor/MailBoxComponentSystem.cs → DotNet/Hotfix/Server/Module/Actor/MailBoxComponentSystem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ObjectSystem]
     public class MailBoxComponentAwakeSystem: AwakeSystem<MailBoxComponent>

Apps/Hotfix/Module/ActorLocation/ActorLocationSenderComponentSystem.cs → DotNet/Hotfix/Server/Module/ActorLocation/ActorLocationSenderComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace ET
+namespace ET.Server
 {
     [Callback(CallbackType.ActorLocationSenderChecker)]
     public class ActorLocationSenderChecker: ATimer<ActorLocationSenderComponent>

Apps/Hotfix/Module/ActorLocation/ActorLocationSenderSystem.cs → DotNet/Hotfix/Server/Module/ActorLocation/ActorLocationSenderSystem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ObjectSystem]
     public class ActorLocationSenderAwakeSystem: AwakeSystem<ActorLocationSender>

Apps/Hotfix/Module/ActorLocation/LocationComponentSystem.cs → DotNet/Hotfix/Server/Module/ActorLocation/LocationComponentSystem.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
     [ObjectSystem]
     public class LockInfoAwakeSystem: AwakeSystem<LockInfo, long, CoroutineLock>

Apps/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs → DotNet/Hotfix/Server/Module/ActorLocation/LocationProxyComponentSystem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ObjectSystem]
     public class LocationProxyComponentAwakeSystem: AwakeSystem<LocationProxyComponent>

Apps/Hotfix/Module/ActorLocation/ObjectAddRequestHandler.cs → DotNet/Hotfix/Server/Module/ActorLocation/ObjectAddRequestHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ActorMessageHandler(SceneType.Location)]
     public class ObjectAddRequestHandler: AMActorRpcHandler<Scene, ObjectAddRequest, ObjectAddResponse>

Apps/Hotfix/Module/ActorLocation/ObjectGetRequestHandler.cs → DotNet/Hotfix/Server/Module/ActorLocation/ObjectGetRequestHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ActorMessageHandler(SceneType.Location)]
     public class ObjectGetRequestHandler: AMActorRpcHandler<Scene, ObjectGetRequest, ObjectGetResponse>

Apps/Hotfix/Module/ActorLocation/ObjectLockRequestHandler.cs → DotNet/Hotfix/Server/Module/ActorLocation/ObjectLockRequestHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ActorMessageHandler(SceneType.Location)]
     public class ObjectLockRequestHandler: AMActorRpcHandler<Scene, ObjectLockRequest, ObjectLockResponse>

Apps/Hotfix/Module/ActorLocation/ObjectRemoveRequestHandler.cs → DotNet/Hotfix/Server/Module/ActorLocation/ObjectRemoveRequestHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ActorMessageHandler(SceneType.Location)]
     public class ObjectRemoveRequestHandler: AMActorRpcHandler<Scene, ObjectRemoveRequest, ObjectRemoveResponse>

Apps/Hotfix/Module/ActorLocation/ObjectUnLockRequestHandler.cs → DotNet/Hotfix/Server/Module/ActorLocation/ObjectUnLockRequestHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [ActorMessageHandler(SceneType.Location)]
     public class ObjectUnLockRequestHandler: AMActorRpcHandler<Scene, ObjectUnLockRequest, ObjectUnLockResponse>

Apps/Hotfix/Module/Console/ConsoleComponentSystem.cs → DotNet/Hotfix/Server/Module/Console/ConsoleComponentSystem.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(ConsoleComponent))]
     [FriendOf(typeof(ModeContex))]

Apps/Hotfix/Module/Console/ReloadConfigConsoleHandler.cs → DotNet/Hotfix/Server/Module/Console/ReloadConfigConsoleHandler.cs

@@ -1,7 +1,7 @@
 using System;
 using NLog;
 
-namespace ET
+namespace ET.Server
 {
     [ConsoleHandler(ConsoleMode.ReloadConfig)]
     public class ReloadConfigConsoleHandler: IConsoleHandler

Apps/Hotfix/Module/Console/ReloadDllConsoleHandler.cs → DotNet/Hotfix/Server/Module/Console/ReloadDllConsoleHandler.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     [ConsoleHandler(ConsoleMode.ReloadDll)]
     public class ReloadDllConsoleHandler: IConsoleHandler

Apps/Hotfix/Module/DB/DBComponentSystem.cs → DotNet/Hotfix/Server/Module/DB/DBComponentSystem.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq.Expressions;
 using MongoDB.Driver;
 
-namespace ET
+namespace ET.Server
 {
 	[FriendOf(typeof(DBComponent))]
     public static class DBComponentSystem

Apps/Hotfix/Module/DB/DBManagerComponentSystem.cs → DotNet/Hotfix/Server/Module/DB/DBManagerComponentSystem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(DBManagerComponent))]
     public static class DBManagerComponentSystem

Apps/Hotfix/Module/Http/HttpComponentSystem.cs → DotNet/Hotfix/Server/Module/Http/HttpComponentSystem.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(HttpComponent))]
     public static class HttpComponentSystem

Apps/Hotfix/Module/MessageInner/NetInnerComponentSystem.cs → DotNet/Hotfix/Server/Module/MessageInner/NetInnerComponentSystem.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using System.Net;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(NetInnerComponent))]
     [FriendOf(typeof(NetThreadComponent))]

Apps/Hotfix/Module/RobotCase/RobotCaseComponentSystem.cs → DotNet/Hotfix/Server/Module/RobotCase/RobotCaseComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(RobotCaseComponent))]
     public static class RobotCaseComponentSystem

Apps/Hotfix/Module/RobotCase/RobotCaseDispatcherComponentSystem.cs → DotNet/Hotfix/Server/Module/RobotCase/RobotCaseDispatcherComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(RobotCaseDispatcherComponent))]
     [FriendOf(typeof(RobotCase))]

Apps/Hotfix/Module/Router/RouterComponentSystem.cs → DotNet/Hotfix/Server/Module/Router/RouterComponentSystem.cs

@@ -3,7 +3,7 @@ using System.Net;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof (RouterComponent))]
     [FriendOf(typeof (RouterNode))]

Apps/Hotfix/Module/Router/RouterNodeSystem.cs → DotNet/Hotfix/Server/Module/Router/RouterNodeSystem.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(RouterNode))]
     public static class RouterNodeSystem

Apps/Hotfix/Server/Gate/C2G_PingHandler.cs → DotNet/Hotfix/Server/Scenes/Gate/C2G_PingHandler.cs

@@ -1,7 +1,7 @@
 using System;
 
 
-namespace ET
+namespace ET.Server
 {
 	[MessageHandler(SceneType.Gate)]
 	public class C2G_PingHandler : AMRpcHandler<C2G_Ping, G2C_Ping>

Apps/Hotfix/Watcher/WatcherComponentSystem.cs → DotNet/Hotfix/Server/Scenes/Watcher/WatcherComponentSystem.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Diagnostics;
 
-namespace ET
+namespace ET.Server
 {
     [FriendOf(typeof(WatcherComponent))]
     public static class WatcherComponentSystem

Apps/Hotfix/Watcher/WatcherHelper.cs → DotNet/Hotfix/Server/Scenes/Watcher/WatcherHelper.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections;
 using System.Diagnostics;
 
-namespace ET
+namespace ET.Server
 {
     public static class WatcherHelper
     {

Apps/Model/Apps.Model.csproj → DotNet/Model/DotNet.Model.csproj

@@ -24,7 +24,7 @@
     <ItemGroup>
 
         <Compile Include="..\..\Unity\Assets\Mono\Core\**\*.cs">
-            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>  
         </Compile>
 
         <Compile Include="..\..\Unity\Codes\Model\Module\**\*.cs">
@@ -40,11 +40,11 @@
         </Compile>
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Core\Apps.Core.csproj" />
-        <ProjectReference Include="..\ThirdParty\Apps.ThirdParty.csproj" />
         <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+        <ProjectReference Include="..\Core\DotNet.Core.csproj" />
+        <ProjectReference Include="..\ThirdParty\DotNet.ThirdParty.csproj" />
     </ItemGroup>
     <ItemGroup>
-      <Folder Include="Server\Map" />
+      <Folder Include="Server\Scenes" />
     </ItemGroup>
 </Project>

Apps/Model/Module/AOI/AOIEntity.cs → DotNet/Model/Server/Module/AOI/AOIEntity.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace ET
+namespace ET.Server
 {
     [ComponentOf(typeof(Unit))]
     public class AOIEntity: Entity, IAwake<int, Vector3>, IDestroy

Apps/Model/Module/AOI/AOIEventType.cs → DotNet/Model/Server/Module/AOI/AOIEventType.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
 	namespace EventType
 	{

Apps/Model/Module/AOI/AOIManagerComponent.cs → DotNet/Model/Server/Module/AOI/AOIManagerComponent.cs

@@ -1,4 +1,4 @@
-namespace ET
+namespace ET.Server
 {
     [ChildType(typeof(Cell))]
     [ComponentOf(typeof(Scene))]

Apps/Model/Module/AOI/Cell.cs → DotNet/Model/Server/Module/AOI/Cell.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ET
+namespace ET.Server
 {
     public class Cell: Entity, IAwake, IDestroy
     {

Apps/Model/Module/Actor/AMActorHandler.cs → DotNet/Model/Server/Module/Actor/AMActorHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     public abstract class AMActorHandler<E, Message>: IMActorHandler where E : Entity where Message : class, IActorMessage
     {

Apps/Model/Module/Actor/AMActorRpcHandler.cs → DotNet/Model/Server/Module/Actor/AMActorRpcHandler.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ET
+namespace ET.Server
 {
     public abstract class AMActorRpcHandler<E, Request, Response>: IMActorHandler where E : Entity where Request : class, IActorRequest where Response : class, IActorResponse
     {