diff --git a/Assets/QFramework/Toolkits/UIKit/Scripts/UIKit.cs b/Assets/QFramework/Toolkits/UIKit/Scripts/UIKit.cs index 66ae53c3..f7a11b0f 100644 --- a/Assets/QFramework/Toolkits/UIKit/Scripts/UIKit.cs +++ b/Assets/QFramework/Toolkits/UIKit/Scripts/UIKit.cs @@ -308,6 +308,17 @@ UIKit.GetPanel(""UIHomePanel""); return retPanel as T; } + public static UIPanel GetPanel(Type type) + { + var panelSearchKeys = PanelSearchKeys.Allocate(); + panelSearchKeys.PanelType = type; + + var retPanel = UIManager.Instance.GetUI(panelSearchKeys); + + panelSearchKeys.Recycle2Cache(); + + return retPanel; + } #region 给脚本层用的 api diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs index d045490c..f5fe5cc9 100644 --- a/Assets/Scripts/Actions/ActionHelper.cs +++ b/Assets/Scripts/Actions/ActionHelper.cs @@ -16,6 +16,7 @@ public class ActionHelper { "UIBtns", typeof(QFramework.Example.UIBtns) }, { "UITools", typeof(QFramework.Example.UITools) }, { "UIHint", typeof(QFramework.Example.UIHint) }, + { "UITextTip", typeof(QFramework.Example.UITextTip) }, { "UICameraSwitch", typeof(QFramework.Example.UICameraSwitch) }, }; diff --git a/Assets/Scripts/Actions/UIShowAction.cs b/Assets/Scripts/Actions/UIShowAction.cs index 0555a46c..d05108e1 100644 --- a/Assets/Scripts/Actions/UIShowAction.cs +++ b/Assets/Scripts/Actions/UIShowAction.cs @@ -53,7 +53,11 @@ public class UIShowAction : IAction } else { - UIKit.HidePanel(ActionHelper.typeDict[uiName]); + if (UIKit.GetPanel(ActionHelper.typeDict[uiName]) != null) + { + UIKit.HidePanel(ActionHelper.typeDict[uiName]); + } + this.Finish(); } }