Merge pull request cocos2d#1290 from dingpinglv/Iss3327_FixSpriteSetColor

dingpinglv · dingpinglv · commit d6d978a7384a · 2013-12-02T01:27:48.000-08:00
Closed cocos2d#3327: A cc.Sprite's bug has been fixed
diff --git a/cocos2d/sprite_nodes/CCSprite.js b/cocos2d/sprite_nodes/CCSprite.js
@@ -207,7 +207,7 @@ cc.generateTintImage = function (texture, tintedImgCache, color, rect, renderCan
         ctx.drawImage(tintedImgCache[2], rect.x, rect.y, w, h, 0, 0, w, h);
     }
 
-    if (((selColor.r === 0) && (selColor.g === 0) && (selColor.b === 0)) || (selColor.r + selColor.g + selColor.b < 255)) {
+    if (selColor.r + selColor.g + selColor.b < 255) {
         ctx.globalAlpha = a;
         ctx.drawImage(tintedImgCache[3], rect.x, rect.y, w, h, 0, 0, w, h);
     }

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ cc.generateTintImage = function (texture, tintedImgCache, color, rect, renderCan`
`207`	`207`	`ctx.drawImage(tintedImgCache[2], rect.x, rect.y, w, h, 0, 0, w, h);`
`208`	`208`	`}`
`209`	`209`
`210`		`- if (((selColor.r === 0) && (selColor.g === 0) && (selColor.b === 0)) \|\| (selColor.r + selColor.g + selColor.b < 255)) {`
	`210`	`+ if (selColor.r + selColor.g + selColor.b < 255) {`
`211`	`211`	`ctx.globalAlpha = a;`
`212`	`212`	`ctx.drawImage(tintedImgCache[3], rect.x, rect.y, w, h, 0, 0, w, h);`
`213`	`213`	`}`