Selaa lähdekoodia

修改征用部分Demo代码

大爷 2 vuotta sitten
vanhempi
commit
0a10b22139
37 muutettua tiedostoa jossa 83 lisäystä ja 22 poistoa
  1. 0 11
      Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs
  2. 1 8
      Unity/Assets/Scripts/Codes/HotfixView/Client/EntryEvent3_InitClient.cs
  3. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/EntryEvent3_InitClient.cs.meta
  4. 8 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/FGUI.meta
  5. 14 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/FGUI/FUIManager.cs
  6. 11 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/FGUI/FUIManager.cs.meta
  7. 8 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/Scene.meta
  8. 3 3
      Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateClientScene_AddComponent.cs
  9. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateClientScene_AddComponent.cs.meta
  10. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateCurrentScene_AddComponent.cs
  11. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateCurrentScene_AddComponent.cs.meta
  12. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/SceneChangeStart_AddComponent.cs
  13. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/SceneChangeStart_AddComponent.cs.meta
  14. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI.meta
  15. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp.meta
  16. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs
  17. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs.meta
  18. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/UIHelpEvent.cs
  19. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/UIHelpEvent.cs.meta
  20. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelper.cs
  21. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelper.cs.meta
  22. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby.meta
  23. 1 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs
  24. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs.meta
  25. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyComponentSystem.cs
  26. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyComponentSystem.cs.meta
  27. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyEvent.cs
  28. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyEvent.cs.meta
  29. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin.meta
  30. 37 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs
  31. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs.meta
  32. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/LoginFinish_RemoveLoginUI.cs
  33. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/LoginFinish_RemoveLoginUI.cs.meta
  34. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginComponentSystem.cs
  35. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginComponentSystem.cs.meta
  36. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginEvent.cs
  37. 0 0
      Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginEvent.cs.meta

+ 0 - 11
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs

@@ -1,11 +0,0 @@
-namespace ET.Client
-{
-	[Event(SceneType.Client)]
-	public class AppStartInitFinish_CreateLoginUI: AEvent<EventType.AppStartInitFinish>
-	{
-		protected override async ETTask Run(Scene scene, EventType.AppStartInitFinish args)
-		{
-			await UIHelper.Create(scene, UIType.UILogin, UILayer.Mid);
-		}
-	}
-}

+ 1 - 8
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/EntryEvent3_InitClient.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/EntryEvent3_InitClient.cs

@@ -1,6 +1,3 @@
-using System;
-using System.IO;
-
 namespace ET.Client
 {
     [Event(SceneType.Process)]
@@ -10,13 +7,9 @@ namespace ET.Client
         {
             // 加载配置
             //Root.Instance.Scene.AddComponent<ResourcesComponent>();
-            
-            Root.Instance.Scene.AddComponent<GlobalComponent>();
+            //Root.Instance.Scene.AddComponent<GlobalComponent>();
 
-            //await ResourcesComponent.Instance.LoadBundleAsync("unit.unity3d");
-            
             Scene clientScene = await SceneFactory.CreateClientScene(1, "Game");
-            
             await EventSystem.Instance.PublishAsync(clientScene, new EventType.AppStartInitFinish());
         }
     }

+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/EntryEvent3_InitClient.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/EntryEvent3_InitClient.cs.meta


+ 8 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/FGUI.meta

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

+ 14 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/FGUI/FUIManager.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ET
+{
+    public class FUIManager
+    {
+        public static void Init()
+        {
+
+        }
+    }
+}

+ 11 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/FGUI/FUIManager.cs.meta

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

+ 8 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Scene.meta

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

+ 3 - 3
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene/AfterCreateClientScene_AddComponent.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateClientScene_AddComponent.cs

