diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h index 35dd7ae9cd..877f88c853 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h @@ -134,7 +134,7 @@ public: virtual const cocos2d::Vector& getTimelines() const { return _timelineList; } - /** add ActionIndexes*/ + /** AnimationInfo*/ virtual void addAnimationInfo(const AnimationInfo& animationInfo); virtual void removeAnimationInfo(std::string animationName); virtual bool IsAnimationInfoExists(const std::string& animationName); diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp index b5ed343624..00f5c8610f 100644 --- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp +++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp @@ -549,8 +549,16 @@ Frame* InnerActionFrame::clone() { InnerActionFrame* frame = InnerActionFrame::create(); frame->setInnerActionType(_innerActionType); - frame->setStartFrameIndex(_startFrameIndex); - frame->setEndFrameIndex(_endFrameIndex); + if(_enterWithName) + { + frame->setEnterWithName(true); + frame->setAnimationName(_animationName); + } + else + { + frame->setStartFrameIndex(_startFrameIndex); + frame->setEndFrameIndex(_endFrameIndex); + } frame->cloneProperty(this); return frame;