Merge branch 'Branch_qxb' of git.mokasz.com:zouyong/mk_framework into Branch_qxb

assets/script/game/module/forceUpdate/ForceUpdate.ts

@@ -28,6 +28,7 @@ export default class ForceUpdate extends cc.Component {
 
     start() {
         this.setText()
+        this.btnCancel.active = false;
     }
 
     clickDownLoad() {
@@ -67,7 +68,7 @@ export default class ForceUpdate extends cc.Component {
                 this.labPro.string = '0%'
 
                 this.btnSure.active = true
-                this.btnCancel.active = true
+                this.btnCancel.active = false
             },
             (bytesReceived, totalBytesReceived, totalBytesExpected) => {
                 let pro = totalBytesReceived / totalBytesExpected

assets/script/mk/system/UISystem.ts

@@ -151,19 +151,20 @@ export default class UISystem extends cc.Component {
      */
     closeAllUI(except: string[] = ["game", "guide"]) {
         for (let panelName in this.curOnPanelDic) {
-            if (this.isPanelClosingArr.indexOf(panelName) != -1) {
-                continue;
-            }
-            this.isPanelClosingArr.push(panelName);
-
             if (except && except.length > 0 && except.indexOf(panelName) != -1) {
                 continue;
             }
+
             let node_panel = this.getCurOnPanel(panelName);
             if (!node_panel) {
                 continue;
             }
 
+            if (this.isPanelClosingArr.indexOf(panelName) != -1) {
+                continue;
+            }
+            this.isPanelClosingArr.push(panelName);
+
             let comp_anim = node_panel.getComponent('EffectOpenAndClose');
             if (comp_anim) {
                 comp_anim.hideEffect(this.destroyNode.bind(this, node_panel, panelName));