Merge pull request cocos2d#1261 from xingsenma/develop_action

closed cocos2d#3256: Fixed a bug of CCActionInterval that it will error when target have not own RGBAProtocol.

Author: dingpinglv

cocos2d/actions/CCActionInterval.js

@@ -1827,7 +1827,9 @@ cc.FadeIn = cc.ActionInterval.extend(/** @lends cc.FadeIn# */{
      * @param {Number} time time in seconds
      */
     update:function (time) {
-        this._target.setOpacity(255 * time);
+        if (this._target.RGBAProtocol) {
+            this._target.setOpacity(255 * time);
+        }
     },
 
     /**
@@ -1872,7 +1874,9 @@ cc.FadeOut = cc.ActionInterval.extend(/** @lends cc.FadeOut# */{
      * @param {Number} time  time in seconds
      */
     update:function (time) {
-        this._target.setOpacity(255 * (1 - time));
+        if (this._target.RGBAProtocol) {
+            this._target.setOpacity(255 * (1 - time));
+        }
     },
 
     /**
@@ -1948,15 +1952,19 @@ cc.FadeTo = cc.ActionInterval.extend(/** @lends cc.FadeTo# */{
      * @param {Number} time time in seconds
      */
     update:function (time) {
-        this._target.setOpacity((this._fromOpacity + (this._toOpacity - this._fromOpacity) * time));
+        if (this._target.RGBAProtocol) {
+            this._target.setOpacity((this._fromOpacity + (this._toOpacity - this._fromOpacity) * time));
+        }
     },
 
     /**
      * @param {cc.Sprite} target
      */
     startWithTarget:function (target) {
         cc.ActionInterval.prototype.startWithTarget.call(this, target);
-        this._fromOpacity = target.getOpacity();
+        if(this._target.RGBAProtocol){
+            this._fromOpacity = target.getOpacity();
+        }
     }
 });
 
@@ -2020,16 +2028,20 @@ cc.TintTo = cc.ActionInterval.extend(/** @lends cc.TintTo# */{
      */
     startWithTarget:function (target) {
         cc.ActionInterval.prototype.startWithTarget.call(this, target);
-        this._from = this._target.getColor();
+        if (this._target.RGBAProtocol) {
+            this._from = this._target.getColor();
+        }
     },
 
     /**
      * @param {Number} time time in seconds
      */
     update:function (time) {
         var locFrom = this._from, locTo = this._to;
-        this._target.setColor(cc.c3b(locFrom.r + (locTo.r - locFrom.r) * time,
-            (locFrom.g + (locTo.g - locFrom.g) * time), (locFrom.b + (locTo.b - locFrom.b) * time)));
+        if (this._target.RGBAProtocol) {
+            this._target.setColor(cc.c3b(locFrom.r + (locTo.r - locFrom.r) * time,
+                (locFrom.g + (locTo.g - locFrom.g) * time), (locFrom.b + (locTo.b - locFrom.b) * time)));
+        }
     }
 });
 

cocos2d/tileMap_parallax_nodes/CCTMXLayer.js

@@ -105,9 +105,10 @@ cc.TMXLayer = cc.SpriteBatchNode.extend(/** @lends cc.TMXLayer# */{
         cc.Node.prototype.setContentSize.call(this, size);
 
         if(cc.renderContextType === cc.CANVAS){
+            var eglViewer = cc.EGLView.getInstance();
             var locCanvas = this._cacheCanvas;
-            locCanvas.width = 0|(size.width * 1.5);
-            locCanvas.height = 0|(size.height * 1.5);
+            locCanvas.width = 0|(size.width * 1.5 * eglViewer._scaleX);
+            locCanvas.height = 0|(size.height * 1.5 * eglViewer._scaleY);
             this._cacheContext.translate(0, locCanvas.height);
             var locContentSize = this._cacheTexture._contentSize;
             locContentSize.width = locCanvas.width;

extensions/CocoStudio/Armature/utils/CCDataReaderHelper.js

@@ -715,16 +715,20 @@ ccs.DataReaderHelper.decodeBoneDisplayFromJson = function (json, dataInfo) {
             var dicArray = json[ccs.CONST_SKIN_DATA]|| [];
             var dic = dicArray[0];
             if(dic){
-                displayData.skinData.x = (dic[ccs.CONST_A_X]|| 0) * this._positionReadScale;
-                displayData.skinData.y = (dic[ccs.CONST_A_Y]||0) * this._positionReadScale;
+                var skinData = displayData.skinData;
+                skinData.x = (dic[ccs.CONST_A_X]|| 0) * this._positionReadScale;
+                skinData.y = (dic[ccs.CONST_A_Y]||0) * this._positionReadScale;
                 if(dic.hasOwnProperty(ccs.CONST_A_SCALE_X)){
-                    displayData.skinData.scaleX = dic[ccs.CONST_A_SCALE_X];
+                    skinData.scaleX = dic[ccs.CONST_A_SCALE_X];
                 }
                 if(dic.hasOwnProperty(ccs.CONST_A_SCALE_Y)){
-                    displayData.skinData.scaleY = dic[ccs.CONST_A_SCALE_Y];
+                    skinData.scaleY = dic[ccs.CONST_A_SCALE_Y];
                 }
-                displayData.skinData.skewX = dic[ccs.CONST_A_SKEW_X]|| 0;
-                displayData.skinData.skewY = dic[ccs.CONST_A_SKEW_Y]||0;
+                skinData.skewX = dic[ccs.CONST_A_SKEW_X]|| 0;
+                skinData.skewY = dic[ccs.CONST_A_SKEW_Y]||0;
+
+                skinData.x *= dataInfo.contentScale;
+                skinData.y *= dataInfo.contentScale;
                 dic = null;
             }
             break;

extensions/CocoStudio/GUI/System/UIHelper.js

@@ -107,7 +107,6 @@ ccs.UIHelper.seekActionWidgetByActionTag = function (root, tag) {
         return root;
     }
     var arrayRootChildren = root.getChildren();
-    var length = arrayRootChildren.num;
     for (var i = 0; i < arrayRootChildren.length; i++) {
         var child = arrayRootChildren[i];
         var res = this.seekActionWidgetByActionTag(child, tag);