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

Merge pull request #9783 from doomsdayer/v3 

Update the description when the csb reader version dismatches the reader version in Cocos2d-x
This commit is contained in:
minggo 2015-01-05 15:11:22 +08:00
parent 82db989432 ec540fcaa2
commit c7508bb1c6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -789,15 +789,17 @@ Node* CSLoader::nodeWithFlatBuffersFile(const std::string &fileName)
if (csBuildId) if (csBuildId)
{ {
CCASSERT(strcmp(_csBuildID.c_str(), csBuildId->c_str()) == 0, CCASSERT(strcmp(_csBuildID.c_str(), csBuildId->c_str()) == 0,
String::createWithFormat("%s%s%s%s%s%s%s%s", String::createWithFormat("%s%s%s%s%s%s%s%s%s%s",
"The reader build id of your CocosStudio exported file(", "The reader build id of your Cocos exported file(",
csBuildId->c_str(), csBuildId->c_str(),
") and the reader build id of your Cocos2d-x(", ") and the reader build id in your Cocos2d-x(",
_csBuildID.c_str(), _csBuildID.c_str(),
") are not match.\n", ") are not match.\n",
"Please get the correct Cocos2d-x from ", "Please get the correct reader(build id ",
"https://github.com/chukong/cocos-reader", csBuildId->c_str(),
" and replace your Cocos2d-x")->getCString()); ")from ",
"http://www.cocos2d-x.org/filedown/cocos-reader",
" and replace it in your Cocos2d-x")->getCString());
} }
// decode plist // decode plist