From 69217f0e8b9e2f1b43f7124d93c1a79d0bb8583a Mon Sep 17 00:00:00 2001 From: CocosRobot#Set Date: Thu, 5 Jan 2017 01:40:38 +0000 Subject: [PATCH] [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically --- .../auto/api/jsb_cocos2dx_auto_api.js | 2 +- .../js-bindings/auto/jsb_cocos2dx_auto.cpp | 4 +- .../scripting/lua-bindings/auto/api/Label.lua | 2 +- .../lua-bindings/auto/lua_cocos2dx_auto.cpp | 2 +- templates/cocos2dx_files.json | 65 ++++++++++--------- 5 files changed, 38 insertions(+), 37 deletions(-) diff --git a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js index c87be84a03..5c1dd7062f 100644 --- a/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js +++ b/cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js @@ -12499,7 +12499,7 @@ isWrapEnabled : function ( /** * @method getOutlineSize - * @return {int} + * @return {float} */ getOutlineSize : function ( ) diff --git a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp index 513be0a307..a9d585d957 100644 --- a/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp +++ b/cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp @@ -34159,9 +34159,9 @@ bool js_cocos2dx_Label_getOutlineSize(JSContext *cx, uint32_t argc, jsval *vp) cocos2d::Label* cobj = (cocos2d::Label *)(proxy ? proxy->ptr : NULL); JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_Label_getOutlineSize : Invalid Native Object"); if (argc == 0) { - int ret = cobj->getOutlineSize(); + double ret = cobj->getOutlineSize(); JS::RootedValue jsret(cx); - jsret = int32_to_jsval(cx, ret); + jsret = DOUBLE_TO_JSVAL(ret); args.rval().set(jsret); return true; } diff --git a/cocos/scripting/lua-bindings/auto/api/Label.lua b/cocos/scripting/lua-bindings/auto/api/Label.lua index 572b390e77..27c6561cbe 100644 --- a/cocos/scripting/lua-bindings/auto/api/Label.lua +++ b/cocos/scripting/lua-bindings/auto/api/Label.lua @@ -161,7 +161,7 @@ -- Return the outline effect size value. -- @function [parent=#Label] getOutlineSize -- @param self --- @return int#int ret (return value: int) +-- @return float#float ret (return value: float) -------------------------------- -- Sets a new bitmap font to Label diff --git a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp index 7b192c7d12..9e19f728bd 100644 --- a/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp +++ b/cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp @@ -54212,7 +54212,7 @@ int lua_cocos2dx_Label_getOutlineSize(lua_State* tolua_S) tolua_error(tolua_S,"invalid arguments in function 'lua_cocos2dx_Label_getOutlineSize'", nullptr); return 0; } - int ret = cobj->getOutlineSize(); + double ret = cobj->getOutlineSize(); tolua_pushnumber(tolua_S,(lua_Number)ret); return 1; } diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 716d4d7ce1..ae490c2df1 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -2554,60 +2554,28 @@ "external/curl/include/wp_8.1/curl/stdcheaders.h", "external/curl/include/wp_8.1/curl/typecheck-gcc.h", "external/curl/prebuilt/android/Android.mk", - "external/curl/prebuilt/android/arm64-v8a/libcrypto.a", "external/curl/prebuilt/android/arm64-v8a/libcurl.a", - "external/curl/prebuilt/android/arm64-v8a/libssl.a", - "external/curl/prebuilt/android/armeabi-v7a/libcrypto.a", "external/curl/prebuilt/android/armeabi-v7a/libcurl.a", - "external/curl/prebuilt/android/armeabi-v7a/libssl.a", - "external/curl/prebuilt/android/armeabi/libcrypto.a", "external/curl/prebuilt/android/armeabi/libcurl.a", - "external/curl/prebuilt/android/armeabi/libssl.a", - "external/curl/prebuilt/android/x86/libcrypto.a", "external/curl/prebuilt/android/x86/libcurl.a", - "external/curl/prebuilt/android/x86/libssl.a", - "external/curl/prebuilt/ios/libcrypto.a", "external/curl/prebuilt/ios/libcurl.a", - "external/curl/prebuilt/ios/libssl.a", - "external/curl/prebuilt/mac/libcrypto.a", "external/curl/prebuilt/mac/libcurl.a", - "external/curl/prebuilt/mac/libssl.a", "external/curl/prebuilt/win10/arm/libcurl.dll", "external/curl/prebuilt/win10/arm/libcurl.lib", - "external/curl/prebuilt/win10/arm/libeay32.dll", - "external/curl/prebuilt/win10/arm/ssleay32.dll", "external/curl/prebuilt/win10/win32/libcurl.dll", "external/curl/prebuilt/win10/win32/libcurl.lib", - "external/curl/prebuilt/win10/win32/libeay32.dll", - "external/curl/prebuilt/win10/win32/ssleay32.dll", "external/curl/prebuilt/win10/x64/libcurl.dll", "external/curl/prebuilt/win10/x64/libcurl.lib", - "external/curl/prebuilt/win10/x64/libeay32.dll", - "external/curl/prebuilt/win10/x64/ssleay32.dll", "external/curl/prebuilt/win32/libcurl.dll", "external/curl/prebuilt/win32/libcurl_imp.lib", - "external/curl/prebuilt/win32/libeay32.lib", - "external/curl/prebuilt/win32/ssleay32.lib", "external/curl/prebuilt/winrt_8.1/arm/libcurl.dll", "external/curl/prebuilt/winrt_8.1/arm/libcurl.lib", - "external/curl/prebuilt/winrt_8.1/arm/libeay32.dll", - "external/curl/prebuilt/winrt_8.1/arm/ssleay32.dll", "external/curl/prebuilt/winrt_8.1/win32/libcurl.dll", "external/curl/prebuilt/winrt_8.1/win32/libcurl.lib", - "external/curl/prebuilt/winrt_8.1/win32/libeay32.dll", - "external/curl/prebuilt/winrt_8.1/win32/ssleay32.dll", "external/curl/prebuilt/wp_8.1/arm/libcurl.dll", "external/curl/prebuilt/wp_8.1/arm/libcurl.lib", - "external/curl/prebuilt/wp_8.1/arm/libeay32.dll", - "external/curl/prebuilt/wp_8.1/arm/libeay32.lib", - "external/curl/prebuilt/wp_8.1/arm/ssleay32.dll", - "external/curl/prebuilt/wp_8.1/arm/ssleay32.lib", "external/curl/prebuilt/wp_8.1/win32/libcurl.dll", "external/curl/prebuilt/wp_8.1/win32/libcurl.lib", - "external/curl/prebuilt/wp_8.1/win32/libeay32.dll", - "external/curl/prebuilt/wp_8.1/win32/libeay32.lib", - "external/curl/prebuilt/wp_8.1/win32/ssleay32.dll", - "external/curl/prebuilt/wp_8.1/win32/ssleay32.lib", "external/edtaa3func/edtaa3func.cpp", "external/edtaa3func/edtaa3func.h", "external/flatbuffers/Android.mk", @@ -3173,6 +3141,39 @@ "external/linux-specific/fmod/prebuilt/32-bit/libfmodL.so", "external/linux-specific/fmod/prebuilt/64-bit/libfmod.so", "external/linux-specific/fmod/prebuilt/64-bit/libfmodL.so", + "external/openssl/prebuilt/android/Android.mk", + "external/openssl/prebuilt/android/arm64-v8a/libcrypto.a", + "external/openssl/prebuilt/android/arm64-v8a/libssl.a", + "external/openssl/prebuilt/android/armeabi-v7a/libcrypto.a", + "external/openssl/prebuilt/android/armeabi-v7a/libssl.a", + "external/openssl/prebuilt/android/armeabi/libcrypto.a", + "external/openssl/prebuilt/android/armeabi/libssl.a", + "external/openssl/prebuilt/android/x86/libcrypto.a", + "external/openssl/prebuilt/android/x86/libssl.a", + "external/openssl/prebuilt/ios/libcrypto.a", + "external/openssl/prebuilt/ios/libssl.a", + "external/openssl/prebuilt/mac/libcrypto.a", + "external/openssl/prebuilt/mac/libssl.a", + "external/openssl/prebuilt/win10/arm/libeay32.dll", + "external/openssl/prebuilt/win10/arm/ssleay32.dll", + "external/openssl/prebuilt/win10/win32/libeay32.dll", + "external/openssl/prebuilt/win10/win32/ssleay32.dll", + "external/openssl/prebuilt/win10/x64/libeay32.dll", + "external/openssl/prebuilt/win10/x64/ssleay32.dll", + "external/openssl/prebuilt/win32/libeay32.lib", + "external/openssl/prebuilt/win32/ssleay32.lib", + "external/openssl/prebuilt/winrt_8.1/arm/libeay32.dll", + "external/openssl/prebuilt/winrt_8.1/arm/ssleay32.dll", + "external/openssl/prebuilt/winrt_8.1/win32/libeay32.dll", + "external/openssl/prebuilt/winrt_8.1/win32/ssleay32.dll", + "external/openssl/prebuilt/wp_8.1/arm/libeay32.dll", + "external/openssl/prebuilt/wp_8.1/arm/libeay32.lib", + "external/openssl/prebuilt/wp_8.1/arm/ssleay32.dll", + "external/openssl/prebuilt/wp_8.1/arm/ssleay32.lib", + "external/openssl/prebuilt/wp_8.1/win32/libeay32.dll", + "external/openssl/prebuilt/wp_8.1/win32/libeay32.lib", + "external/openssl/prebuilt/wp_8.1/win32/ssleay32.dll", + "external/openssl/prebuilt/wp_8.1/win32/ssleay32.lib", "external/png/include/android/png.h", "external/png/include/android/pngconf.h", "external/png/include/android/pnglibconf.h",