fixed cocos2d#1463 correct some mistake for CCBReader

Author: dingpinglv

cocos2d/label_nodes/CCLabelTTF.js

@@ -295,22 +295,26 @@ cc.LabelTTF = cc.Sprite.extend(/** @lends cc.LabelTTF# */{
             if (context.font != this._fontStyleStr)
                 context.font = this._fontStyleStr;
 
-            context.textBaseline = cc.LabelTTF._textBaseline[this._vAlignment];
-            context.textAlign = cc.LabelTTF._textAlign[this._hAlignment];
-
             if (((this._contentSize.width > this._dimensions.width) || this._string.indexOf("\n") > -1) && this._dimensions.width !== 0) {
+                context.textBaseline = cc.LabelTTF._textBaseline[this._vAlignment];
+                context.textAlign = cc.LabelTTF._textAlign[this._hAlignment];
                 this._wrapText(context, this._string,
                     -this._dimensions.width * this._anchorPoint.x,
                     this._dimensions.height * this._anchorPoint.y,
                     this._dimensions.width,
                     this._dimensions.height,
                     this._fontSize * 1.2);
             } else if (this._dimensions.width == 0) {
+                context.textBaseline = "bottom";
+                context.textAlign = "left";
                if (this._string.indexOf("\n") > -1)
                     this._multiLineText(context);
-                 else
-                    context.fillText(this._string, -this._contentSize.width * this._anchorPoint.x, this._contentSize.height * this._anchorPoint.y);
+                 else {
+                   context.fillText(this._string, -this._contentSize.width * this._anchorPoint.x, this._contentSize.height * this._anchorPoint.y);
+               }
             } else {
+                context.textBaseline = cc.LabelTTF._textBaseline[this._vAlignment];
+                context.textAlign = cc.LabelTTF._textAlign[this._hAlignment];
                 var xOffset = 0, yOffset = 0;
                 if (this._hAlignment == cc.TEXT_ALIGNMENT_RIGHT)
                     xOffset = this._dimensions.width;

extensions/CCBReader/CCBAnimationManager.js

@@ -219,10 +219,11 @@ cc.CCBAnimationManager = cc.Class.extend({
             if(nodeBaseValues){
                 var baseKeys = nodeBaseValues.allKeys();
                 for(j = 0; j < baseKeys.length;j++){
-                    if(seqNodePropNames.indexOf(baseKeys[j]) > -1){
-                        var value = nodeBaseValues.objectForKey(baseKeys[j]);
+                    var selBaseKey =  baseKeys[j];
+                    if(seqNodePropNames.indexOf(selBaseKey) == -1){
+                        var value = nodeBaseValues.objectForKey(selBaseKey);
                         if(value)
-                            this._setAnimatedProperty(baseKeys[j],node, value, tweenDuration);
+                            this._setAnimatedProperty(selBaseKey,node, value, tweenDuration);
                     }
                 }
             }
@@ -281,7 +282,7 @@ cc.CCBAnimationManager = cc.Class.extend({
         } else if (propName == "opacity") {
             return cc.FadeTo.create(duration, keyframe1.getValue());
         } else if (propName == "color") {
-            var selColor = keyframe1.getValue();
+            var selColor = keyframe1.getValue().getColor();
             return cc.TintTo.create(duration, selColor.r, selColor.g, selColor.b);
         } else if (propName == "visible") {
             var isVisible = keyframe1.getValue();

extensions/CCBReader/CCNodeLoader.js

@@ -717,14 +717,17 @@ cc.NodeLoader = cc.Class.extend({
 
         var size ;
         var bytes = cc.FileUtils.getInstance().getFileData(path,"rb", size);
-        size = bytes.length;
+
         myCCBReader.initWithData(bytes,ccbReader.getOwner());
         myCCBReader.getAnimationManager().setRootContainerSize(parent.getContentSize());
         myCCBReader.setAnimationManagers(ccbReader.getAnimationManagers());
+
         var ccbFileNode = myCCBReader.readFileWithCleanUp(false);
+
         ccbReader.setAnimationManagers(myCCBReader.getAnimationManagers());
-        if(ccbFileNode && ccbReader.getAnimationManager().getAutoPlaySequenceId() != -1)
-            ccbReader.getAnimationManager().runAnimations(ccbReader.getAnimationManager().getAutoPlaySequenceId(),0);
+
+        if(ccbFileNode && myCCBReader.getAnimationManager().getAutoPlaySequenceId() != -1)
+            myCCBReader.getAnimationManager().runAnimations(myCCBReader.getAnimationManager().getAutoPlaySequenceId(),0);
 
         return ccbFileNode;
     },