@@ -5,9 +5,9 @@ namespace ET.Client
     {
         protected override async ETTask Run(Scene scene, EventType.AfterCreateClientScene args)
         {
-            scene.AddComponent<UIEventComponent>();
-            scene.AddComponent<UIComponent>();
-            scene.AddComponent<ResourcesLoaderComponent>();
+            //scene.AddComponent<UIEventComponent>();
+            //scene.AddComponent<UIComponent>();
+            //scene.AddComponent<ResourcesLoaderComponent>();
             await ETTask.CompletedTask;
         }
     }

+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene/AfterCreateClientScene_AddComponent.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateClientScene_AddComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene/AfterCreateCurrentScene_AddComponent.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateCurrentScene_AddComponent.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene/AfterCreateCurrentScene_AddComponent.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/AfterCreateCurrentScene_AddComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene/SceneChangeStart_AddComponent.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/SceneChangeStart_AddComponent.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene/SceneChangeStart_AddComponent.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/SceneChangeStart_AddComponent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIHelp.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIHelp/UIHelpEvent.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/UIHelpEvent.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIHelp/UIHelpEvent.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelp/UIHelpEvent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIHelper.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelper.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UIHelper.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelper.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby.meta


+ 1 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby/LoginFinish_CreateLobbyUI.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs

@@ -5,6 +5,7 @@
 	{
 		protected override async ETTask Run(Scene scene, EventType.LoginFinish args)
 		{
+			Log.Debug("login finished.");
 			await UIHelper.Create(scene, UIType.UILobby, UILayer.Mid);
 		}
 	}

+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby/LoginFinish_CreateLobbyUI.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby/UILobbyComponentSystem.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyComponentSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby/UILobbyComponentSystem.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyComponentSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby/UILobbyEvent.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyEvent.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILobby/UILobbyEvent.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/UILobbyEvent.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin.meta


+ 37 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs

@@ -0,0 +1,37 @@
+using UnityEngine;
+using FairyGUI;
+using Cysharp.Threading.Tasks;
+
+namespace ET.Client
+{
+	[Event(SceneType.Client)]
+	public class AppStartInitFinish_CreateLoginUI: AEvent<EventType.AppStartInitFinish>
+	{
+		protected override async ETTask Run(Scene scene, EventType.AppStartInitFinish args)
+		{
+            var ass = await YooAssetProxy.LoadAssetAsync<TextAsset>("FGUI_Login_fui");
+            UIPackage.AddPackage(ass.GetAssetObject<TextAsset>().bytes, "Login", LoadPackageInternalAsync);
+            var view = UIPackage.CreateObject("Login", "Login").asCom;
+            var preView = GRoot.inst.GetChildAt(0);
+            GRoot.inst.RemoveChildren();
+            GRoot.inst.AddChild(view);
+
+            preView.Dispose();
+            UIPackage.RemovePackage("CheckForResUpdate");
+        }
+
+        /// <summary>
+        /// 加载资源的异步委托
+        /// </summary>
+        /// <param name="name">注意,这个name是FGUI内部组装的纹理全名,例如FUILogin_atlas0</param>
+        /// <param name="extension"></param>
+        /// <param name="type"></param>
+        /// <param name="item"></param>
+        private static async void LoadPackageInternalAsync(string name,
+            string extension, System.Type type, PackageItem item)
+        {
+            var tex = await YooAssetProxy.LoadAssetAsync<Texture>($"FGUI_{name}");
+            item.owner.SetItemAsset(item, tex.GetAsset<Texture>(), DestroyMethod.Unload);
+        }
+    }
+}

+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/LoginFinish_RemoveLoginUI.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/LoginFinish_RemoveLoginUI.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/LoginFinish_RemoveLoginUI.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/LoginFinish_RemoveLoginUI.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/UILoginComponentSystem.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginComponentSystem.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/UILoginComponentSystem.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginComponentSystem.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/UILoginEvent.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginEvent.cs


+ 0 - 0
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/UI/UILogin/UILoginEvent.cs.meta → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/UILoginEvent.cs.meta