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

Merge pull request #10219 from geron-cn/fixProjectNodeLoader 

fix bug: fix crash when lack of projectnode file
This commit is contained in:
minggo 2015-01-27 13:41:27 +08:00
parent 398f0b861d 937ee25e7b
commit 434c0baba4
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
View File

@ -481,6 +481,9 @@ InnerActionFrame::InnerActionFrame()
void InnerActionFrame::onEnter(Frame *nextFrame, int currentFrameIndex) void InnerActionFrame::onEnter(Frame *nextFrame, int currentFrameIndex)
{ {
auto innerActiontimeline = static_cast<ActionTimeline*>(_node->getActionByTag(_node->getTag())); auto innerActiontimeline = static_cast<ActionTimeline*>(_node->getActionByTag(_node->getTag()));
if( nullptr == innerActiontimeline)
return;
if (InnerActionType::SingleFrame == _innerActionType) if (InnerActionType::SingleFrame == _innerActionType)
{ {
innerActiontimeline->gotoFrameAndPause(_singleFrameIndex); innerActiontimeline->gotoFrameAndPause(_singleFrameIndex);

43
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
View File

@ -833,20 +833,24 @@ Node* CSLoader::nodeWithFlatBuffers(const flatbuffers::NodeTree *nodetree)
auto projectNodeOptions = (ProjectNodeOptions*)options->data(); auto projectNodeOptions = (ProjectNodeOptions*)options->data();
std::string filePath = projectNodeOptions->fileName()->c_str(); std::string filePath = projectNodeOptions->fileName()->c_str();
CCLOG("filePath = %s", filePath.c_str()); CCLOG("filePath = %s", filePath.c_str());
cocostudio::timeline::ActionTimeline* action = nullptr;
if (filePath != "" && FileUtils::getInstance()->isFileExist(filePath)) if (filePath != "" && FileUtils::getInstance()->isFileExist(filePath))
{ {
node = createNodeWithFlatBuffersFile(filePath); node = createNodeWithFlatBuffersFile(filePath);
reader->setPropsWithFlatBuffers(node, options->data()); action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersFile(filePath);
cocostudio::timeline::ActionTimeline* action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersFile(filePath);
if (action)
{
node->runAction(action);
action->gotoFrameAndPause(0);
}
} }
else
{
node = Node::create();
}
reader->setPropsWithFlatBuffers(node, options->data());
if (action)
{
node->runAction(action);
action->gotoFrameAndPause(0);
}
} }
else if (classname == "SimpleAudio") else if (classname == "SimpleAudio")
{ {
@ -1164,17 +1168,22 @@ Node* CSLoader::nodeWithFlatBuffersForSimulator(const flatbuffers::NodeTree *nod
std::string filePath = projectNodeOptions->fileName()->c_str(); std::string filePath = projectNodeOptions->fileName()->c_str();
CCLOG("filePath = %s", filePath.c_str()); CCLOG("filePath = %s", filePath.c_str());
cocostudio::timeline::ActionTimeline* action = nullptr;
if (filePath != "" && FileUtils::getInstance()->isFileExist(filePath)) if (filePath != "" && FileUtils::getInstance()->isFileExist(filePath))
{ {
node = createNodeWithFlatBuffersForSimulator(filePath); node = createNodeWithFlatBuffersFile(filePath);
reader->setPropsWithFlatBuffers(node, options->data()); action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersFile(filePath);
cocostudio::timeline::ActionTimeline* action = cocostudio::timeline::ActionTimelineCache::getInstance()->createActionWithFlatBuffersForSimulator(filePath); }
if (action) else
{ {
node->runAction(action); node = Node::create();
action->gotoFrameAndPause(0); }
} reader->setPropsWithFlatBuffers(node, options->data());
if (action)
{
node->runAction(action);
action->gotoFrameAndPause(0);
} }
} }
else if (classname == "SimpleAudio") else if (classname == "SimpleAudio")