调整代码结构

Server/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs

@@ -3,21 +3,25 @@
 namespace ET
 {
     [ObjectSystem]
-    public class LocationProxyComponentSystem: AwakeSystem<LocationProxyComponent>
+    public class LocationProxyComponentAwakeSystem: AwakeSystem<LocationProxyComponent>
     {
         public override void Awake(LocationProxyComponent self)
         {
-            self.Awake();
+            LocationProxyComponent.Instance = self;
         }
     }
-
-    public static class LocationProxyComponentEx
+    
+    [ObjectSystem]
+    public class LocationProxyComponentDestroySystem: DestroySystem<LocationProxyComponent>
     {
-        public static void Awake(this LocationProxyComponent self)
+        public override void Destroy(LocationProxyComponent self)
         {
-            LocationProxyComponent.Instance = self;
+            LocationProxyComponent.Instance = null;
         }
-        
+    }
+
+    public static class LocationProxyComponentSystem
+    {
         private static long GetLocationSceneId(long key)
         {
             return StartSceneConfigCategory.Instance.LocationConfig.SceneId;

Server/Model/Module/ActorLocation/LocationProxyComponent.cs

@@ -3,17 +3,5 @@
     public class LocationProxyComponent: Entity
     {
         public static LocationProxyComponent Instance;
-
-        public override void Dispose()
-        {
-            if (this.IsDisposed)
-            {
-                return;
-            }
-
-            base.Dispose();
-
-            Instance = null;
-        }
     }
 }

Server/Model/Server.Model.csproj

@@ -63,41 +63,6 @@
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageDispatcherComponent.cs">
       <Link>Module\Message\MessageDispatcherComponent.cs</Link>
     </Compile>
-    <EmbeddedResource Remove="Libs\**" />
-    <None Remove="Libs\**" />
-    <None Remove="graph.bytes" />
-    <Compile Remove="Module\Scene\**" />
-    <EmbeddedResource Remove="Module\Scene\**" />
-    <None Remove="Module\Scene\**" />
-    <Compile Remove="Base\Async\**" />
-    <EmbeddedResource Remove="Base\Async\**" />
-    <None Remove="Base\Async\**" />
-    <Compile Remove="Base\Entity\**" />
-    <EmbeddedResource Remove="Base\Entity\**" />
-    <None Remove="Base\Entity\**" />
-    <Compile Remove="Base\Event\**" />
-    <EmbeddedResource Remove="Base\Event\**" />
-    <None Remove="Base\Event\**" />
-    <Compile Remove="Module\Message\Network\KCP\**" />
-    <EmbeddedResource Remove="Module\Message\Network\KCP\**" />
-    <None Remove="Module\Message\Network\KCP\**" />
-    <Compile Remove="Module\Message\Network\TCP\**" />
-    <EmbeddedResource Remove="Module\Message\Network\TCP\**" />
-    <None Remove="Module\Message\Network\TCP\**" />
-    <Compile Remove="Module\Message\Network\WebSocket\**" />
-    <EmbeddedResource Remove="Module\Message\Network\WebSocket\**" />
-    <None Remove="Module\Message\Network\WebSocket\**" />
-    <Compile Remove="Module\Message\Network\**" />
-    <EmbeddedResource Remove="Module\Message\Network\**" />
-    <None Remove="Module\Message\Network\**" />
-    <Compile Remove="Base\RecyclableMemoryStream\**" />
-    <EmbeddedResource Remove="Base\RecyclableMemoryStream\**" />
-    <None Remove="Base\RecyclableMemoryStream\**" />
-    <Compile Remove="Module\Config\ConfigHelper.cs" />
-    <Compile Remove="Module\Config\ConfigComponent.cs" />
-    <Compile Remove="Module\Config\**" />
-    <EmbeddedResource Remove="Module\Config\**" />
-    <None Remove="Module\Config\**" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\AMHandler.cs" Link="Module\Message\AMHandler.cs" />

Unity/Assets/Hotfix/Core.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9fc5fdc02d12448d4ba93332795402ea
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Hotfix/Core/Scene.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 834a4d6b7a44242a89e3b408295f455d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Hotfix/Scene/ZoneSceneFlagComponentSystem.cs.meta → Unity/Assets/Hotfix/Core/Scene/ZoneSceneFlagComponentSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8b061d707010d4e7a88210329303ed2d
+guid: 32922d3c5766443ac8171e3dd08195c3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Hotfix/Scene/ZoneSceneManagerComponentSystem.cs.meta → Unity/Assets/Hotfix/Core/Scene/ZoneSceneManagerComponentSystem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c2423cb9483454d4a9dcca62dc958272
+guid: ab4b147d9408c490a9af06bd72f31642
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Hotfix/Demo.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6cdc75c1ab3444e44967af8288a977a1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Hotfix/Scene/LoginHelper.cs.meta → Unity/Assets/Hotfix/Demo/LoginHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c257c01663e1c4b61bcf5f9d9ddebc36
+guid: c492ea9d6f1564b4eb017e75abcfa6ca
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Hotfix/Scene/MapHelper.cs.meta → Unity/Assets/Hotfix/Demo/MapHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c725d3d8e2c5d4761b431fd1af50bac5
+guid: 0d136fec7f99046548485929ddf46bfc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Hotfix/Demo/Move.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: adc11596c0be34a07a9d3a2d859602f3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Hotfix/Demo/Session.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df47422fa9737466e871b844fbe6479b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Hotfix/Demo/Unit.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 65675cf0baea14c55aad0ae9b6357901
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Model/Core/Scene.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0e097a3030bef46dfa7a7a745a88b9e1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Model/Scene/SceneHelper.cs.meta → Unity/Assets/Model/Core/Scene/SceneHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fb19b78af7c6247eda3a57d99d387695
+guid: 291ca0a1cace0478ab65cd79e5b07d28
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Scene/ZoneSceneFlagComponent.cs.meta → Unity/Assets/Model/Core/Scene/ZoneSceneFlagComponent.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8bf9ded844f734e0f96139486607da26
+guid: 82917a4ffa00c457aaeca55b1163fe0c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Scene/ZoneSceneManagerComponent.cs.meta → Unity/Assets/Model/Core/Scene/ZoneSceneManagerComponent.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dff0dc04282044a00b49a830dfe34418
+guid: 6c2ca2884c4a046a896e562509518deb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Demo.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4acb18f75021e484d87ccdbaa591e4ca
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Model/Define.cs.meta → Unity/Assets/Model/Demo/Define.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c8c86b9486c3548d4bbbf6a7eaf932a7
+guid: 2a3a228931cee496bb837dbc08c20563
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/EventType.cs.meta → Unity/Assets/Model/Demo/EventType.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e1008d46fb45b450cb0079aff105569b
+guid: 007935fc36ef8429fa740b34f74aecaf
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Demo/Helper.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cc65b3ea3a6a342769f1f2fdae93171a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Model/Demo/Session.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5b9297cf644f341cc8491e45c6967747
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Model/Demo/Unit.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb1729ee879e246298878502e032626f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Model/Scene/SceneHelper.cs

@@ -1,15 +0,0 @@
-namespace ET
-{
-    public static class SceneHelper
-    {
-        public static int DomainZone(this Entity entity)
-        {
-            return ((Scene) entity.Domain)?.Zone ?? 0;
-        }
-
-        public static Scene DomainScene(this Entity entity)
-        {
-            return (Scene) entity.Domain;
-        }
-    }
-}

Unity/Unity.Hotfix.csproj

@@ -53,28 +53,28 @@
   </PropertyGroup>
   <ItemGroup>
      <Compile Include="Assets\Hotfix\Module\Message\NetThreadComponentSystem.cs" />
-     <Compile Include="Assets\Hotfix\Scene\LoginHelper.cs" />
-     <Compile Include="Assets\Hotfix\Unit\MoveComponentSystem.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Unit\MoveComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" />
-     <Compile Include="Assets\Hotfix\Unit\M2C_CreateUnitsHandler.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Unit\M2C_CreateUnitsHandler.cs" />
      <Compile Include="Assets\Hotfix\Module\Config\ConfigComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\SessionIdleCheckerComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\NetKcpComponentSystem.cs" />
-     <Compile Include="Assets\Hotfix\Unit\UnitPathComponentSystem.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Unit\UnitPathComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Numeric\NumericWatcher_Hp_ShowUI.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\OuterMessageDispatcher.cs" />
-     <Compile Include="Assets\Hotfix\Move\M2C_PathfindingResultHandler.cs" />
-     <Compile Include="Assets\Hotfix\Unit\UnitComponent.cs" />
-     <Compile Include="Assets\Hotfix\Unit\UnitFactory.cs" />
-     <Compile Include="Assets\Hotfix\Scene\MapHelper.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Move\M2C_PathfindingResultHandler.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Unit\UnitComponent.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Unit\UnitFactory.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\MessageDispatcherComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\PingComponentSystem.cs" />
-     <Compile Include="Assets\Hotfix\Unit\TurnComponentSystem.cs" />
-     <Compile Include="Assets\Hotfix\Session\SessionComponentSystem.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Unit\TurnComponentSystem.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Session\SessionComponentSystem.cs" />
      <Compile Include="Assets\Hotfix\Module\Message\SessionAcceptTimeoutComponentSystem.cs" />
-     <Compile Include="Assets\Hotfix\Scene\ZoneSceneFlagComponentSystem.cs" />
-     <Compile Include="Assets\Hotfix\Scene\ZoneSceneManagerComponentSystem.cs" />
-     <Compile Include="Assets\Hotfix\Unit\UnitSystem.cs" />
+     <Compile Include="Assets\Hotfix\Demo\Unit\UnitSystem.cs" />
+     <Compile Include="Assets\Hotfix\Demo\MapHelper.cs" />
+     <Compile Include="Assets\Hotfix\Core\Scene\ZoneSceneFlagComponentSystem.cs" />
+     <Compile Include="Assets\Hotfix\Core\Scene\ZoneSceneManagerComponentSystem.cs" />
+     <Compile Include="Assets\Hotfix\Demo\LoginHelper.cs" />
      <None Include="Assets\Hotfix\Unity.Hotfix.asmdef" />
  <Reference Include="UnityEngine">
  <HintPath>/Applications/Unity/Hub/Editor/2020.2.2f1c1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>

Unity/Unity.Model.csproj

@@ -52,13 +52,12 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="Assets\Model\Helper\PathHelper.cs" />
-     <Compile Include="Assets\Model\Unit\TurnComponent.cs" />
+     <Compile Include="Assets\Model\Demo\Helper\PathHelper.cs" />
+     <Compile Include="Assets\Model\Demo\Unit\TurnComponent.cs" />
      <Compile Include="Assets\Model\Core\DoubleMap.cs" />
      <Compile Include="Assets\Model\Core\Entity\EntitySceneFactory.cs" />
      <Compile Include="Assets\Model\Module\Message\MessagePackHelper.cs" />
      <Compile Include="Assets\Model\Module\Message\MessageProxy.cs" />
-     <Compile Include="Assets\Model\EventType.cs" />
      <Compile Include="Assets\Model\Core\UnOrderMultiMapSet.cs" />
      <Compile Include="Assets\Model\Generate\Config\UnitConfig.cs" />
      <Compile Include="Assets\Model\Core\Entity\SceneType.cs" />
@@ -75,7 +74,7 @@
      <Compile Include="Assets\Model\Core\Object\BaseAttribute.cs" />
      <Compile Include="Assets\Model\Generate\Config\StartZoneConfig.cs" />
      <Compile Include="Assets\Model\Module\CoroutineLock\CoroutineLockQueueType.cs" />
-     <Compile Include="Assets\Model\Unit\Unit.cs" />
+     <Compile Include="Assets\Model\Demo\Unit\Unit.cs" />
      <Compile Include="Assets\Model\Generate\Message\OuterMessage.cs" />
      <Compile Include="Assets\Model\Module\Message\MessageSerializeHelper.cs" />
      <Compile Include="Assets\Model\Core\Object\IUpdateSystem.cs" />
@@ -108,13 +107,12 @@
      <Compile Include="Assets\Model\Module\UnityWebRequest\UnityWebRequestRenewalAsync.cs" />
      <Compile Include="Assets\Model\Core\Entity\TimerComponent.cs" />
      <Compile Include="Assets\Model\Module\CoroutineLock\CoroutineLockType.cs" />
-     <Compile Include="Assets\Model\Define.cs" />
      <Compile Include="Assets\Model\Core\Helper\ByteHelper.cs" />
      <Compile Include="Assets\Model\Core\Async\IAwaiter.cs" />
      <Compile Include="Assets\Model\Core\ThreadSynchronizationContext.cs" />
      <Compile Include="Assets\Model\Core\Log\LogHelper.cs" />
      <Compile Include="Assets\Model\Core\MultiMapSet.cs" />
-     <Compile Include="Assets\Model\Session\SessionComponent.cs" />
+     <Compile Include="Assets\Model\Demo\Session\SessionComponent.cs" />
      <Compile Include="Assets\Model\Core\Object\ILoadSystem.cs" />
      <Compile Include="Assets\Model\Core\Entity\Scene.cs" />
      <Compile Include="Assets\Model\Core\Object\ILateUpdateSystem.cs" />
@@ -148,7 +146,7 @@
      <Compile Include="Assets\Model\Module\Numeric\NumericWatcherComponent.cs" />
      <Compile Include="Assets\Model\Core\Async\AsyncETTaskMethodBuilder.cs" />
      <Compile Include="Assets\Model\Core\Helper\MD5Helper.cs" />
-     <Compile Include="Assets\Model\Unit\UnitComponent.cs" />
+     <Compile Include="Assets\Model\Demo\Unit\UnitComponent.cs" />
      <Compile Include="Assets\Model\Module\Config\ConfigComponent.cs" />
      <Compile Include="Assets\Model\Core\Helper\ObjectHelper.cs" />
      <Compile Include="Assets\Model\Module\Message\IMHandler.cs" />
@@ -186,12 +184,12 @@
      <Compile Include="Assets\Model\Module\NetworkTCP\TService.cs" />
      <Compile Include="Assets\Model\Generate\Message\OuterOpcode.cs" />
      <Compile Include="Assets\Model\Core\MultiMapComponent.cs" />
-     <Compile Include="Assets\Model\Helper\PositionHelper.cs" />
+     <Compile Include="Assets\Model\Demo\Helper\PositionHelper.cs" />
      <Compile Include="Assets\Model\Core\ListComponent.cs" />
      <Compile Include="Assets\Model\Core\Log\NLogger.cs" />
      <Compile Include="Assets\Model\Core\Async\ETTaskCompletionSource.cs" />
      <Compile Include="Assets\Model\Core\Helper\StringHelper.cs" />
-     <Compile Include="Assets\Model\Unit\MoveComponent.cs" />
+     <Compile Include="Assets\Model\Demo\Unit\MoveComponent.cs" />
      <Compile Include="Assets\Model\Module\Message\MessagePool.cs" />
      <Compile Include="Assets\Model\Module\Config\IConfig.cs" />
      <Compile Include="Assets\Model\Module\Message\ResponseTypeAttribute.cs" />
@@ -200,10 +198,12 @@
      <Compile Include="Assets\Model\Core\Async\ETTaskHelper.cs" />
      <Compile Include="Assets\Model\Module\NetworkTCP\TChannel.cs" />
      <Compile Include="Assets\Model\Module\Network\AChannel.cs" />
-     <Compile Include="Assets\Model\Unit\UnitPathComponent.cs" />
-     <Compile Include="Assets\Model\Scene\SceneHelper.cs" />
-     <Compile Include="Assets\Model\Scene\ZoneSceneManagerComponent.cs" />
-     <Compile Include="Assets\Model\Scene\ZoneSceneFlagComponent.cs" />
+     <Compile Include="Assets\Model\Demo\Unit\UnitPathComponent.cs" />
+     <Compile Include="Assets\Model\Demo\EventType.cs" />
+     <Compile Include="Assets\Model\Core\Scene\ZoneSceneManagerComponent.cs" />
+     <Compile Include="Assets\Model\Demo\Define.cs" />
+     <Compile Include="Assets\Model\Core\Scene\ZoneSceneFlagComponent.cs" />
+     <Compile Include="Assets\Model\Core\Scene\SceneHelper.cs" />
      <None Include="Assets\Model\Unity.Model.asmdef" />
  <Reference Include="UnityEngine">
  <HintPath>/Applications/Unity/Hub/Editor/2020.2.2f1c1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.dll</HintPath>