Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cc.Color() and cc.color() don't replace 0 alpha with 255 no more

This commit is contained in:
Mykyta Usikov 2015-05-27 11:25:04 +03:00
parent ca8ca35fd6
commit 355381e0d8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/scripting/js-bindings/script/jsb_cocos2d.js
View File

@ -1094,7 +1094,7 @@ cc.Color = function (r, g, b, a) {
this.r = r || 0; this.r = r || 0;
this.g = g || 0; this.g = g || 0;
this.b = b || 0; this.b = b || 0;
this.a = a || 255; this.a = (a === undefined) ? 255 : a;
}; };
/** /**
@ -1124,8 +1124,8 @@ cc.color = function (r, g, b, a) {
if (typeof r === "string") if (typeof r === "string")
return cc.hexToColor(r); return cc.hexToColor(r);
if (typeof r === "object") if (typeof r === "object")
return {r: r.r, g: r.g, b: r.b, a: r.a || 255}; return {r: r.r, g: r.g, b: r.b, a: (r.a === undefined) ? 255 : r.a};
return {r: r, g: g, b: b, a: a || 255}; return {r: r, g: g, b: b, a: (a === undefined ? 255 : a)};
}; };
/** /**