diff --git a/cocos/scripting/js-bindings/script/jsb_boot.js b/cocos/scripting/js-bindings/script/jsb_boot.js index 03522a777d..863b1b40a4 100644 --- a/cocos/scripting/js-bindings/script/jsb_boot.js +++ b/cocos/scripting/js-bindings/script/jsb_boot.js @@ -775,6 +775,8 @@ cc.formatStr = function(){ // Define singleton objects cc.director = cc.Director.getInstance(); +cc.director._actionManager = cc.director.getActionManager(); +cc.director._scheduler = cc.director.getScheduler(); cc.winSize = cc.director.getWinSize(); cc.view = cc.director.getOpenGLView(); @@ -1548,7 +1550,7 @@ cc._initDebugSetting = function (mode) { cc.log = cc.warn = cc.error = cc.assert = function () {}; if (mode > ccGame.DEBUG_MODE_NONE) { console.log = function () { - bakLog(cc.js.formatStr.apply(null, arguments)); + bakLog(cc.formatStr.apply(null, arguments)); }; console.error = function () { bakLog("ERROR : " + cc.formatStr.apply(cc, arguments)); diff --git a/tools/bindings-generator b/tools/bindings-generator index 32404751d5..fc5c0a5643 160000 --- a/tools/bindings-generator +++ b/tools/bindings-generator @@ -1 +1 @@ -Subproject commit 32404751d5399ccb0cd9df4b72b211506cade321 +Subproject commit fc5c0a5643ddbc9e5785079010b0c265c1be3ee6 diff --git a/web b/web index 8aabcdabcb..6404318146 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 8aabcdabcb92f7d4736cc1d8adbf6105cd72a0f9 +Subproject commit 640431814638f732a4b886182820cc8a88a75e87