Merge branch 'feature/wz_XJMH' into develop

2026-04-22 00:25:43 +08:00
parent 17aa582569 6d998711b2
commit d185b6267d
2 changed files with 3 additions and 3 deletions
@@ -258,9 +258,9 @@ public class UIManager : MonoSingleton<UIManager>
        Destroy(obj);
        
    }
-    public void StopShowPanel(UIPanel type, object args, Action<UIBase> onShown, float YCtime)
+    public void StopShowPanel()
    {
-        StopCoroutine(CoShow(type, args, onShown, YCtime));
+        StopAllCoroutines();
    }
    private IEnumerator CoShow(UIPanel type, object args, Action<UIBase> onShown, float YCtime)
    {
@@ -107,7 +107,7 @@ public class GameManager : MonoSingleton<GameManager>
        UIManager.Instance.ShowAsync(UIPanel.LoginPanel,null,null,28);
        btn_Skip.onClick.AddListener(() =>
        {
-            UIManager.Instance.StopShowPanel(UIPanel.LoginPanel, null, null, 28); 
+            UIManager.Instance.StopShowPanel(); 
            UIManager.Instance.ShowAsync(UIPanel.LoginPanel, null, null, 0);
            v.LoadBar(100);
        });