客户端服务端抽出Core工程，放核心代码

Apps/App/Program.cs

@@ -20,9 +20,11 @@ namespace ET
 			SynchronizationContext.SetSynchronizationContext(ThreadSynchronizationContext.Instance);
 			
 			try
-			{		
+			{	
 				Game.EventSystem.Add(typeof(Game).Assembly);
+				Game.EventSystem.Add(typeof(Unit).Assembly);
 				Game.EventSystem.Add(DllHelper.GetHotfixAssembly());
+				Game.EventSystem.LoadAllAssembliesType();
 				
 				ProtobufHelper.Init();
 				MongoHelper.Register(Game.EventSystem.GetTypes());

Apps/Core/Apps.Core.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <DefineConstants>TRACE;APPS</DefineConstants>
+      <OutputPath>..\..\Bin\</OutputPath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+      <DefineConstants>TRACE;APPS</DefineConstants>
+      <OutputPath>..\..\Bin\</OutputPath>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <Compile Include="..\..\Unity\Assets\Core\**\*.cs">
+            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
+    </ItemGroup>
+    
+    <ItemGroup>
+      <ProjectReference Include="..\ThirdParty\Apps.ThirdParty.csproj" />
+    </ItemGroup>
+
+</Project>

Apps/Hotfix/AppStart_Init.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Net;
 
-namespace ET.Server
+namespace ET
 {
     [Event(SceneType.Process)]
-    public class AppStart_Init: AEvent<Scene, ET.EventType.AppStart>
+    public class AppStart_Init: AEvent<Scene, EventType.AppStart>
     {
-        protected override async ETTask Run(Scene scene, ET.EventType.AppStart args)
+        protected override async ETTask Run(Scene scene, EventType.AppStart args)
         {
             Game.Scene.AddComponent<ConfigComponent>().ConfigLoader = new ConfigLoader();
             await ConfigComponent.Instance.LoadAsync();

Apps/Hotfix/Module/Console/ReloadDllConsoleHandler.cs

@@ -11,6 +11,7 @@ namespace ET
                     contex.Parent.RemoveComponent<ModeContex>();
                     
                     Game.EventSystem.Add(DllHelper.GetHotfixAssembly());
+                    Game.EventSystem.LoadAllAssembliesType();
                     Game.EventSystem.Load();
                     break;
             }

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

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

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

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

Apps/Model/Apps.Model.csproj

@@ -23,9 +23,7 @@
     </PropertyGroup>
     <ItemGroup>
 
-        <Compile Include="..\..\Unity\Codes\Model\Core\**\*.cs">
-            <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
-        </Compile>
+
 
         <Compile Include="..\..\Unity\Codes\Model\Module\Recast\**\*.cs">
             <Link>Module\Recast\%(RecursiveDir)%(FileName)%(Extension)</Link>
@@ -40,6 +38,14 @@
             <Link>Module\Config\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
+        <Compile Include="..\..\Unity\Codes\Model\Module\ObjectWait\**\*.cs">
+            <Link>Module\ObjectWait\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
+
+        <Compile Include="..\..\Unity\Codes\Model\Module\Timer\**\*.cs">
+            <Link>Module\Timer\%(RecursiveDir)%(FileName)%(Extension)</Link>
+        </Compile>
+
         <Compile Include="..\..\Unity\Codes\Model\Module\AI\**\*.cs">
             <Link>Module\AI\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
@@ -80,7 +86,7 @@
             <Link>Module\Message\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
 
-        <Compile Include="..\..\Unity\Codes\Model\Client\**\*.cs">
+        <Compile Include="..\..\Unity\Codes\Model\Client\**\*.cs"> 
             <Link>Client\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>
         <Compile Include="..\..\Unity\Codes\Model\Share\**\*.cs">
@@ -88,6 +94,7 @@
         </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" />
     </ItemGroup>

Apps/Model/Base/ConfigLoader.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace ET.Server
+namespace ET
 {
     public class ConfigLoader: IConfigLoader
     {

Unity/Assets/Mono/Core/Log/NLogger.cs → Apps/Model/Base/NLogger.cs

@@ -1,5 +1,4 @@
-#if APPS
-using NLog;
+using NLog;
 
 namespace ET
 {
@@ -72,5 +71,4 @@ namespace ET
             this.logger.Fatal(message, args);
         }
     }
-}
-#endif
+}

Apps/Model/Server/Watcher/WatcherComponent.cs → Apps/Model/Watcher/WatcherComponent.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace ET.Server
+namespace ET
 {
     [ComponentOf(typeof(Scene))]
     public class WatcherComponent: Entity, IAwake, IDestroy

Apps/Tool/Apps.Tool.csproj

@@ -58,6 +58,7 @@
     </ItemGroup>
     
     <ItemGroup>
+      <ProjectReference Include="..\Core\Apps.Core.csproj" />
       <ProjectReference Include="..\ThirdParty\Apps.ThirdParty.csproj" />
     </ItemGroup>
 

ET.sln

@@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.Model", "Apps\Model\Ap
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.Hotfix", "Apps\Hotfix\Apps.Hotfix.csproj", "{492D9D9D-09FB-4757-B486-E56322605113}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.App", "Apps\App\Apps.App.csproj", "{B7A8A3FD-69EC-4156-8076-F33E98392601}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.ThirdParty", "Apps\ThirdParty\Apps.ThirdParty.csproj", "{E411076A-B800-457D-A36D-06EC716B2663}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.Tool", "Apps\Tool\Apps.Tool.csproj", "{21A2F73C-A935-42B7-A487-3962718CE29F}"
@@ -35,6 +33,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Share", "Share", "{310F62C7
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.Analyzer", "Share\Analyzer\Share.Analyzer.csproj", "{B3FA1A14-2C98-4893-974A-766791A1E655}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.App", "Apps\App\Apps.App.csproj", "{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apps.Core", "Apps\Core\Apps.Core.csproj", "{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Core", "Unity\Unity.Core.csproj", "{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -153,18 +157,6 @@ Global
 		{492D9D9D-09FB-4757-B486-E56322605113}.Release|x64.Build.0 = Release|Any CPU
 		{492D9D9D-09FB-4757-B486-E56322605113}.Release|x86.ActiveCfg = Release|Any CPU
 		{492D9D9D-09FB-4757-B486-E56322605113}.Release|x86.Build.0 = Release|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x64.Build.0 = Debug|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Debug|x86.Build.0 = Debug|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x64.ActiveCfg = Release|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x64.Build.0 = Release|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x86.ActiveCfg = Release|Any CPU
-		{B7A8A3FD-69EC-4156-8076-F33E98392601}.Release|x86.Build.0 = Release|Any CPU
 		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E411076A-B800-457D-A36D-06EC716B2663}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -201,6 +193,42 @@ Global
 		{B3FA1A14-2C98-4893-974A-766791A1E655}.Release|x64.Build.0 = Release|Any CPU
 		{B3FA1A14-2C98-4893-974A-766791A1E655}.Release|x86.ActiveCfg = Release|Any CPU
 		{B3FA1A14-2C98-4893-974A-766791A1E655}.Release|x86.Build.0 = Release|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Debug|x86.Build.0 = Debug|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Release|x64.Build.0 = Release|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Release|x86.ActiveCfg = Release|Any CPU
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38}.Release|x86.Build.0 = Release|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Debug|x64.Build.0 = Debug|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Debug|x86.Build.0 = Debug|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Release|x64.ActiveCfg = Release|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Release|x64.Build.0 = Release|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Release|x86.ActiveCfg = Release|Any CPU
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D}.Release|x86.Build.0 = Release|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.Build.0 = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.ActiveCfg = Debug|Any CPU
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -215,10 +243,12 @@ Global
 		{D2AD5BE1-263A-9A30-AB0F-DC5B08044350} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{1082AF19-6624-4CFA-92CD-F6AA2AE5B364} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{492D9D9D-09FB-4757-B486-E56322605113} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{B7A8A3FD-69EC-4156-8076-F33E98392601} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{E411076A-B800-457D-A36D-06EC716B2663} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{21A2F73C-A935-42B7-A487-3962718CE29F} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{B3FA1A14-2C98-4893-974A-766791A1E655} = {310F62C7-3732-49D7-ACC1-616703F4FE75}
+		{C4FC44D0-A38D-4AA2-B1E2-B88F149D8C38} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{BFEA0539-A871-4F1D-AB92-BCA26ABD402D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
+		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

Unity/Assets/Mono/Core.meta → Unity/Assets/Core.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 22070597d409c4949a85eea7076baea7
+guid: 5f9347693956b9c4a9e212c5d8140cb1
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Mono/Module/Message.meta → Unity/Assets/Core/Entity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9939995d138da85478061f0a24f34e65
+guid: fcb9e48c46883d34e9f95f17b49a1959
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Mono/Core/Log/FileLogger.cs.meta → Unity/Assets/Core/Entity/EntitySceneFactory.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9dbc36c7ee521f34e90cce63cee65af5
+guid: b90f5194adcf079438a94453e3aa314d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Mono/Core/Log/NLogger.cs.meta → Unity/Assets/Core/Entity/Game.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 956d9417b1a511c4682e01ccbb38dd6a
+guid: 99d2c9961148b38438dae0f63d791cdb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Core/Entity/Scene.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 28c4c109868033245b38e07cfaea91aa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Core/Entity/SceneType.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8cd5baf93e9889c4ca7764129255fe56
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Mono/Module/Mongo.meta → Unity/Assets/Core/Event.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f63e576faec01438bad600ad19afb2f2
+guid: 8ac10036dd2757e4cac6d6788348d25a
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Core/Event/EventAttribute.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bc926f3d44df02544a61f0b5ef860bfc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Core/Event/IEvent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4a87167581f01b144aaa79f232e9fedb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Core/JsonHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b538aca07869c864d84228e09f0c99e7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Codes/Model/Core/MongoHelper.cs → Unity/Assets/Core/MongoHelper.cs

@@ -5,7 +5,6 @@ using MongoDB.Bson;
 using MongoDB.Bson.IO;
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Conventions;
-using MongoDB.Bson.Serialization.Serializers;
 using UnityEngine;
 
 namespace ET

Unity/Assets/Core/MongoHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 007c5a20dd48dfe4186a8c4200d4d54c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: