diff --git a/cocos/scripting/js-bindings/script/jsb_cocos2d.js b/cocos/scripting/js-bindings/script/jsb_cocos2d.js index 715bc47bf93f..130a75ea7310 100644 --- a/cocos/scripting/js-bindings/script/jsb_cocos2d.js +++ b/cocos/scripting/js-bindings/script/jsb_cocos2d.js @@ -27,7 +27,7 @@ // CCConfig.js // -cc.ENGINE_VERSION = "Cocos2d-JS v3.16"; +cc.ENGINE_VERSION = "Cocos2d-JS v3.17"; cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0; cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0}; diff --git a/tests/js-tests/src/tests_resources.js b/tests/js-tests/src/tests_resources.js index 6e84d4b2ab13..25ad506fd764 100644 --- a/tests/js-tests/src/tests_resources.js +++ b/tests/js-tests/src/tests_resources.js @@ -724,7 +724,7 @@ var g_tilemaps = [ var g_spine = [ "spine/spineboy.atlas", - "spine/spineboy.json", + "spine/spineboy-ess.json", "spine/spineboy.png", "spine/sprite.png", "spine/goblins.png", diff --git a/web b/web index 15704c33421b..e79acd062363 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 15704c33421bbd236299b6b965e63eb2a6b7172c +Subproject commit e79acd062363818af809c51804083a5989a9aedc