111

Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Manager/PanelSystem.cs

@@ -15,19 +15,22 @@ namespace Stary.Evo.UIFarme
         /// <summary>
         /// UI的入栈操作，此操作会显示一个面板
         /// </summary>
-        Task PushQueue<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new();
+        Task PushQueue<T>(string panelName = null, string packageName = null)
+            where T : IBasePanel, new();
 
         /// <summary>
         /// UI的入栈操作，此操作会显示一个面板
         /// </summary>
-        Task PushStack<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new();
+        Task PushStack<T>(string panelName = null, string packageName = null)
+            where T : IBasePanel, new();
 
         /// <summary>
         /// 执行面板的出栈操作，此操作会执行面板的OnExit方法
         /// </summary>
-        void PopQueue<T>(string panelName=null) where T : IBasePanel, new();
+        void PopQueue<T>(string panelName = null) where T : IBasePanel, new();
+
+        void PopQueue<T>(T t, string panelName = null) where T : IBasePanel, new();
 
-        void PopQueue<T>(T t, string panelName=null) where T : IBasePanel, new();
         /// <summary>
         /// 执行面板的出栈操作，此操作会执行面板的OnExit方法
         /// </summary>
@@ -102,8 +105,8 @@ namespace Stary.Evo.UIFarme
         public PanelSystem(IAssetLoader assetLoader)
         {
             this.AssetLoader = assetLoader;
-            
         }
+
         protected override void OnInit()
         {
             stackPanel = new Stack<IBasePanel>();
@@ -114,27 +117,30 @@ namespace Stary.Evo.UIFarme
                 Debug.LogError("UnityEvo:AssetLoader is null, please set AssetLoader.");
             }
         }
+
         /// <summary>
         /// UI的入栈操作，此操作会显示一个面板
         /// </summary>
         /// <param name="parent"></param>
         /// <param name="packageName">非热更模式传null</param>
         /// <typeparam name="T"></typeparam>
-        public async Task PushQueue<T>(string panelName=null, Transform parent = null, string packageName = null)
+        public async Task PushQueue<T>(string panelName = null, string packageName = null)
             where T : IBasePanel, new()
         {
-			var prefabName = typeof(T).Name;
+            var prefabName = typeof(T).Name;
             if (string.IsNullOrEmpty(panelName))
             {
                 panelName = typeof(T).Name;
             }
+
             IBasePanel nextPanel = null;
             if (!dicUI.ContainsKey(panelName))
             {
                 nextPanel = new T();
                 nextPanel.UIName = panelName;
                 await nextPanel.InitializeAsync(this);
-                nextPanel.SetPanelParent(parent);
+                if (!string.IsNullOrEmpty(nextPanel.UIPath))
+                    nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
                 GameObject panelGo = await nextPanel.CreatePanel(prefabName, packageName);
                 ///生成面板后，进行初始化操作
                 await nextPanel.InitializeAsync(panelGo);
@@ -164,9 +170,10 @@ namespace Stary.Evo.UIFarme
         /// <param name="parent"></param>
         /// <param name="packageName">非热更模式传null</param>
         /// <typeparam name="T"></typeparam>
-        public async Task PushStack<T>(string panelName=null,Transform parent = null, string packageName = null) where T : IBasePanel, new()
+        public async Task PushStack<T>(string panelName = null, string packageName = null)
+            where T : IBasePanel, new()
         {
-			var prefabName = typeof(T).Name;
+            var prefabName = typeof(T).Name;
             if (string.IsNullOrEmpty(panelName))
             {
                 panelName = typeof(T).Name;
@@ -178,7 +185,8 @@ namespace Stary.Evo.UIFarme
                 nextPanel = new T();
                 nextPanel.UIName = panelName;
                 await nextPanel.InitializeAsync(this);
-                nextPanel.SetPanelParent(parent);
+                if (!string.IsNullOrEmpty(nextPanel.UIPath))
+                    nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
                 GameObject panelGo = await nextPanel.CreatePanel(prefabName, packageName);
                 ///生成面板后，进行初始化操作
                 await nextPanel.InitializeAsync(panelGo);
@@ -197,16 +205,18 @@ namespace Stary.Evo.UIFarme
 
                 nextPanel = dicUI[panelName];
             }
-            if(stackPanel.Count > 0)
+
+            if (stackPanel.Count > 0)
             {
                 stackPanel.Peek().OnExit();
             }
+
             stackPanel.Push(nextPanel);
             nextPanel.OnEnter();
         }
 
 
-        public void PopQueue<T>(string panelName=null) where T : IBasePanel, new()
+        public void PopQueue<T>(string panelName = null) where T : IBasePanel, new()
         {
             if (string.IsNullOrEmpty(panelName))
             {