From bf8187fee2d9230587bea71169c10cfa986dcc48 Mon Sep 17 00:00:00 2001 From: zhangcheng Date: Tue, 7 Jan 2014 19:04:18 +0800 Subject: [PATCH] fixed UIAction play error. --- cocos/editor-support/cocostudio/CCActionNode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cocos/editor-support/cocostudio/CCActionNode.cpp b/cocos/editor-support/cocostudio/CCActionNode.cpp index b792c47e09..b8dbd7162c 100644 --- a/cocos/editor-support/cocostudio/CCActionNode.cpp +++ b/cocos/editor-support/cocostudio/CCActionNode.cpp @@ -101,7 +101,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root) actionFrame->setFrameIndex(frameInex); actionFrame->setScaleX(scaleX); actionFrame->setScaleY(scaleY); - auto cActionArray = _frameArray.at((int)kKeyframeMove); + auto cActionArray = _frameArray.at((int)kKeyframeScale); cActionArray->pushBack(actionFrame); } @@ -113,7 +113,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root) actionFrame->autorelease(); actionFrame->setFrameIndex(frameInex); actionFrame->setRotation(rotation); - auto cActionArray = _frameArray.at((int)kKeyframeMove); + auto cActionArray = _frameArray.at((int)kKeyframeRotate); cActionArray->pushBack(actionFrame); } @@ -125,7 +125,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root) actionFrame->autorelease(); actionFrame->setFrameIndex(frameInex); actionFrame->setOpacity(opacity); - auto cActionArray = _frameArray.at((int)kKeyframeMove); + auto cActionArray = _frameArray.at((int)kKeyframeTint); cActionArray->pushBack(actionFrame); } @@ -139,7 +139,7 @@ void ActionNode::initWithDictionary(const rapidjson::Value& dic,Object* root) actionFrame->autorelease(); actionFrame->setFrameIndex(frameInex); actionFrame->setColor(Color3B(colorR,colorG,colorB)); - auto cActionArray = _frameArray.at((int)kKeyframeMove); + auto cActionArray = _frameArray.at((int)kKeyframeFade); cActionArray->pushBack(actionFrame); } }