Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spine res name update, because files name changed before (#18586)

This commit is contained in:
leeda 2017-12-26 09:10:24 +08:00 committed by minggo
parent 01ee30a023
commit ca46b062fd
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp
View File

@ -464,7 +464,7 @@ void Material_invalidate::onEnter()
sprite->runAction(repeat); sprite->runAction(repeat);
// SPINE // 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->setAnimation(0, "walk", true);
skeletonNode->setSkin("goblin"); skeletonNode->setSkin("goblin");
@ -533,7 +533,7 @@ void Material_renderState::onEnter()
sprite->runAction(repeat); sprite->runAction(repeat);
// SPINE // 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->setAnimation(0, "walk", true);
skeletonNode->setSkin("goblin"); skeletonNode->setSkin("goblin");

2
tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp
View File

@ -704,7 +704,7 @@ void Scene3DTestScene::createDetailDlg()
// add a spine ffd animation on it // add a spine ffd animation on it
auto skeletonNode = 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->setAnimation(0, "walk", true);
skeletonNode->setSkin("goblin"); skeletonNode->setSkin("goblin");

2
tests/js-tests/src/tests_resources.js
View File

@ -705,7 +705,7 @@ var g_spine = [
"spine/sprite.png", "spine/sprite.png",
"spine/goblins.png", "spine/goblins.png",
"spine/goblins.atlas", "spine/goblins.atlas",
"spine/goblins_mesh.json" "spine/goblins-pro.json"
]; ];
if (!cc.sys.isNative) { if (!cc.sys.isNative) {

2
tests/lua-tests/src/Scene3DTest/Scene3DTest.lua
View File

@ -510,7 +510,7 @@ function Scene3DTest:createDetailDlg()
self._detailDlg:addChild(title) self._detailDlg:addChild(title)
-- add a spine ffd animation on it -- 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:setAnimation(0, "walk", true)
skeletonNode:setSkin("goblin") skeletonNode:setSkin("goblin")