Merge pull request #3517 from pandamicro/develop

pandamicro · web-flow · commit 2ace3f29ffe7 · 2017-09-08T15:11:14.000+08:00
Use default scheduler to control action manager
diff --git a/cocos2d/core/CCDirector.js b/cocos2d/core/CCDirector.js
@@ -136,6 +136,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         //action manager
         if (cc.ActionManager) {
             this._actionManager = new cc.ActionManager();
+            this._scheduler.scheduleUpdate(this._actionManager, cc.Scheduler.PRIORITY_SYSTEM, false);
         } else {
             this._actionManager = null;
         }
@@ -228,7 +229,6 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
 
         //tick before glClear: issue #533
         if (!this._paused) {
-            this._actionManager.update(this._deltaTime);
             this._scheduler.update(this._deltaTime);
             cc.eventManager.dispatchEvent(this._eventAfterUpdate);
         }

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{`
`136`	`136`	`//action manager`
`137`	`137`	`if (cc.ActionManager) {`
`138`	`138`	`this._actionManager = new cc.ActionManager();`
	`139`	`+ this._scheduler.scheduleUpdate(this._actionManager, cc.Scheduler.PRIORITY_SYSTEM, false);`
`139`	`140`	`} else {`
`140`	`141`	`this._actionManager = null;`
`141`	`142`	`}`
`@@ -228,7 +229,6 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{`
`228`	`229`
`229`	`230`	`//tick before glClear: issue #533`
`230`	`231`	`if (!this._paused) {`
`231`		`- this._actionManager.update(this._deltaTime);`
`232`	`232`	`this._scheduler.update(this._deltaTime);`
`233`	`233`	`cc.eventManager.dispatchEvent(this._eventAfterUpdate);`
`234`	`234`	`}`