|
@@ -34,7 +34,7 @@ export default class UISystem extends cc.Component {
|
|
|
* @param openAction 打开之后的操(需不需要关闭其他界面)
|
|
* @param openAction 打开之后的操(需不需要关闭其他界面)
|
|
|
*/
|
|
*/
|
|
|
openPanel(panelName: string, openAction: OpenActionType = OpenActionType.normal): Promise<any> {
|
|
openPanel(panelName: string, openAction: OpenActionType = OpenActionType.normal): Promise<any> {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
let self = this;
|
|
let self = this;
|
|
|
if (self.isPanelOpening || self.getCurOnPanel(panelName)) {
|
|
if (self.isPanelOpening || self.getCurOnPanel(panelName)) {
|
|
|
return;
|
|
return;
|
|
@@ -57,6 +57,10 @@ export default class UISystem extends cc.Component {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (self.panelParent) {
|
|
|
|
|
+ self.panelParent = self.node;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
self.panelParent.addChild(node_panel);
|
|
self.panelParent.addChild(node_panel);
|
|
|
|
|
|
|
|
switch (openAction) {
|
|
switch (openAction) {
|