From 0dce8be3e4fed7cb8c74cfc5775055aba349eec4 Mon Sep 17 00:00:00 2001
From: tanghai <egametang@gmail.com>
Date: Tue, 4 Aug 2020 23:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Unity/Assets/HotfixView/AppStart_Init.cs      | 10 +++++++--
 .../AfterCreateZoneScene_AddComponent.cs      |  1 +
 .../Scene/SceneFactory.cs                     |  5 +++--
 .../Scene/SceneFactory.cs.meta                |  2 +-
 .../AfterCreateZoneScene_CreateLoginUI.cs     | 12 ----------
 .../AppStartInitFinish_CreateLoginUI.cs       | 12 ++++++++++
 ... AppStartInitFinish_CreateLoginUI.cs.meta} |  2 +-
 .../UI/UILogin/UILoginComponentSystem.cs      |  2 +-
 Unity/Assets/Model/EventType.cs               |  5 +++++
 .../Module/Resource/ResourcesComponent.cs     | 10 +++++++++
 Unity/Assets/Model/Unit/TurnComponent.cs      |  2 +-
 Unity/Assets/Model/Unit/Unit.cs               |  6 ++++-
 Unity/Assets/ModelView/Module/UI/UI.cs        | 22 +++++++++----------
 .../ModelView/Unit/AnimatorComponent.cs       |  2 +-
 Unity/Unity.Hotfix.csproj                     |  1 -
 Unity/Unity.HotfixView.csproj                 |  3 ++-
 16 files changed, 62 insertions(+), 35 deletions(-)
 rename Unity/Assets/{Hotfix => HotfixView}/Scene/SceneFactory.cs (86%)
 rename Unity/Assets/{Hotfix => HotfixView}/Scene/SceneFactory.cs.meta (83%)
 delete mode 100644 Unity/Assets/HotfixView/UI/UILogin/AfterCreateZoneScene_CreateLoginUI.cs
 create mode 100644 Unity/Assets/HotfixView/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs
 rename Unity/Assets/HotfixView/UI/UILogin/{AfterCreateZoneScene_CreateLoginUI.cs.meta => AppStartInitFinish_CreateLoginUI.cs.meta} (83%)

diff --git a/Unity/Assets/HotfixView/AppStart_Init.cs b/Unity/Assets/HotfixView/AppStart_Init.cs
index 3919f318..3ffdf62d 100644
--- a/Unity/Assets/HotfixView/AppStart_Init.cs
+++ b/Unity/Assets/HotfixView/AppStart_Init.cs
@@ -11,14 +11,20 @@ namespace ET
             //await BundleHelper.DownloadBundle("1111");
 
             // 加载配置
-            Game.Scene.AddComponent<ResourcesComponent>().LoadBundle("config.unity3d");
+            Game.Scene.AddComponent<ResourcesComponent>();
+            
+            ResourcesComponent.Instance.LoadBundle("config.unity3d");
             Game.Scene.AddComponent<ConfigComponent>();
-            Game.Scene.GetComponent<ResourcesComponent>().UnloadBundle("config.unity3d");
+            ResourcesComponent.Instance.UnloadBundle("config.unity3d");
+            
             Game.Scene.AddComponent<OpcodeTypeComponent>();
             Game.Scene.AddComponent<MessageDispatcherComponent>();
+            Game.Scene.AddComponent<UIEventComponent>();
 
 
             Scene zoneScene = await SceneFactory.CreateZoneScene(1, 0, "Game");
+
+            await Game.EventSystem.Publish(new EventType.AppStartInitFinish() { ZoneScene = zoneScene });
         }
     }
 }
\ No newline at end of file
diff --git a/Unity/Assets/HotfixView/Scene/AfterCreateZoneScene_AddComponent.cs b/Unity/Assets/HotfixView/Scene/AfterCreateZoneScene_AddComponent.cs
index 772b4ba1..7dc6704e 100644
--- a/Unity/Assets/HotfixView/Scene/AfterCreateZoneScene_AddComponent.cs
+++ b/Unity/Assets/HotfixView/Scene/AfterCreateZoneScene_AddComponent.cs
@@ -6,6 +6,7 @@ namespace ET
         {
             Scene zoneScene = args.ZoneScene;
             zoneScene.AddComponent<ResourcesComponent>();
+            zoneScene.AddComponent<UIComponent>();
         }
     }
 }
