From be89183f18be9d56cb1448863d95cf37d6677ca5 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 12 Jan 2016 16:12:56 +0800 Subject: [PATCH] Reverse pause/resume usage because cc.Node doesn't support --- cocos2d/core/CCNode.js | 6 ++++-- cocos2d/core/utils/base-node.js | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index 9edefd7a63..3985b4eeea 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -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); } }, diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index c79fd54a38..b9f61ae231 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -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); } }; }