1.Event修复

2.ObjectSystem跟Event不再需要加标记，因为基类已经加了
3.拆分显示层跟逻辑层，显示层的组件放到View里面
4.publish改成支持异步的

Server/App/Program.cs

@@ -29,13 +29,12 @@ namespace ET
 				
 				Game.Scene.AddComponent(options);
 				
-				IdGenerater.Process = (byte) options.Process;
+				IdGenerater.Process = options.Process;
 				
 				LogManager.Configuration.Variables["appIdFormat"] = $"{Game.Scene.Id:0000}";
 				
 				Log.Info($"server start........................ {Game.Scene.Id}");
 
-				// 先加这里，后面删掉
 				Game.EventSystem.Publish(new EventType.AppStart());
 				
 				while (true)

Server/Hotfix/Module/Scene/AppStart_InitGame.cs → Server/Hotfix/AppStart_Init.cs

@@ -2,15 +2,9 @@
 
 namespace ET
 {
-    [Event]
     public class AppStart_Init: AEvent<EventType.AppStart>
     {
-        public override void Run(EventType.AppStart args)
-        {
-            RunAsync().Coroutine();
-        }
-        
-        public async ETVoid RunAsync()
+        public override async ETTask Run(EventType.AppStart args)
         {
             Game.Scene.AddComponent<ConfigComponent>();
 

Server/Hotfix/Demo/SessionPlayerComponentSystem.cs

@@ -2,7 +2,6 @@
 
 namespace ET
 {
-	[ObjectSystem]
 	public class SessionPlayerComponentDestroySystem : DestroySystem<SessionPlayerComponent>
 	{
 		public override void Destroy(SessionPlayerComponent self)

Server/Hotfix/Module/Actor/ActorMessageDispatcherComponentSystem.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 
 namespace ET
 {
-	[ObjectSystem]
 	public class ActorMessageDispatcherComponentAwakeSystem: AwakeSystem<ActorMessageDispatcherComponent>
 	{
 		public override void Awake(ActorMessageDispatcherComponent self)
@@ -14,7 +13,6 @@ namespace ET
 		}
 	}
 
-	[ObjectSystem]
 	public class ActorMessageDispatcherComponentLoadSystem: LoadSystem<ActorMessageDispatcherComponent>
 	{
 		public override void Load(ActorMessageDispatcherComponent self)
@@ -23,7 +21,6 @@ namespace ET
 		}
 	}
 	
-	[ObjectSystem]
 	public class ActorMessageDispatcherComponentDestroySystem: DestroySystem<ActorMessageDispatcherComponent>
 	{
 		public override void Destroy(ActorMessageDispatcherComponent self)

Server/Hotfix/Module/Actor/ActorMessageSenderComponentSystem.cs

@@ -3,7 +3,6 @@
 
 namespace ET
 {
-    [ObjectSystem]
     public class ActorMessageSenderComponentAwakeSystem : AwakeSystem<ActorMessageSenderComponent>
     {
         public override void Awake(ActorMessageSenderComponent self)
@@ -14,7 +13,6 @@ namespace ET
         }
     }
     
-    [ObjectSystem]
     public class ActorMessageSenderComponentDestroySystem: DestroySystem<ActorMessageSenderComponent>
     {
         public override void Destroy(ActorMessageSenderComponent self)

Server/Hotfix/Module/Actor/MailBoxComponentSystem.cs

@@ -3,7 +3,6 @@
 
 namespace ET
 {
-	[ObjectSystem]
 	public class MailBoxComponentAwakeSystem : AwakeSystem<MailBoxComponent>
 	{
 		public override void Awake(MailBoxComponent self)
@@ -12,7 +11,6 @@ namespace ET
 		}
 	}
 
-	[ObjectSystem]
 	public class MailBoxComponentAwake1System : AwakeSystem<MailBoxComponent, MailboxType>
 	{
 		public override void Awake(MailBoxComponent self, MailboxType mailboxType)

Server/Hotfix/Module/ActorLocation/ActorLocationSenderComponentSystem.cs

@@ -3,7 +3,6 @@
 
 namespace ET
 {
-    [ObjectSystem]
     public class ActorLocationSenderComponentAwakeSystem : AwakeSystem<ActorLocationSenderComponent>
     {
         public override void Awake(ActorLocationSenderComponent self)
@@ -16,7 +15,6 @@ namespace ET
         }
     }
     
-    [ObjectSystem]
     public class ActorLocationSenderComponentDestroySystem: DestroySystem<ActorLocationSenderComponent>
     {
         public override void Destroy(ActorLocationSenderComponent self)

Server/Hotfix/Module/ActorLocation/ActorLocationSenderSystem.cs

@@ -3,7 +3,6 @@
 
 namespace ET
 {
-    [ObjectSystem]
     public class ActorLocationSenderAwakeSystem: AwakeSystem<ActorLocationSender>
     {
         public override void Awake(ActorLocationSender self)
@@ -24,7 +23,6 @@ namespace ET
         }
     }
 
-    [ObjectSystem]
     public class ActorLocationSenderDestroySystem: DestroySystem<ActorLocationSender>
     {
         public override void Destroy(ActorLocationSender self)

Server/Hotfix/Module/ActorLocation/LocationProxyComponentSystem.cs

@@ -3,7 +3,6 @@
 
 namespace ET
 {
-	[ObjectSystem]
 	public class LocationProxyComponentSystem : AwakeSystem<LocationProxyComponent>
 	{
 		public override void Awake(LocationProxyComponent self)

Server/Hotfix/Module/Benchmark/BenchmarkComponentSystem.cs

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 
 namespace ET
 {
-	[ObjectSystem]
 	public class BenchmarkComponentSystem : AwakeSystem<BenchmarkComponent, string>
 	{
 		public override void Awake(BenchmarkComponent self, string a)

Server/Hotfix/Module/Benchmark/WebSocketBenchmarkComponentSystem.cs

@@ -3,7 +3,6 @@
 
 namespace ET
 {
-	[ObjectSystem]
 	public class WebSocketBenchmarkComponentSystem : AwakeSystem<WebSocketBenchmarkComponent, string>
 	{
 		public override void Awake(WebSocketBenchmarkComponent self, string address)

Server/Hotfix/Module/Config/ConfigComponentSystem.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    [ObjectSystem]
     public class ConfigAwakeSystem : AwakeSystem<ConfigComponent>
     {
         public override void Awake(ConfigComponent self)
@@ -14,7 +13,6 @@ namespace ET
         }
     }
 
-    [ObjectSystem]
     public class ConfigLoadSystem : LoadSystem<ConfigComponent>
     {
         public override void Load(ConfigComponent self)
@@ -23,7 +21,6 @@ namespace ET
         }
     }
     
-    [ObjectSystem]
     public class ConfigDestroySystem : DestroySystem<ConfigComponent>
     {
 	    public override void Destroy(ConfigComponent self)

Server/Hotfix/Module/DB/DBComponentSystem.cs

@@ -5,7 +5,6 @@ using MongoDB.Driver;
 
 namespace ET
 {
-	[ObjectSystem]
 	public class DBComponentAwakeSystem : AwakeSystem<DBComponent, string, string>
 	{
 		public override void Awake(DBComponent self, string dbConnection, string dbName)
@@ -31,7 +30,6 @@ namespace ET
 		}
 	}
 	
-	[ObjectSystem]
     public class DBComponentDestroySystem: DestroySystem<DBComponent>
     {
         public override void Destroy(DBComponent self)

Server/Hotfix/Module/Message/MessageDispatherComponentSystem.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 
 namespace ET
 {
-	[ObjectSystem]
 	public class MessageDispatcherComponentAwakeSystem : AwakeSystem<MessageDispatcherComponent>
 	{
 		public override void Awake(MessageDispatcherComponent self)
@@ -14,7 +13,6 @@ namespace ET
 		}
 	}
 
-	[ObjectSystem]
 	public class MessageDispatcherComponentLoadSystem : LoadSystem<MessageDispatcherComponent>
 	{
 		public override void Load(MessageDispatcherComponent self)
@@ -23,7 +21,6 @@ namespace ET
 		}
 	}
 	
-	[ObjectSystem]
 	public class MessageDispatcherComponentDestroySystem: DestroySystem<MessageDispatcherComponent>
 	{
 		public override void Destroy(MessageDispatcherComponent self)

Server/Hotfix/Module/Message/NetInnerComponentSystem.cs

@@ -2,7 +2,6 @@
 
 namespace ET
 {
-	[ObjectSystem]
 	public class NetInnerComponentAwakeSystem : AwakeSystem<NetInnerComponent>
 	{
 		public override void Awake(NetInnerComponent self)
@@ -14,7 +13,6 @@ namespace ET
 		}
 	}
 
-	[ObjectSystem]
 	public class NetInnerComponentAwake1System : AwakeSystem<NetInnerComponent, string>
 	{
 		public override void Awake(NetInnerComponent self, string a)
@@ -26,7 +24,6 @@ namespace ET
 		}
 	}
 	
-	[ObjectSystem]
 	public class NetInnerComponentLoadSystem : LoadSystem<NetInnerComponent>
 	{
 		public override void Load(NetInnerComponent self)
@@ -36,7 +33,6 @@ namespace ET
 		}
 	}
 
-	[ObjectSystem]
 	public class NetInnerComponentUpdateSystem : UpdateSystem<NetInnerComponent>
 	{
 		public override void Update(NetInnerComponent self)

Server/Model/Base/LogType.cs

@@ -1,10 +0,0 @@
-namespace ET
-{
-	public enum LogType
-	{
-		Warning,
-		Info,
-		Debug,
-		Error,
-	}
-}

Server/Model/Demo/Player.cs

@@ -1,6 +1,5 @@
 namespace ET
 {
-	[ObjectSystem]
 	public class PlayerSystem : AwakeSystem<Player, string>
 	{
 		public override void Awake(Player self, string a)

Server/Model/Demo/PlayerComponent.cs

@@ -3,7 +3,6 @@ using System.Linq;
 
 namespace ET
 {
-	[ObjectSystem]
 	public class PlayerComponentSystem : AwakeSystem<PlayerComponent>
 	{
 		public override void Awake(PlayerComponent self)

Server/Model/Demo/Unit.cs

@@ -9,7 +9,6 @@ namespace ET
 		Npc
 	}
 
-	[ObjectSystem]
 	public class UnitAwakeSystem : AwakeSystem<Unit, UnitType>
 	{
 		public override void Awake(Unit self, UnitType a)

Server/Model/Demo/UnitGateComponent.cs

@@ -1,6 +1,5 @@
 namespace ET
 {
-	[ObjectSystem]
 	public class UnitGateComponentAwakeSystem : AwakeSystem<UnitGateComponent, long>
 	{
 		public override void Awake(UnitGateComponent self, long a)

Server/Model/Module/ActorLocation/LocationComponent.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 
 namespace ET
 {
-	[ObjectSystem]
 	public class LockInfoAwakeSystem : AwakeSystem<LockInfo, long, CoroutineLock>
 	{
 		public override void Awake(LockInfo self, long lockInstanceId, CoroutineLock coroutineLock)

Server/Model/Module/Console/ConsoleComponent.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 
 namespace ET
 {
-    [ObjectSystem]
     public class ConsoleComponentAwakeSystem : StartSystem<ConsoleComponent>
     {
         public override void Start(ConsoleComponent self)

Server/Model/Module/Console/ReplComponent.cs

@@ -5,7 +5,6 @@ using Microsoft.CodeAnalysis.Scripting;
 
 namespace ET
 {
-    [ObjectSystem]
     public class ReplComponentAwakeSystem : AwakeSystem<ReplComponent>
     {
         public override void Awake(ReplComponent self)

Server/Model/Module/Pathfinding/ABPathWrap.cs

@@ -4,7 +4,6 @@ using UnityEngine;
 
 namespace ET
 {
-    [ObjectSystem]
     public class ABPathAwakeSystem : AwakeSystem<ABPathWrap, Vector3, Vector3>
     {
         public override void Awake(ABPathWrap self, Vector3 start, Vector3 end)

Server/Model/Module/Pathfinding/PathfindingComponent.cs

@@ -2,7 +2,6 @@ using PF;
 
 namespace ET
 {
-    [ObjectSystem]
     public class PathfindingComponentAwakeSystem : AwakeSystem<PathfindingComponent>
     {
         public override void Awake(PathfindingComponent self)

Server/Model/Server.Model.csproj

@@ -53,6 +53,21 @@
     <Compile Include="..\..\Unity\Assets\Model\Base\Async\IAwaiter.cs">
       <Link>Base\Async\IAwaiter.cs</Link>
     </Compile>
+    <Compile Include="..\..\Unity\Assets\Model\Base\Entity\EntitySceneFactory.cs">
+      <Link>Base\Entity\EntitySceneFactory.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Unity\Assets\Model\Base\Entity\Game.cs">
+      <Link>Base\Entity\Game.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Unity\Assets\Model\Base\Entity\Scene.cs">
+      <Link>Base\Entity\Scene.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Unity\Assets\Model\Base\Entity\SceneType.cs">
+      <Link>Base\Entity\SceneType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Unity\Assets\Model\Base\Entity\TimerComponent.cs">
+      <Link>Base\Entity\TimerComponent.cs</Link>
+    </Compile>
     <Compile Include="..\..\Unity\Assets\Model\Base\Helper\MongoHelper.cs">
       <Link>Base\Helper\MongoHelper.cs</Link>
     </Compile>
@@ -134,21 +149,6 @@
     <Compile Include="..\..\Unity\Assets\Model\Base\UnOrderMultiMapSet.cs">
       <Link>Base\UnOrderMultiMapSet.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Model\Entity\EntitySceneFactory.cs">
-      <Link>Entity\EntitySceneFactory.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Model\Entity\Game.cs">
-      <Link>Entity\Game.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Model\Entity\Scene.cs">
-      <Link>Entity\Scene.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Model\Entity\SceneType.cs">
-      <Link>Entity\SceneType.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Unity\Assets\Model\Entity\TimerComponent.cs">
-      <Link>Entity\TimerComponent.cs</Link>
-    </Compile>
     <Compile Include="..\..\Unity\Assets\Model\Module\ActorLocation\IActorLocationMessage.cs">
       <Link>Module\ActorLocation\IActorLocationMessage.cs</Link>
     </Compile>
@@ -194,8 +194,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Unity\Assets\Model\Base\DoubleMap.cs" Link="Base\DoubleMap.cs" />
-    <Compile Include="..\..\Unity\Assets\Model\Base\Event\Env.cs" Link="Base\Event\Env.cs" />
-    <Compile Include="..\..\Unity\Assets\Model\Base\Event\EnvKey.cs" Link="Base\Event\EnvKey.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Base\Event\EventAttribute.cs" Link="Base\Event\EventAttribute.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Base\Event\IEvent.cs" Link="Base\Event\IEvent.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Base\Helper\ByteHelper.cs" Link="Base\Helper\ByteHelper.cs" />
@@ -396,7 +394,6 @@
     <Compile Include="..\..\Unity\Assets\Model\Module\Pathfinding\Recast\WindowsStoreCompatibility.cs">
       <Link>Module\Pathfinding\Recast\WindowsStoreCompatibility.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Model\Other\AppType.cs" Link="Other\AppType.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.2.1" />

Unity/Assets/Editor/ExcelExporterEditor/ExcelExporterEditor.cs

@@ -62,7 +62,7 @@ namespace ET
 
                     ExportAll(clientPath);
 
-                    ExportAllClass(@"./Assets/Model/Demo/Config", "namespace ET\n{\n");
+                    ExportAllClass(@"./Assets/Model/Config", "namespace ET\n{\n");
 
                     Log.Info($"导出客户端配置完成!");
                 }
@@ -73,7 +73,7 @@ namespace ET
 
                     ExportAll(ServerConfigPath);
 
-                    ExportAllClass(@"../Server/Model/Demo/Config", "namespace ET\n{\n");
+                    ExportAllClass(@"../Server/Model/Config", "namespace ET\n{\n");
 
                     Log.Info($"导出服务端配置完成!");
                 }

Unity/Assets/Editor/GlobalConfigEditor.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 213fa34dccaf4a66ae2ae115b04d7f82
-timeCreated: 1510807526

Unity/Assets/Editor/GlobalConfigEditor/GlobalConfigEditor.cs

@@ -1,44 +0,0 @@
-using System.IO;
-
-using UnityEditor;
-using UnityEngine;
-
-namespace ET
-{
-    public class GlobalProtoEditor: EditorWindow
-    {
-        const string path = @"./Assets/Res/Config/GlobalProto.txt";
-
-        private GlobalProto globalProto;
-
-        [MenuItem("Tools/全局配置")]
-        public static void ShowWindow()
-        {
-            GetWindow<GlobalProtoEditor>();
-        }
-
-        public void Awake()
-        {
-            if (File.Exists(path))
-            {
-                this.globalProto = JsonHelper.FromJson<GlobalProto>(File.ReadAllText(path));
-            }
-            else
-            {
-                this.globalProto = new GlobalProto();
-            }
-        }
-
-        public void OnGUI()
-        {
-            this.globalProto.AssetBundleServerUrl = EditorGUILayout.TextField("资源路径:", this.globalProto.AssetBundleServerUrl);
-            this.globalProto.Address = EditorGUILayout.TextField("服务器地址:", this.globalProto.Address);
-
-            if (GUILayout.Button("保存"))
-            {
-                File.WriteAllText(path, JsonHelper.ToJson(this.globalProto));
-                AssetDatabase.Refresh();
-            }
-        }
-    }
-}

Unity/Assets/Editor/GlobalConfigEditor/GlobalConfigEditor.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 51bd2599a7c84da9bfa90cd8d37db805
-timeCreated: 1510807539

Unity/Assets/Hotfix/Module/Config/ConfigComponentSystem.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 
 namespace ET
 {
-    [ObjectSystem]
     public class ConfigAwakeSystem : AwakeSystem<ConfigComponent>
     {
         public override void Awake(ConfigComponent self)
@@ -14,7 +13,6 @@ namespace ET
         }
     }
 
-    [ObjectSystem]
     public class ConfigLoadSystem : LoadSystem<ConfigComponent>
     {
         public override void Load(ConfigComponent self)
@@ -23,7 +21,7 @@ namespace ET
         }
     }
     
-    [ObjectSystem]
+    
     public class ConfigDestroySystem : DestroySystem<ConfigComponent>
     {
 	    public override void Destroy(ConfigComponent self)

Unity/Assets/Hotfix/Module/Message/NetOuterComponentSystem.cs

@@ -2,7 +2,6 @@
 
 namespace ET
 {
-	[ObjectSystem]
 	public class NetOuterComponentAwakeSystem : AwakeSystem<NetOuterComponent>
 	{
 		public override void Awake(NetOuterComponent self)
@@ -13,7 +12,6 @@ namespace ET
 		}
 	}
 
-	[ObjectSystem]
 	public class NetOuterComponentAwake1System : AwakeSystem<NetOuterComponent, string>
 	{
 		public override void Awake(NetOuterComponent self, string address)
@@ -24,7 +22,7 @@ namespace ET
 		}
 	}
 	
-	[ObjectSystem]
+	
 	public class NetOuterComponentLoadSystem : LoadSystem<NetOuterComponent>
 	{
 		public override void Load(NetOuterComponent self)
@@ -34,7 +32,6 @@ namespace ET
 		}
 	}
 	
-	[ObjectSystem]
 	public class NetOuterComponentUpdateSystem : UpdateSystem<NetOuterComponent>
 	{
 		public override void Update(NetOuterComponent self)

Unity/Assets/Hotfix/Module/Numeric/NumericChangeEvent_NotifyWatcher.cs

@@ -1,12 +1,11 @@
 namespace ET
 {
 	// 分发数值监听
-	[Event]
 	public class NumericChangeEvent_NotifyWatcher: AEvent<EventType.NumbericChange>
 	{
-		public override void Run(EventType.NumbericChange args)
+		public override async ETTask Run(EventType.NumbericChange args)
 		{
-			Game.Scene.GetComponent<NumericWatcherComponent>().Run(args.NumericType, args.Parent.Id, args.New);
+			NumericWatcherComponent.Instance.Run(args.NumericType, args.Parent.Id, args.New);
 		}
 	}
 }

Unity/Assets/HotfixView/Demo.meta → Unity/Assets/Hotfix/Move.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f9fd1b2a1f4c85048b302c86bfbdcb16
+guid: 84316c4a00543419e88a3df1a10cd574
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Model/Demo/M2C_PathfindingResultHandler.cs → Unity/Assets/Hotfix/Move/M2C_PathfindingResultHandler.cs

@@ -11,7 +11,7 @@ namespace ET
 			Unit unit = Game.Scene.GetComponent<UnitComponent>().Get(message.Id);
 			
 			
-			unit.GetComponent<AnimatorComponent>().SetFloatValue("Speed", 5f);
+			//unit.GetComponent<AnimatorComponent>().SetFloatValue("Speed", 5f);
 			UnitPathComponent unitPathComponent = unit.GetComponent<UnitPathComponent>();
 
 			unitPathComponent.StartMove(message).Coroutine();

Unity/Assets/Model/Demo/M2C_PathfindingResultHandler.cs.meta → Unity/Assets/Hotfix/Move/M2C_PathfindingResultHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e370e865ace029240a1e30c8721593d2
+guid: b5d4ce0b4d78f44a1aec19397ea14f41
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/HotfixView/Helper.meta → Unity/Assets/Hotfix/Scene.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 39d1e129a66bc854199a728475d43224
+guid: 3939451e28db94f9c88ce0818cd4620c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Model/Demo/Helper/LoginHelper.cs → Unity/Assets/Hotfix/Scene/LoginHelper.cs

@@ -34,7 +34,7 @@ namespace ET
                 PlayerComponent playerComponent = Game.Scene.GetComponent<PlayerComponent>();
                 playerComponent.MyPlayer = player;
 
-                Game.EventSystem.Publish(new EventType.LoginFinish());
+                await Game.EventSystem.Publish(new EventType.LoginFinish());
 
                 // 测试消息有成员是class类型
                 G2C_PlayerInfo g2CPlayerInfo = (G2C_PlayerInfo) await SessionComponent.Instance.Session.Call(new C2G_PlayerInfo());

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

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

Unity/Assets/Model/Demo/Helper/MapHelper.cs → Unity/Assets/Hotfix/Scene/MapHelper.cs

@@ -9,22 +9,23 @@ namespace ET
         {
             try
             {
+                /*
                 // 加载Unit资源
-                ResourcesComponent resourcesComponent = ET.Game.Scene.GetComponent<ResourcesComponent>();
+                ResourcesComponent resourcesComponent = Game.Scene.GetComponent<ResourcesComponent>();
                 await resourcesComponent.LoadBundleAsync($"unit.unity3d");
 
                 // 加载场景资源
-                await ET.Game.Scene.GetComponent<ResourcesComponent>().LoadBundleAsync("map.unity3d");
+                await Game.Scene.GetComponent<ResourcesComponent>().LoadBundleAsync("map.unity3d");
                 // 切换到map场景
-                using (SceneChangeComponent sceneChangeComponent = ET.Game.Scene.AddComponent<SceneChangeComponent>())
+                using (SceneChangeComponent sceneChangeComponent = Game.Scene.AddComponent<SceneChangeComponent>())
                 {
                     await sceneChangeComponent.ChangeSceneAsync(sceneName);
                 }
-				
-                G2C_EnterMap g2CEnterMap = await ET.SessionComponent.Instance.Session.Call(new C2G_EnterMap()) as G2C_EnterMap;
+				*/
+                G2C_EnterMap g2CEnterMap = await SessionComponent.Instance.Session.Call(new C2G_EnterMap()) as G2C_EnterMap;
                 PlayerComponent.Instance.MyPlayer.UnitId = g2CEnterMap.UnitId;
 				
-                Game.Scene.AddComponent<OperaComponent>();
+                //Game.Scene.AddComponent<OperaComponent>();
 				
                 Game.EventSystem.Publish(new EventType.EnterMapFinish());
             }

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

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

Unity/Assets/HotfixView/Demo/Unit.meta → Unity/Assets/Hotfix/Unit.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 68f9595937336f9478ea82d7f82a263f
+guid: 400db3603c5ab40fa84bbc1563fb5d65
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/Model/Demo/M2C_CreateUnitsHandler.cs.meta → Unity/Assets/Hotfix/Unit/M2C_CreateUnitsHandler.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 97a29281d153dde429fc6d2f115848c6
+guid: db8dd581a8341488194579bc0ff54b15
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/HotfixView/Helper/ActionHelper.cs.meta → Unity/Assets/Hotfix/Unit/PlayerFactory.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 561346b5a792e9843941da7bc901f2e6
+guid: 4abd0ba4c7b844c3c8ef6e83fc8c0357
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/Model/Demo/Helper/UnitFactory.cs.meta → Unity/Assets/Hotfix/Unit/UnitFactory.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 45b50dcae5e97fd42817d86586643af9
+guid: f1f93dad79c564f06b21123ae6bf401b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/HotfixView/AppStart_Init.cs

@@ -0,0 +1,24 @@
+namespace ET
+{
+    public class AppStart_Init: AEvent<EventType.AppStart>
+    {
+        public override async ETTask Run(EventType.AppStart args)
+        {
+            Game.Scene.AddComponent<TimerComponent>();
+
+
+            // 下载ab包
+            //await BundleHelper.DownloadBundle("1111");
+
+            // 加载配置
+            Game.Scene.GetComponent<ResourcesComponent>().LoadBundle("config.unity3d");
+            Game.Scene.AddComponent<ConfigComponent>();
+            Game.Scene.GetComponent<ResourcesComponent>().UnloadBundle("config.unity3d");
+            Game.Scene.AddComponent<OpcodeTypeComponent>();
+            Game.Scene.AddComponent<MessageDispatcherComponent>();
+
+
+            SceneFactory.CreateZoneScene(1, 0, "Game");
+        }
+    }
+}

Unity/Assets/HotfixView/Demo/GlobalConfigComponentSystem.cs.meta → Unity/Assets/HotfixView/AppStart_Init.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2a8a4a64cc1ce524291d3f31f91b736c
+guid: 94fe7b24b165f4f16a9d12665ca5b5bb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Unity/Assets/HotfixView/Demo/GlobalConfigComponentSystem.cs

@@ -1,15 +0,0 @@
-using UnityEngine;
-
-namespace ET
-{
-    [ObjectSystem]
-    public class GlobalConfigComponentAwakeSystem : AwakeSystem<GlobalConfigComponent>
-    {
-        public override void Awake(GlobalConfigComponent self)
-        {
-            GameObject config = (GameObject)ResourcesHelper.Load("KV");
-            string configStr = config.Get<TextAsset>("GlobalProto").text;
-            self.GlobalProto = JsonHelper.FromJson<GlobalProto>(configStr);
-        }
-    }
-}

Unity/Assets/HotfixView/Helper/ActionHelper.cs

@@ -1,13 +0,0 @@
-using System;
-using UnityEngine.UI;
-
-namespace ET
-{
-	public static class ActionHelper
-	{
-		public static void Add(this Button.ButtonClickedEvent buttonClickedEvent, Action action)
-		{
-			buttonClickedEvent.AddListener(() => { action(); });
-		}
-	}
-}

Unity/Assets/HotfixView/Helper/ResourcesHelper.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using UnityEngine;
-
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
-
-namespace ET
-{
-	public static class ResourcesHelper
-	{
-		public static UnityEngine.Object Load(string path)
-		{
-			return Resources.Load(path);
-		}
-	}
-}

Unity/Assets/HotfixView/Init.cs

@@ -1,63 +0,0 @@
-using System;
-using System.Threading;
-using UnityEngine;
-
-namespace ET
-{
-	public class Init : MonoBehaviour
-	{
-		private void Start()
-		{
-			this.StartAsync().Coroutine();
-		}
-		
-		private async ETVoid StartAsync()
-		{
-			try
-			{
-				SynchronizationContext.SetSynchronizationContext(OneThreadSynchronizationContext.Instance);
-
-				DontDestroyOnLoad(gameObject);
-				Game.EventSystem.Add(typeof(Init).Assembly);
-
-				Game.Scene.AddComponent<TimerComponent>();
-				Game.Scene.AddComponent<GlobalConfigComponent>();
-				Game.Scene.AddComponent<NetOuterComponent>();
-				Game.Scene.AddComponent<ResourcesComponent>();
-				Game.Scene.AddComponent<PlayerComponent>();
-				Game.Scene.AddComponent<UnitComponent>();
-				Game.Scene.AddComponent<UIComponent>();
-
-				// 下载ab包
-				//await BundleHelper.DownloadBundle("1111");
-
-				// 加载配置
-				Game.Scene.GetComponent<ResourcesComponent>().LoadBundle("config.unity3d");
-				Game.Scene.AddComponent<ConfigComponent>();
-				Game.Scene.GetComponent<ResourcesComponent>().UnloadBundle("config.unity3d");
-				Game.Scene.AddComponent<OpcodeTypeComponent>();
-				Game.Scene.AddComponent<MessageDispatcherComponent>();
-			}
-			catch (Exception e)
-			{
-				Log.Error(e);
-			}
-		}
-
-		private void Update()
-		{
-			OneThreadSynchronizationContext.Instance.Update();
-			Game.EventSystem.Update();
-		}
-
-		private void LateUpdate()
-		{
-			Game.EventSystem.LateUpdate();
-		}
-
-		private void OnApplicationQuit()
-		{
-			Game.Close();
-		}
-	}
-}

Unity/Assets/HotfixView/Module.meta

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

Unity/Assets/HotfixView/Module/Resource.meta

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

Unity/Assets/HotfixView/Scene.meta

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

Unity/Assets/HotfixView/Scene/SceneFactory.cs

@@ -0,0 +1,17 @@
+namespace ET
+{
+    public static class SceneFactory
+    {
+        public static Scene CreateZoneScene(long id, int zone, string name)
+        {
+            Scene zoneScene = EntitySceneFactory.CreateScene(id, zone, SceneType.Zone, name, Game.Scene);
+            
+            zoneScene.AddComponent<NetOuterComponent>();
+            zoneScene.AddComponent<ResourcesComponent>();
+            zoneScene.AddComponent<PlayerComponent>();
+            zoneScene.AddComponent<UnitComponent>();
+            
+            return zoneScene;
+        }
+    }
+}

Unity/Assets/HotfixView/Helper/ResourcesHelper.cs.meta → Unity/Assets/HotfixView/Scene/SceneFactory.cs.meta

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

Unity/Assets/ModelView/Demo/UI.meta → Unity/Assets/HotfixView/UI.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5875a1089fd5c0446869586dddd4b1eb
+guid: 12217bfa2be27416b92ae613a1efcca4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Unity/Assets/HotfixView/Demo/UI/UILoading/LoadingBeginEvent_CreateLoadingUI.cs → Unity/Assets/HotfixView/UI/UILoading/LoadingBeginEvent_CreateLoadingUI.cs

@@ -5,7 +5,7 @@ namespace ET
     [Event()]
     public class LoadingBeginEvent_CreateLoadingUI : AEvent<EventType.LoadingBegin>
     {
-        public override void Run(EventType.LoadingBegin args)
+        public override async ETTask Run(EventType.LoadingBegin args)
         {
             UI ui = UILoadingFactory.Create(args.Scene);
 			Game.Scene.GetComponent<UIComponent>().Add(ui);

Unity/Assets/HotfixView/Demo/UI/UILoading/LoadingFinishEvent_RemoveLoadingUI.cs → Unity/Assets/HotfixView/UI/UILoading/LoadingFinishEvent_RemoveLoadingUI.cs

@@ -1,9 +1,8 @@
 namespace ET
 {
-    [Event]
     public class LoadingFinishEvent_RemoveLoadingUI : AEvent<EventType.LoadingFinish>
     {
-        public override void Run(EventType.LoadingFinish args)
+        public override async ETTask Run(EventType.LoadingFinish args)
         {
 			Game.Scene.GetComponent<UIComponent>().Remove(UIType.UILoading);
         }

Unity/Assets/HotfixView/Demo/UI/UILoading/UILoadingComponentSystem.cs → Unity/Assets/HotfixView/UI/UILoading/UILoadingComponentSystem.cs

@@ -3,7 +3,6 @@ using UnityEngine.UI;
 
 namespace ET
 {
-    [ObjectSystem]
     public class UiLoadingComponentAwakeSystem : AwakeSystem<UILoadingComponent>
     {
         public override void Awake(UILoadingComponent self)
@@ -12,7 +11,6 @@ namespace ET
         }
     }
 
-    [ObjectSystem]
     public class UiLoadingComponentStartSystem : StartSystem<UILoadingComponent>
     {
         public override void Start(UILoadingComponent self)

Unity/Assets/HotfixView/Demo/UI/UILoading/UILoadingFactory.cs → Unity/Assets/HotfixView/UI/UILoading/UILoadingFactory.cs

@@ -9,7 +9,7 @@ namespace ET
         {
 	        try
 	        {
-				GameObject bundleGameObject = ((GameObject)ResourcesHelper.Load("KV")).Get<GameObject>(UIType.UILoading);
+				GameObject bundleGameObject = ((GameObject)Resources.Load("KV")).Get<GameObject>(UIType.UILoading);
 				GameObject go = UnityEngine.Object.Instantiate(bundleGameObject);
 				go.layer = LayerMask.NameToLayer(LayerNames.UI);
 				UI ui = EntityFactory.Create<UI, string, GameObject>(domain, UIType.UILoading, go);

Unity/Assets/HotfixView/Demo/UI/UILobby/EnterMapFinish_RemoveLobbyUI.cs → Unity/Assets/HotfixView/UI/UILobby/EnterMapFinish_RemoveLobbyUI.cs

@@ -1,9 +1,8 @@
 namespace ET
 {
-	[Event]
 	public class EnterMapFinish_RemoveLobbyUI: AEvent<EventType.EnterMapFinish>
 	{
-		public override void Run(EventType.EnterMapFinish args)
+		public override async ETTask Run(EventType.EnterMapFinish args)
 		{
 			Game.Scene.GetComponent<UIComponent>().Remove(UIType.UILobby);
 			Game.Scene.GetComponent<ResourcesComponent>().UnloadBundle(UIType.UILobby.StringToAB());

Unity/Assets/HotfixView/Demo/UI/UILobby/LoginFinish_CreateLobbyUI.cs → Unity/Assets/HotfixView/UI/UILobby/LoginFinish_CreateLobbyUI.cs

@@ -2,10 +2,9 @@
 
 namespace ET
 {
-	[Event]
 	public class LoginFinish_CreateLobbyUI: AEvent<EventType.LoginFinish>
 	{
-		public override void Run(EventType.LoginFinish args)
+		public override async ETTask Run(EventType.LoginFinish args)
 		{
 			UI ui = UILobbyFactory.Create();
 			Game.Scene.GetComponent<UIComponent>().Add(ui);

Unity/Assets/HotfixView/Demo/UI/UILobby/UILobbyComponentSystem.cs → Unity/Assets/HotfixView/UI/UILobby/UILobbyComponentSystem.cs

@@ -3,7 +3,6 @@ using UnityEngine.UI;
 
 namespace ET
 {
-    [ObjectSystem]
     public class UILobbyComponentAwakeSystem : AwakeSystem<UILobbyComponent>
     {
         public override void Awake(UILobbyComponent self)
@@ -11,7 +10,7 @@ namespace ET
             ReferenceCollector rc = self.GetParent<UI>().ViewGO.GetComponent<ReferenceCollector>();
 			
             self.enterMap = rc.Get<GameObject>("EnterMap");
-            self.enterMap.GetComponent<Button>().onClick.Add(self.EnterMap);
+            self.enterMap.GetComponent<Button>().onClick.AddListener(self.EnterMap);
             self.text = rc.Get<GameObject>("Text").GetComponent<Text>();
         }
     }

Unity/Assets/HotfixView/Demo/UI/UILogin/LoginFinish_RemoveLoginUI.cs → Unity/Assets/HotfixView/UI/UILogin/LoginFinish_RemoveLoginUI.cs

@@ -2,10 +2,9 @@
 
 namespace ET
 {
-	[Event]
 	public class LoginFinish_RemoveLoginUI: AEvent<EventType.LoginFinish>
 	{
-		public override void Run(EventType.LoginFinish args)
+		public override async ETTask Run(EventType.LoginFinish args)
 		{
 			Game.Scene.GetComponent<UIComponent>().Remove(UIType.UILogin);
 			Game.Scene.GetComponent<ResourcesComponent>().UnloadBundle(UIType.UILogin.StringToAB());

Unity/Assets/HotfixView/Demo/UI/UILogin/UILoginComponentSystem.cs → Unity/Assets/HotfixView/UI/UILogin/UILoginComponentSystem.cs

@@ -6,14 +6,13 @@ using UnityEngine.UI;
 
 namespace ET
 {
-	[ObjectSystem]
 	public class UILoginComponentAwakeSystem : AwakeSystem<UILoginComponent>
 	{
 		public override void Awake(UILoginComponent self)
 		{
 			ReferenceCollector rc = self.GetParent<UI>().ViewGO.GetComponent<ReferenceCollector>();
 			self.loginBtn = rc.Get<GameObject>("LoginBtn");
-			self.loginBtn.GetComponent<Button>().onClick.Add(self.OnLogin);
+			self.loginBtn.GetComponent<Button>().onClick.AddListener(self.OnLogin);
 			self.account = rc.Get<GameObject>("Account");
 		}
 	}

Unity/Assets/HotfixView/Unit.meta

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

Unity/Assets/HotfixView/Demo/Unit/AfterUnitCreate_CreateUnitView.cs → Unity/Assets/HotfixView/Unit/AfterUnitCreate_CreateUnitView.cs

@@ -2,10 +2,9 @@
 
 namespace ET
 {
-    [Event]
     public class AfterUnitCreate_CreateUnitView: AEvent<EventType.AfterUnitCreate>
     {
-        public override void Run(EventType.AfterUnitCreate args)
+        public override async ETTask Run(EventType.AfterUnitCreate args)
         {
             // Unit View层
             ResourcesComponent resourcesComponent = Game.Scene.GetComponent<ResourcesComponent>();

Unity/Assets/Model/Base/Entity.meta

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

Unity/Assets/Model/Entity/SceneType.cs → Unity/Assets/Model/Base/Entity/SceneType.cs

@@ -12,5 +12,6 @@
 
 		// 客户端Model层
 		Client = 30,
+		Zone = 31,
 	}
 }