\ No newline at end of file
diff --git a/Unity/Assets/Hotfix/Scene/SceneFactory.cs b/Unity/Assets/HotfixView/Scene/SceneFactory.cs
similarity index 86%
rename from Unity/Assets/Hotfix/Scene/SceneFactory.cs
rename to Unity/Assets/HotfixView/Scene/SceneFactory.cs
index 8762c2db..1ef25a03 100644
--- a/Unity/Assets/Hotfix/Scene/SceneFactory.cs
+++ b/Unity/Assets/HotfixView/Scene/SceneFactory.cs
@@ -9,8 +9,9 @@ namespace ET
             zoneScene.AddComponent<NetOuterComponent>();
             zoneScene.AddComponent<PlayerComponent>();
             zoneScene.AddComponent<UnitComponent>();
-
-            await Game.EventSystem.Publish(new EventType.AfterCreateZoneScene());
+            
+            // UI层的初始化
+            await Game.EventSystem.Publish(new EventType.AfterCreateZoneScene() {ZoneScene = zoneScene});
             
             return zoneScene;
         }
diff --git a/Unity/Assets/Hotfix/Scene/SceneFactory.cs.meta b/Unity/Assets/HotfixView/Scene/SceneFactory.cs.meta
similarity index 83%
rename from Unity/Assets/Hotfix/Scene/SceneFactory.cs.meta
rename to Unity/Assets/HotfixView/Scene/SceneFactory.cs.meta
index 987803b3..b0606ed4 100644
--- a/Unity/Assets/Hotfix/Scene/SceneFactory.cs.meta
+++ b/Unity/Assets/HotfixView/Scene/SceneFactory.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7cbe6b8dba0d1462e8ef45f7674b9794
+guid: 6132d5efb1bae460db2ef73d954f24e0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Unity/Assets/HotfixView/UI/UILogin/AfterCreateZoneScene_CreateLoginUI.cs b/Unity/Assets/HotfixView/UI/UILogin/AfterCreateZoneScene_CreateLoginUI.cs
deleted file mode 100644
index e7081961..00000000
--- a/Unity/Assets/HotfixView/UI/UILogin/AfterCreateZoneScene_CreateLoginUI.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-namespace ET
-{
-	public class AfterCreateZoneScene_RemoveLoginUI: AEvent<EventType.AfterCreateZoneScene>
-	{
-		public override async ETTask Run(EventType.AfterCreateZoneScene args)
-		{
-			await UIHelper.Create(args.ZoneScene, UIType.UILogin);
-		}
-	}
-}
diff --git a/Unity/Assets/HotfixView/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs b/Unity/Assets/HotfixView/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs
new file mode 100644
index 00000000..5abdb385
--- /dev/null
+++ b/Unity/Assets/HotfixView/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs
@@ -0,0 +1,12 @@
+
+
+namespace ET
+{
+	public class AppStartInitFinish_RemoveLoginUI: AEvent<EventType.AppStartInitFinish>
+	{
+		public override async ETTask Run(EventType.AppStartInitFinish args)
+		{
+			await UIHelper.Create(args.ZoneScene, UIType.UILogin);
+		}
+	}
+}
diff --git a/Unity/Assets/HotfixView/UI/UILogin/AfterCreateZoneScene_CreateLoginUI.cs.meta b/Unity/Assets/HotfixView/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs.meta
similarity index 83%
rename from Unity/Assets/HotfixView/UI/UILogin/AfterCreateZoneScene_CreateLoginUI.cs.meta
rename to Unity/Assets/HotfixView/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs.meta
index 9e2a6446..488066f2 100644
--- a/Unity/Assets/HotfixView/UI/UILogin/AfterCreateZoneScene_CreateLoginUI.cs.meta
+++ b/Unity/Assets/HotfixView/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f86b269e7cff94f3cb2a36780d7a9f27
+guid: 8ca3bab3d15364846a895a2545184b52
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Unity/Assets/HotfixView/UI/UILogin/UILoginComponentSystem.cs b/Unity/Assets/HotfixView/UI/UILogin/UILoginComponentSystem.cs
index c5242c19..ac463511 100644
--- a/Unity/Assets/HotfixView/UI/UILogin/UILoginComponentSystem.cs
+++ b/Unity/Assets/HotfixView/UI/UILogin/UILoginComponentSystem.cs
@@ -10,7 +10,7 @@ namespace ET
 	{
 		public override void Awake(UILoginComponent self)
 		{
-			ReferenceCollector rc = self.GetParent<UI>().ViewGO.GetComponent<ReferenceCollector>();
+			ReferenceCollector rc = self.GetParent<UI>().GameObject.GetComponent<ReferenceCollector>();
 			self.loginBtn = rc.Get<GameObject>("LoginBtn");
 			self.loginBtn.GetComponent<Button>().onClick.AddListener(self.OnLogin);
 			self.account = rc.Get<GameObject>("Account");
diff --git a/Unity/Assets/Model/EventType.cs b/Unity/Assets/Model/EventType.cs
index 7cccf075..7518abba 100644
--- a/Unity/Assets/Model/EventType.cs
+++ b/Unity/Assets/Model/EventType.cs
@@ -16,6 +16,11 @@
             public Scene LoginScene;
         }
 
+        public struct AppStartInitFinish
+        {
+            public Scene ZoneScene;
+        }
+
         public struct LoginFinish
         {
             public Scene ZoneScene;
diff --git a/Unity/Assets/Model/Module/Resource/ResourcesComponent.cs b/Unity/Assets/Model/Module/Resource/ResourcesComponent.cs
index 8bdeb85c..438f9e0c 100644
--- a/Unity/Assets/Model/Module/Resource/ResourcesComponent.cs
+++ b/Unity/Assets/Model/Module/Resource/ResourcesComponent.cs
@@ -165,9 +165,19 @@ namespace ET
 		}
 	}
 	
