mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
Merge pull request #233 from pandamicro/v0.7
Reverse pause/resume usage because cc.Node doesn't support
This commit is contained in:
@@ -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);
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user