Skip to content

Fixed a bug that scheduleUpdate error when cc.ActionManager is null #2801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2015
Merged

Fixed a bug that scheduleUpdate error when cc.ActionManager is null #2801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31c397c
Update build.xml
VisualSJ Apr 1, 2015
2354cc8
Fixed a bug that scheduleUpdate error when cc.ActionManager is null
VisualSJ Apr 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cocos2d/core/CCDirector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,12 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
//scheduler
this._scheduler = new cc.Scheduler();
//action manager
this._actionManager = cc.ActionManager ? new cc.ActionManager() : null;
this._scheduler.scheduleUpdate(this._actionManager, cc.Scheduler.PRIORITY_SYSTEM, false);
if(cc.ActionManager){
this._actionManager = new cc.ActionManager();
this._scheduler.scheduleUpdate(this._actionManager, cc.Scheduler.PRIORITY_SYSTEM, false);
}else{
this._actionManager = null;
}

this._eventAfterDraw = new cc.EventCustom(cc.Director.EVENT_AFTER_DRAW);
this._eventAfterDraw.setUserData(this);
Expand Down
8 changes: 4 additions & 4 deletions tools/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
classpath="./compiler/compiler.jar"/>
<target name="compile">
<jscomp compilationLevel="simple" warning="quiet"
debug="false" output="./../lib/cocos2d-js-v3.4-min.js">
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-sourcemap" sourceMapFormat="V3" -->
debug="false" output="./../lib/cocos2d-js-v3.5-min.js">
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.5-sourcemap" sourceMapFormat="V3" -->
<sources dir="./../">
<file name="Base64Images.js"/>
<file name="CCBoot.js"/>
Expand Down Expand Up @@ -298,8 +298,8 @@

<target name="compile_core">
<jscomp compilationLevel="simple" warning="quiet"
debug="false" output="./../lib/cocos2d-js-v3.4-core-min.js">
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.3-beta0-core-sourcemap" sourceMapFormat="V3" -->
debug="false" output="./../lib/cocos2d-js-v3.5-core-min.js">
<!--sourceMapOutputFile="./../lib/cocos2d-js-v3.5-core-sourcemap" sourceMapFormat="V3" -->
<sources dir="./../">
<file name="CCBoot.js"/>
<file name="cocos2d/core/platform/CCClass.js"/>
Expand Down