+	public class ResourcesComponentAwakeSystem: AwakeSystem<ResourcesComponent>
+	{
+		public override void Awake(ResourcesComponent self)
+		{
+			ResourcesComponent.Instance = self;
+		}
+	}
+	
 
 	public class ResourcesComponent : Entity
 	{
+		public static ResourcesComponent Instance;
+		
 		public static AssetBundleManifest AssetBundleManifestObject { get; set; }
 
 		private readonly Dictionary<string, Dictionary<string, UnityEngine.Object>> resourceCache = new Dictionary<string, Dictionary<string, UnityEngine.Object>>();
diff --git a/Unity/Assets/Model/Unit/TurnComponent.cs b/Unity/Assets/Model/Unit/TurnComponent.cs
index ec32bfcb..79861b82 100644
--- a/Unity/Assets/Model/Unit/TurnComponent.cs
+++ b/Unity/Assets/Model/Unit/TurnComponent.cs
@@ -43,7 +43,7 @@ namespace ET
 		/// </summary>
 		public void Turn2D(Vector3 dir, float turnTime = 0.1f)
 		{
-			Vector3 nexpos = this.GetParent<Unit>().ViewGO.transform.position + dir;
+			Vector3 nexpos = this.GetParent<Unit>().GameObject.transform.position + dir;
 			Turn(nexpos, turnTime);
 		}
 
diff --git a/Unity/Assets/Model/Unit/Unit.cs b/Unity/Assets/Model/Unit/Unit.cs
index a659ac85..ca9516d4 100644
--- a/Unity/Assets/Model/Unit/Unit.cs
+++ b/Unity/Assets/Model/Unit/Unit.cs
@@ -1,10 +1,14 @@
-using Quaternion = UnityEngine.Quaternion;
+using UnityEngine;
+using Quaternion = UnityEngine.Quaternion;
 using Vector3 = UnityEngine.Vector3;
 
 namespace ET
 {
 	public sealed class Unit: Entity
 	{
+		// 先放这里，去掉ViewGO，后面挪到显示层
+		public GameObject GameObject;
+		
 		public int ConfigId;
 
 		public UnitConfig Config
diff --git a/Unity/Assets/ModelView/Module/UI/UI.cs b/Unity/Assets/ModelView/Module/UI/UI.cs
index 2990649e..3fd137e0 100644
--- a/Unity/Assets/ModelView/Module/UI/UI.cs
+++ b/Unity/Assets/ModelView/Module/UI/UI.cs
@@ -21,11 +21,11 @@ namespace ET
 		
 		public string Name { get; private set; }
 
-		public Dictionary<string, UI> children = new Dictionary<string, UI>();
+		public Dictionary<string, UI> nameChildren = new Dictionary<string, UI>();
 		
 		public void Awake(string name, GameObject gameObject)
 		{
-			this.children.Clear();
+			this.nameChildren.Clear();
 			gameObject.AddComponent<ComponentView>().Component = this;
 			gameObject.layer = LayerMask.NameToLayer(LayerNames.UI);
 			this.Name = name;
@@ -41,45 +41,45 @@ namespace ET
 			
 			base.Dispose();
 
-			foreach (UI ui in this.children.Values)
+			foreach (UI ui in this.nameChildren.Values)
 			{
 				ui.Dispose();
 			}
 			
-			UnityEngine.Object.Destroy(this.ViewGO);
-			children.Clear();
+			UnityEngine.Object.Destroy(this.GameObject);
+			this.nameChildren.Clear();
 		}
 
 		public void SetAsFirstSibling()
 		{
-			this.ViewGO.transform.SetAsFirstSibling();
+			this.GameObject.transform.SetAsFirstSibling();
 		}
 
 		public void Add(UI ui)
 		{
-			this.children.Add(ui.Name, ui);
+			this.nameChildren.Add(ui.Name, ui);
 			ui.Parent = this;
 		}
 
 		public void Remove(string name)
 		{
 			UI ui;
-			if (!this.children.TryGetValue(name, out ui))
+			if (!this.nameChildren.TryGetValue(name, out ui))
 			{
 				return;
 			}
-			this.children.Remove(name);
+			this.nameChildren.Remove(name);
 			ui.Dispose();
 		}
 
 		public UI Get(string name)
 		{
 			UI child;
-			if (this.children.TryGetValue(name, out child))
+			if (this.nameChildren.TryGetValue(name, out child))
 			{
 				return child;
 			}
-			GameObject childGameObject = this.ViewGO.transform.Find(name)?.gameObject;
+			GameObject childGameObject = this.GameObject.transform.Find(name)?.gameObject;
 			if (childGameObject == null)
 			{
 				return null;
diff --git a/Unity/Assets/ModelView/Unit/AnimatorComponent.cs b/Unity/Assets/ModelView/Unit/AnimatorComponent.cs
index c2fc7100..f0a44d2b 100644
--- a/Unity/Assets/ModelView/Unit/AnimatorComponent.cs
+++ b/Unity/Assets/ModelView/Unit/AnimatorComponent.cs
@@ -40,7 +40,7 @@ namespace ET
 
 		public void Awake()
 		{
-			Animator animator = this.GetParent<Unit>().ViewGO.GetComponent<Animator>();
+			Animator animator = this.GetParent<Unit>().GameObject.GetComponent<Animator>();
 
 			if (animator == null)
 			{
diff --git a/Unity/Unity.Hotfix.csproj b/Unity/Unity.Hotfix.csproj
index 15dd74f8..a95b6e0c 100644
--- a/Unity/Unity.Hotfix.csproj
+++ b/Unity/Unity.Hotfix.csproj
@@ -65,7 +65,6 @@
      <Compile Include="Assets\Hotfix\Move\M2C_PathfindingResultHandler.cs" />
      <Compile Include="Assets\Hotfix\Scene\LoginHelper.cs" />
      <Compile Include="Assets\Hotfix\Scene\MapHelper.cs" />
-     <Compile Include="Assets\Hotfix\Scene\SceneFactory.cs" />
      <Compile Include="Assets\Hotfix\Unit\M2C_CreateUnitsHandler.cs" />
      <Compile Include="Assets\Hotfix\Unit\PlayerFactory.cs" />
      <Compile Include="Assets\Hotfix\Unit\UnitFactory.cs" />
diff --git a/Unity/Unity.HotfixView.csproj b/Unity/Unity.HotfixView.csproj
index 30c2a75a..fe312bea 100644
--- a/Unity/Unity.HotfixView.csproj
+++ b/Unity/Unity.HotfixView.csproj
@@ -63,6 +63,7 @@
      <Compile Include="Assets\HotfixView\Module\UI\UIComponentSystem.cs" />
      <Compile Include="Assets\HotfixView\Module\UI\UIEventComponentSystem.cs" />
      <Compile Include="Assets\HotfixView\Scene\AfterCreateZoneScene_AddComponent.cs" />
+     <Compile Include="Assets\HotfixView\Scene\SceneFactory.cs" />
      <Compile Include="Assets\HotfixView\UI\UIHelper.cs" />
      <Compile Include="Assets\HotfixView\UI\UILoading\LoadingBeginEvent_CreateLoadingUI.cs" />
      <Compile Include="Assets\HotfixView\UI\UILoading\LoadingFinishEvent_RemoveLoadingUI.cs" />
@@ -72,7 +73,7 @@
      <Compile Include="Assets\HotfixView\UI\UILobby\LoginFinish_CreateLobbyUI.cs" />
      <Compile Include="Assets\HotfixView\UI\UILobby\UILobbyComponentSystem.cs" />
      <Compile Include="Assets\HotfixView\UI\UILobby\UILobbyEvent.cs" />
-     <Compile Include="Assets\HotfixView\UI\UILogin\AfterCreateZoneScene_CreateLoginUI.cs" />
+     <Compile Include="Assets\HotfixView\UI\UILogin\AppStartInitFinish_CreateLoginUI.cs" />
      <Compile Include="Assets\HotfixView\UI\UILogin\LoginFinish_RemoveLoginUI.cs" />
      <Compile Include="Assets\HotfixView\UI\UILogin\UILoginComponentSystem.cs" />
      <Compile Include="Assets\HotfixView\UI\UILogin\UILoginEvent.cs" />
-- 
GitLab