Merge pull request #233 from pandamicro/v0.7

Reverse pause/resume usage because cc.Node doesn't support
This commit is contained in:
pandamicro
2016-01-12 16:14:53 +08:00
2 changed files with 6 additions and 3 deletions
+4 -2
View File
@@ -718,11 +718,13 @@ var Node = cc.Class({
}
// Activate
if (newActive) {
target.resume();
cc.director.getActionManager().resumeTarget(target);
cc.eventManager.resumeTarget(target);
}
// Desactivate
else {
target.pause();
cc.director.getActionManager().pauseTarget(target);
cc.eventManager.pauseTarget(target);
}
},
+2 -1
View File
@@ -603,7 +603,8 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{
sgNode.onEnter = function () {
_ccsg.Node.prototype.onEnter.call(this);
if (!entity._active) {
this.pause();
cc.director.getActionManager().pauseTarget(this);
cc.eventManager.pauseTarget(this);
}
};
}