Merge branch 'master' of http://git.mokasz.com/zouyong/tower_sanguo

tower_sanguo/assets/MOKA/component/BaseUI.ts

@@ -174,7 +174,6 @@ export default abstract class BaseUI extends cc.Component {//abstract
         if (this.effect_par) {
             switch (this.close_effect) {
                 case EffectType.NONE:
-                    this.node.parent = null;
                     this.node.destroy();
                     this.onClear();
                     cb && cb();
@@ -183,7 +182,6 @@ export default abstract class BaseUI extends cc.Component {//abstract
                     cc.tween(this.effect_par)
                         .to(0.15, { scale: 0 })
                         .call(() => {
-                            this.node.parent = null;
                             this.onClear();
                             this.node.destroy();
                             cb && cb();
@@ -212,14 +210,13 @@ export default abstract class BaseUI extends cc.Component {//abstract
                             this.onClear();
                             this.node.destroy();
                             cb && cb();
-                            cc.log('关闭时动画节点未找到，请检查！！！！！')
+                            cc.error('关闭时动画节点未找到，请检查！！！！！')
                         }
                     }
                     break;
             }
         }
         else {
-            this.node.parent = null;
             this.onClear();
             this.node.destroy();
             cb && cb();