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

Merge pull request #8167 from hongliang-goudou/v3 

bugfix for UI animation playing crash if GUI JSON file is loaded again.
This commit is contained in:
minggo 2014-09-28 16:42:49 +08:00
parent 289c1edfe7 9448345de3
commit 8ed336c681
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/editor-support/cocostudio/CCActionManagerEx.cpp
View File

@ -73,7 +73,7 @@ void ActionManagerEx::initWithDictionary(const char* jsonName,const rapidjson::V
action->initWithDictionary(actionDic,root); action->initWithDictionary(actionDic,root);
actionList.pushBack(action); actionList.pushBack(action);
} }
_actionDic.insert(std::pair<std::string, cocos2d::Vector<ActionObject*>>(fileName, actionList)); _actionDic[fileName] = actionList;
} }
void ActionManagerEx::initWithBinary(const char* file, void ActionManagerEx::initWithBinary(const char* file,
@ -108,7 +108,7 @@ void ActionManagerEx::initWithDictionary(const char* jsonName,const rapidjson::V
actionList.pushBack(action); actionList.pushBack(action);
} }
} }
_actionDic.insert(std::pair<std::string, cocos2d::Vector<ActionObject*>>(fileName, actionList)); _actionDic[fileName] = actionList;
} }