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

Merge pull request #4975 from chengstory/fix_UIAction_play_error 

fixed UIAction play error.
This commit is contained in:
James Chen 2014-01-07 03:17:41 -08:00
parent 54cbfe938b bf8187fee2
commit e90f35daa6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/editor-support/cocostudio/CCActionNode.cpp
View File

@ -101,7 +101,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root)
actionFrame->setFrameIndex(frameInex); actionFrame->setFrameIndex(frameInex);
actionFrame->setScaleX(scaleX); actionFrame->setScaleX(scaleX);
actionFrame->setScaleY(scaleY); actionFrame->setScaleY(scaleY);
auto cActionArray = _frameArray.at((int)kKeyframeMove); auto cActionArray = _frameArray.at((int)kKeyframeScale);
cActionArray->pushBack(actionFrame); cActionArray->pushBack(actionFrame);
} }
@ -113,7 +113,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root)
actionFrame->autorelease(); actionFrame->autorelease();
actionFrame->setFrameIndex(frameInex); actionFrame->setFrameIndex(frameInex);
actionFrame->setRotation(rotation); actionFrame->setRotation(rotation);
auto cActionArray = _frameArray.at((int)kKeyframeMove); auto cActionArray = _frameArray.at((int)kKeyframeRotate);
cActionArray->pushBack(actionFrame); cActionArray->pushBack(actionFrame);
} }
@ -125,7 +125,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root)
actionFrame->autorelease(); actionFrame->autorelease();
actionFrame->setFrameIndex(frameInex); actionFrame->setFrameIndex(frameInex);
actionFrame->setOpacity(opacity); actionFrame->setOpacity(opacity);
auto cActionArray = _frameArray.at((int)kKeyframeMove); auto cActionArray = _frameArray.at((int)kKeyframeTint);
cActionArray->pushBack(actionFrame); cActionArray->pushBack(actionFrame);
} }
@ -139,7 +139,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root)
actionFrame->autorelease(); actionFrame->autorelease();
actionFrame->setFrameIndex(frameInex); actionFrame->setFrameIndex(frameInex);
actionFrame->setColor(Color3B(colorR,colorG,colorB)); actionFrame->setColor(Color3B(colorR,colorG,colorB));
auto cActionArray = _frameArray.at((int)kKeyframeMove); auto cActionArray = _frameArray.at((int)kKeyframeFade);
cActionArray->pushBack(actionFrame); cActionArray->pushBack(actionFrame);
} }
} }