From 7ae6257cae995aeadec132eaf0cdd76191f6b0f9 Mon Sep 17 00:00:00 2001
From: stary <834207172@qq.com>
Date: Fri, 15 May 2026 19:34:08 +0800
Subject: [PATCH] 1111

---
 .../Runtime/Tool/PanelSystem/Base/BasePanel.cs  |  6 ++----
 .../Tool/PanelSystem/Manager/PanelSystem.cs     | 17 +++++++++--------
 Assets/00.StaryEvo/package.json                 |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Base/BasePanel.cs b/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Base/BasePanel.cs
index 3ec9c26..210dc19 100644
--- a/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Base/BasePanel.cs
+++ b/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Base/BasePanel.cs
@@ -129,10 +129,9 @@ namespace Stary.Evo.UIFarme
             canvasGroup.alpha = 0f;
         }
 
-        public virtual Task InitializeAsync(GameObject panelGo)
+        public virtual async Task InitializeAsync(GameObject panelGo)
         {
             Initialize(panelGo);
-            return Task.CompletedTask;
         }
 
         public virtual void Initialize(IPanelSystem sysytem)
@@ -140,10 +139,9 @@ namespace Stary.Evo.UIFarme
             PanelSystem = sysytem;
         }
 
-        public virtual Task InitializeAsync(IPanelSystem sysytem)
+        public  virtual async Task InitializeAsync(IPanelSystem sysytem)
         {
             Initialize(sysytem);
-            return Task.CompletedTask;
         }
 
 
diff --git a/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Manager/PanelSystem.cs b/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Manager/PanelSystem.cs
index 0bb0d2f..007f789 100644
--- a/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Manager/PanelSystem.cs
+++ b/Assets/00.StaryEvo/Runtime/Tool/PanelSystem/Manager/PanelSystem.cs
@@ -15,13 +15,13 @@ namespace Stary.Evo.UIFarme
         /// <summary>
         /// UI的入栈操作，此操作会显示一个面板
         /// </summary>
-        Task PushQueue<T>(string panelName = null, string packageName = null)
+        Task PushQueue<T>(string packageName = null)
             where T : IBasePanel, new();
 
         /// <summary>
         /// UI的入栈操作，此操作会显示一个面板
         /// </summary>
-        Task PushStack<T>(string panelName = null, string packageName = null)
+        Task PushStack<T>(string packageName = null)
             where T : IBasePanel, new();
 
         /// <summary>
@@ -124,10 +124,10 @@ namespace Stary.Evo.UIFarme
         /// <param name="parent"></param>
         /// <param name="packageName">非热更模式传null</param>
         /// <typeparam name="T"></typeparam>
-        public async Task PushQueue<T>(string panelName = null, string packageName = null)
+        public async Task PushQueue<T>( string packageName = null)
             where T : IBasePanel, new()
         {
-            var prefabName = typeof(T).Name;
+            var panelName = typeof(T).Name;
             if (string.IsNullOrEmpty(panelName))
             {
                 panelName = typeof(T).Name;
@@ -141,7 +141,7 @@ namespace Stary.Evo.UIFarme
                 await nextPanel.InitializeAsync(this);
                 if (!string.IsNullOrEmpty(nextPanel.UIPath))
                     nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
-                GameObject panelGo = await nextPanel.CreatePanel(prefabName, packageName);
+                GameObject panelGo = await nextPanel.CreatePanel(panelName, packageName);
                 ///生成面板后，进行初始化操作
                 await nextPanel.InitializeAsync(panelGo);
                 dicUI.Add(panelName, nextPanel);
@@ -164,16 +164,17 @@ namespace Stary.Evo.UIFarme
             //TOOD
         }
 
+    
         /// <summary>
         /// UI的入栈操作，此操作会显示一个面板
         /// </summary>
         /// <param name="parent"></param>
         /// <param name="packageName">非热更模式传null</param>
         /// <typeparam name="T"></typeparam>
-        public async Task PushStack<T>(string panelName = null, string packageName = null)
+        public async Task PushStack<T>(string packageName = null)
             where T : IBasePanel, new()
         {
-            var prefabName = typeof(T).Name;
+            var panelName = typeof(T).Name;
             if (string.IsNullOrEmpty(panelName))
             {
                 panelName = typeof(T).Name;
@@ -187,7 +188,7 @@ namespace Stary.Evo.UIFarme
                 await nextPanel.InitializeAsync(this);
                 if (!string.IsNullOrEmpty(nextPanel.UIPath))
                     nextPanel.SetPanelParent(GameObject.Find(nextPanel.UIPath).transform);
-                GameObject panelGo = await nextPanel.CreatePanel(prefabName, packageName);
+                GameObject panelGo = await nextPanel.CreatePanel(panelName, packageName);
                 ///生成面板后，进行初始化操作
                 await nextPanel.InitializeAsync(panelGo);
 
diff --git a/Assets/00.StaryEvo/package.json b/Assets/00.StaryEvo/package.json
index ab380b7..058d7dc 100644
--- a/Assets/00.StaryEvo/package.json
+++ b/Assets/00.StaryEvo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.staryevo.main",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "displayName": "00.StaryEvo",
   "description": "This is an Framework package(后台服务器版本，端口9527)",
   "unity": "2021.3",