File tree Expand file tree Collapse file tree 1 file changed +12
-7
lines changed Expand file tree Collapse file tree 1 file changed +12
-7
lines changed Original file line number Diff line number Diff line change @@ -171,6 +171,10 @@ - (CCBSequence*)sequenceFromSequenceId:(int)seqId {
171
171
- (CCActionInterval*)actionFromKeyframe0 : (CCBKeyframe*)kf0 andKeyframe1 : (CCBKeyframe*)kf1 propertyName : (NSString *)name node : (CCNode*)node {
172
172
float duration = kf1.time - kf0.time ;
173
173
174
+ if (kf0.easingType ==kCCBKeyframeEasingInstant ) {
175
+ duration = 0 ;
176
+ }
177
+
174
178
if ([name isEqualToString: @" rotation" ]) {
175
179
return [CCActionRotateTo actionWithDuration: duration angle: [kf1.value floatValue ] simple: YES ];
176
180
} else if ([name isEqualToString: @" position" ]) {
@@ -855,14 +859,15 @@ - (CCActionSequence*)createActionForNode:(CCNode*)node sequenceProperty:(CCBSequ
855
859
856
860
CCActionInterval* action = [self actionFromKeyframe0: startKF andKeyframe1: endKF propertyName: seqProp.name node: node];
857
861
858
- // Create delay to fix instant easing on non instant actions
859
- if (startKF.easingType ==kCCBKeyframeEasingInstant &&
860
- ![seqProp.name isEqualToString: @" spriteFrame" ] &&
861
- ![seqProp.name isEqualToString: @" visible" ]) {
862
- [actions addObject: [CCActionDelay actionWithDuration: action.duration]];
863
- }
864
-
865
862
if (action) {
863
+
864
+ // Instant
865
+ if (startKF.easingType ==kCCBKeyframeEasingInstant &&
866
+ ![seqProp.name isEqualToString: @" spriteFrame" ] &&
867
+ ![seqProp.name isEqualToString: @" visible" ]) {
868
+ [actions addObject: [CCActionDelay actionWithDuration: action.duration]];
869
+ }
870
+
866
871
// Apply Easing
867
872
action = [self easeAction: action easingType: startKF.easingType easingOpt: startKF.easingOpt];
868
873
[actions addObject: action];
You can’t perform that action at this time.
0 commit comments