Merge remote-tracking branch 'origin/master' into LouDi_Pig
This commit is contained in:
commit
07fa4680a4
@ -247,6 +247,18 @@ UIKit.HidePanel(""UIHomePanel"");
|
|||||||
panelSearchKeys.Recycle2Cache();
|
panelSearchKeys.Recycle2Cache();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void HidePanel(Type type)
|
||||||
|
{
|
||||||
|
var panelSearchKeys = PanelSearchKeys.Allocate();
|
||||||
|
|
||||||
|
panelSearchKeys.PanelType = type;
|
||||||
|
|
||||||
|
UIManager.Instance.HideUI(panelSearchKeys);
|
||||||
|
|
||||||
|
panelSearchKeys.Recycle2Cache();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
[MethodAPI]
|
[MethodAPI]
|
||||||
[APIDescriptionCN("关闭全部界面")]
|
[APIDescriptionCN("关闭全部界面")]
|
||||||
|
|||||||
@ -15,6 +15,7 @@ public class ActionHelper
|
|||||||
{ "UIOperationList", typeof(UIOperationList) },
|
{ "UIOperationList", typeof(UIOperationList) },
|
||||||
{ "UIBtns", typeof(QFramework.Example.UIBtns) },
|
{ "UIBtns", typeof(QFramework.Example.UIBtns) },
|
||||||
{ "UITools", typeof(QFramework.Example.UITools) },
|
{ "UITools", typeof(QFramework.Example.UITools) },
|
||||||
|
{ "UIHint", typeof(QFramework.Example.UIHint) },
|
||||||
{ "UICameraSwitch", typeof(QFramework.Example.UICameraSwitch) },
|
{ "UICameraSwitch", typeof(QFramework.Example.UICameraSwitch) },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -53,7 +53,7 @@ public class UIShowAction : IAction
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
UIKit.ClosePanel(ActionHelper.typeDict[uiName]);
|
UIKit.HidePanel(ActionHelper.typeDict[uiName]);
|
||||||
this.Finish();
|
this.Finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user