[修复]1. 修复UI包变动的接口兼容

GameFrameX · Nov 12, 2024 · 2d5fb4e · 2d5fb4e
1 parent 99eb639
commit 2d5fb4e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/Assets/Hotfix/UI/Logic/UILogin/UILogin.cs b/Assets/Hotfix/UI/Logic/UILogin/UILogin.cs
@@ -18,7 +18,7 @@ public partial class UILogin
         public static string serverIp = "127.0.0.1";
         public static int serverPort = 29100;
 
-        protected override void OnOpen(object userData)
+        public override void OnOpen(object userData)
         {
             m_enter.onClick.Add(OnLoginClick);
             base.OnOpen(userData);
@@ -84,7 +84,7 @@ private async void Login()
             }
 
             await GameApp.UI.OpenUIFormAsync<UIMain>(Utility.Asset.Path.GetUIPath(FUIPackage.UIMain), UIGroupConstants.Floor.Name);
-            GameApp.UI.CloseUIForm(UIForm);
+            GameApp.UI.CloseUIForm(this);
         }
 
         private static void OnNetworkClosed(object sender, GameEventArgs e)

diff --git a/Assets/Hotfix/UI/Logic/UILogin/UIPlayerCreate.cs b/Assets/Hotfix/UI/Logic/UILogin/UIPlayerCreate.cs
@@ -10,7 +10,7 @@ public partial class UIPlayerCreate
     {
         ReqPlayerCreate req;
 
-        protected override void OnOpen(object userData)
+        public override void OnOpen(object userData)
         {
             req = new ReqPlayerCreate();
             base.OnOpen(userData);
@@ -36,7 +36,7 @@ private async void OnCreateButtonClick()
             }
 
             await GameApp.UI.OpenUIFormAsync<UIPlayerList>( Utility.Asset.Path.GetUIPackagePath(FUIPackage.UILogin),UIGroupConstants.Floor.Name, UserData);
-            GameApp.UI.CloseUIForm(UIForm);
+            GameApp.UI.CloseUIForm(this);
         }
     }
 }
diff --git a/Assets/Hotfix/UI/Logic/UILogin/UIPlayerList.cs b/Assets/Hotfix/UI/Logic/UILogin/UIPlayerList.cs
@@ -11,7 +11,7 @@ public partial class UIPlayerList
     {
         List<PlayerInfo> playerList = new List<PlayerInfo>();
 
-        protected override async void OnOpen(object userData)
+        public override async void OnOpen(object userData)
         {
             base.OnOpen(userData);
 
@@ -37,7 +37,7 @@ private async void OnLoginButtonClick()
             var respPlayerLogin = await GameApp.Network.GetNetworkChannel("network").Call<RespPlayerLogin>(reqPlayerLogin);
             PlayerManager.Instance.PlayerInfo = respPlayerLogin.PlayerInfo;
             await GameApp.UI.OpenUIFormAsync<UIMain>(Utility.Asset.Path.GetUIPackagePath(FUIPackage.UIMain), UIGroupConstants.Floor.Name);
-            GameApp.UI.CloseUIForm(UIForm);
+            GameApp.UI.CloseUIForm(this);
         }
 
         PlayerInfo m_SelectedPlayerInfo;

diff --git a/Assets/Hotfix/UI/Logic/UIMain/UIMain.cs b/Assets/Hotfix/UI/Logic/UIMain/UIMain.cs
@@ -7,7 +7,7 @@ namespace Hotfix.UI
 {
     public partial class UIMain
     {
-        protected override void OnOpen(object userData)
+        public override void OnOpen(object userData)
         {
             base.OnOpen(userData);
 

diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta
diff --git a/Assets/Scripts/Framework/Procedure/LauncherUIHandler.cs b/Assets/Scripts/Framework/Procedure/LauncherUIHandler.cs
@@ -18,7 +18,7 @@ public static async void Start()
 
         public static void Dispose()
         {
-            GameApp.UI.CloseUIForm(_ui.UIForm);
+            GameApp.UI.CloseUIForm<UILauncher>();
             _ui = null;
         }