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

Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix

This commit is contained in:
samuele3hu 2014-05-15 15:40:28 +08:00
parent 5a14b1d67b 385b2507aa
commit 95dfbf7dae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/CCActionObject.cpp
View File

@ -123,7 +123,7 @@ void ActionObject::initWithDictionary(const rapidjson::Value& dic, Ref* root)
if(length > maxLength) if(length > maxLength)
maxLength = length; maxLength = length;
} }
_fTotalTime = maxLength*_fTotalTime; _fTotalTime = maxLength*_fUnitTime;
} }
void ActionObject::addActionNode(ActionNode* node) void ActionObject::addActionNode(ActionNode* node)