From 149bdf125ef352ca7d847546f218a29732e2f59c Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 19 Dec 2016 12:15:41 +0800 Subject: [PATCH] Update engine version --- cocos/scripting/js-bindings/manual/ScriptingCore.h | 2 +- .../scripting/js-bindings/script/ccui/jsb_ccui_create_apis.js | 4 ++-- cocos/scripting/js-bindings/script/jsb_cocos2d.js | 2 +- web | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cocos/scripting/js-bindings/manual/ScriptingCore.h b/cocos/scripting/js-bindings/manual/ScriptingCore.h index b1193e4b8a..e67fc6f7e9 100644 --- a/cocos/scripting/js-bindings/manual/ScriptingCore.h +++ b/cocos/scripting/js-bindings/manual/ScriptingCore.h @@ -41,7 +41,7 @@ #include #include -#define ENGINE_VERSION "Cocos2d-JS v3.13" +#define ENGINE_VERSION "Cocos2d-JS v3.14" void js_log(const char *format, ...); diff --git a/cocos/scripting/js-bindings/script/ccui/jsb_ccui_create_apis.js b/cocos/scripting/js-bindings/script/ccui/jsb_ccui_create_apis.js index 7cb5811da1..c79a660edd 100644 --- a/cocos/scripting/js-bindings/script/ccui/jsb_ccui_create_apis.js +++ b/cocos/scripting/js-bindings/script/ccui/jsb_ccui_create_apis.js @@ -38,7 +38,7 @@ ccui.Widget.prototype._ctor = ccui.ScrollView.prototype._ctor = function(){ this.init(); - } + }; ccui.Button.prototype._ctor = function (normalImage, selectedImage, disableImage, texType) { if(texType !== undefined) @@ -80,7 +80,7 @@ ccui.ImageView.prototype._ctor = function(imageFileName, texType){ } else ccui.Widget.prototype.init.call(this); -} +}; ccui.LoadingBar.prototype._ctor = function(textureName, percentage){ ccui.Widget.prototype.init.call(this); diff --git a/cocos/scripting/js-bindings/script/jsb_cocos2d.js b/cocos/scripting/js-bindings/script/jsb_cocos2d.js index 8dffa64cbf..16f3d4bf6b 100644 --- a/cocos/scripting/js-bindings/script/jsb_cocos2d.js +++ b/cocos/scripting/js-bindings/script/jsb_cocos2d.js @@ -26,7 +26,7 @@ // CCConfig.js // -cc.ENGINE_VERSION = "Cocos2d-JS v3.13"; +cc.ENGINE_VERSION = "Cocos2d-JS v3.14"; cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0; cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0}; diff --git a/web b/web index 6404318146..544c0159ef 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 640431814638f732a4b886182820cc8a88a75e87 +Subproject commit 544c0159efc414879105688966de6599b1ad23c4