mirror of https://github.com/axmolengine/axmol.git
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
This commit is contained in:
commit
95dfbf7dae
cocos/editor-support/cocostudio
|
@ -123,7 +123,7 @@ void ActionObject::initWithDictionary(const rapidjson::Value& dic, Ref* root)
|
|||
if(length > maxLength)
|
||||
maxLength = length;
|
||||
}
|
||||
_fTotalTime = maxLength*_fTotalTime;
|
||||
_fTotalTime = maxLength*_fUnitTime;
|
||||
}
|
||||
|
||||
void ActionObject::addActionNode(ActionNode* node)
|
||||
|
|
Loading…
Reference in New Issue