From ca46b062fd681e77670c18a95328eaa975281c2b Mon Sep 17 00:00:00 2001 From: leeda Date: Tue, 26 Dec 2017 09:10:24 +0800 Subject: [PATCH] spine res name update, because files name changed before (#18586) --- .../Classes/MaterialSystemTest/MaterialSystemTest.cpp | 4 ++-- tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp | 2 +- tests/js-tests/src/tests_resources.js | 2 +- tests/lua-tests/src/Scene3DTest/Scene3DTest.lua | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp index 42604f5d67..c01a86857d 100644 --- a/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp +++ b/tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp @@ -464,7 +464,7 @@ void Material_invalidate::onEnter() sprite->runAction(repeat); // SPINE - auto skeletonNode = spine::SkeletonAnimation::createWithJsonFile("spine/goblins_mesh.json", "spine/goblins.atlas", 1.5f); + auto skeletonNode = spine::SkeletonAnimation::createWithJsonFile("spine/goblins-pro.json", "spine/goblins.atlas", 1.5f); skeletonNode->setAnimation(0, "walk", true); skeletonNode->setSkin("goblin"); @@ -533,7 +533,7 @@ void Material_renderState::onEnter() sprite->runAction(repeat); // SPINE - auto skeletonNode = spine::SkeletonAnimation::createWithJsonFile("spine/goblins_mesh.json", "spine/goblins.atlas", 1.5f); + auto skeletonNode = spine::SkeletonAnimation::createWithJsonFile("spine/goblins-pro.json", "spine/goblins.atlas", 1.5f); skeletonNode->setAnimation(0, "walk", true); skeletonNode->setSkin("goblin"); diff --git a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp index c088a37a13..30ba4f6c5b 100644 --- a/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp +++ b/tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp @@ -704,7 +704,7 @@ void Scene3DTestScene::createDetailDlg() // add a spine ffd animation on it auto skeletonNode = - SkeletonAnimationCullingFix::createWithFile("spine/goblins_mesh.json", "spine/goblins.atlas", 1.5f); + SkeletonAnimationCullingFix::createWithFile("spine/goblins-pro.json", "spine/goblins.atlas", 1.5f); skeletonNode->setAnimation(0, "walk", true); skeletonNode->setSkin("goblin"); diff --git a/tests/js-tests/src/tests_resources.js b/tests/js-tests/src/tests_resources.js index 52c6494182..797a283b28 100644 --- a/tests/js-tests/src/tests_resources.js +++ b/tests/js-tests/src/tests_resources.js @@ -705,7 +705,7 @@ var g_spine = [ "spine/sprite.png", "spine/goblins.png", "spine/goblins.atlas", - "spine/goblins_mesh.json" + "spine/goblins-pro.json" ]; if (!cc.sys.isNative) { diff --git a/tests/lua-tests/src/Scene3DTest/Scene3DTest.lua b/tests/lua-tests/src/Scene3DTest/Scene3DTest.lua index f1514fce83..7abcca08df 100644 --- a/tests/lua-tests/src/Scene3DTest/Scene3DTest.lua +++ b/tests/lua-tests/src/Scene3DTest/Scene3DTest.lua @@ -510,7 +510,7 @@ function Scene3DTest:createDetailDlg() self._detailDlg:addChild(title) -- add a spine ffd animation on it - local skeletonNode = sp.SkeletonAnimation:create("spine/goblins_mesh.json", "spine/goblins.atlas", 1.5) + local skeletonNode = sp.SkeletonAnimation:create("spine/goblins-pro.json", "spine/goblins.atlas", 1.5) skeletonNode:setAnimation(0, "walk", true) skeletonNode:setSkin("goblin")