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

Fixes bug that clone InnerActionFrame.

This commit is contained in:
pipu 2015-01-12 11:09:19 +08:00
parent 78b32332d3
commit 6237115fbf
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/editor-support/cocostudio/ActionTimeline/CCActionTimeline.h
View File

@ -134,7 +134,7 @@ public:
virtual const cocos2d::Vector<Timeline*>& getTimelines() const { return _timelineList; } virtual const cocos2d::Vector<Timeline*>& getTimelines() const { return _timelineList; }
/** add ActionIndexes*/ /** AnimationInfo*/
virtual void addAnimationInfo(const AnimationInfo& animationInfo); virtual void addAnimationInfo(const AnimationInfo& animationInfo);
virtual void removeAnimationInfo(std::string animationName); virtual void removeAnimationInfo(std::string animationName);
virtual bool IsAnimationInfoExists(const std::string& animationName); virtual bool IsAnimationInfoExists(const std::string& animationName);

12
cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
View File

@ -549,8 +549,16 @@ Frame* InnerActionFrame::clone()
{ {
InnerActionFrame* frame = InnerActionFrame::create(); InnerActionFrame* frame = InnerActionFrame::create();
frame->setInnerActionType(_innerActionType); frame->setInnerActionType(_innerActionType);
frame->setStartFrameIndex(_startFrameIndex); if(_enterWithName)
frame->setEndFrameIndex(_endFrameIndex); {
frame->setEnterWithName(true);
frame->setAnimationName(_animationName);
}
else
{
frame->setStartFrameIndex(_startFrameIndex);
frame->setEndFrameIndex(_endFrameIndex);
}
frame->cloneProperty(this); frame->cloneProperty(this);
return frame; return frame;