Merge pull request #836 from jtwigg/develop

Animation Sync Errors.

Author: vlidholt

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -387,9 +387,9 @@ - (void)runActionsForNode:(CCNode*)node sequenceProperty:(CCBSequenceProperty*)s
     CCActionSequence* seq = [CCActionSequence actionWithArray:actions];
     seq.tag = _animationManagerId;
     [seq startWithTarget:node];
-    if(kf0.time>0 || _loop) { // Ensure Sync
+    if(kf0.time > 0 || _loop) { // Ensure Sync
         [seq step:0];
-        [seq step:_runningSequence.time-kf0.time];
+        [seq step:_runningSequence.time-kf0.time - _runningSequence.tween];
     }
     [_currentActions addObject:seq];
 }
@@ -464,6 +464,7 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
 	// Set the running scene
     _runningSequence      = [self sequenceFromSequenceId:seqId];
     _runningSequence.time = 0.0f;
+	_runningSequence.tween = tweenDuration;
 
 	[self addSequenceCallBacks:seqId tweenDuration:tweenDuration startTime:0];
 
@@ -476,6 +477,19 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
         NSDictionary* seqNodeProps = [seqs objectForKey:[NSNumber numberWithInt:seqId]];
 
         NSMutableSet* seqNodePropNames = [NSMutableSet set];
+		
+		// Reset nodes that have sequence node properties, build first keyframe action sequence.
+        for (NSString* propName in seqNodeProps) {
+            CCBSequenceProperty* seqProp = [seqNodeProps objectForKey:propName];
+            [seqNodePropNames addObject:propName];
+            
+            // Reset Node State to First KeyFrame
+            [self setKeyFrameForNode:node sequenceProperty:seqProp tweenDuration:tweenDuration keyFrame:0];
+            
+            // Build First Key Frame Sequence
+            [self runActionsForNode:node sequenceProperty:seqProp tweenDuration:tweenDuration startKeyFrame:0];
+        }
+		
 
         if(_lastSequence.sequenceId!=seqId) {
             _loop = NO;
@@ -495,17 +509,7 @@ - (void)runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuratio
             }
         }
 
-        // Reset nodes that have sequence node properties, build first keyframe action sequence.
-        for (NSString* propName in seqNodeProps) {
-            CCBSequenceProperty* seqProp = [seqNodeProps objectForKey:propName];
-            [seqNodePropNames addObject:propName];
-            
-            // Reset Node State to First KeyFrame
-            [self setKeyFrameForNode:node sequenceProperty:seqProp tweenDuration:tweenDuration keyFrame:0];
-            
-            // Build First Key Frame Sequence
-            [self runActionsForNode:node sequenceProperty:seqProp tweenDuration:tweenDuration startKeyFrame:0];
-        }
+
 
     }
 

cocos2d-ui/CCBReader/CCBSequence.h

@@ -35,6 +35,7 @@
 @property (nonatomic,assign) int sequenceId;
 @property (nonatomic,assign) int chainedSequenceId;
 @property (nonatomic,assign) int loops; // @todo
+@property (nonatomic,assign) float tween;
 
 // Channels
 @property (nonatomic,strong) CCBSequenceProperty* callbackChannel;

cocos2d-ui/CCBReader/CCBsequence.m

@@ -42,6 +42,7 @@ - (id)init
 
     _callbackChannel   = nil;
     _soundChannel      = nil;
+	_tween			   = 0.0f;
 
     return self;
 }