From 08cb3e2339e926e59559b770b241a5f3a5162b77 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 19 Nov 2015 17:02:10 +0800 Subject: [PATCH 1/2] Fix CallFunc not accepting 0 as data issue --- cocos2d/actions/CCActionInstant.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos2d/actions/CCActionInstant.js b/cocos2d/actions/CCActionInstant.js index b8b55fd988..f1e73f91ac 100644 --- a/cocos2d/actions/CCActionInstant.js +++ b/cocos2d/actions/CCActionInstant.js @@ -660,7 +660,7 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{ if (selectorTarget) { this._selectorTarget = selectorTarget; } - if (data) { + if (data !== undefined) { this._data = data; } return true; From 7bf90741497bf2821c69b234c8a305e3cb1f24d8 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 19 Nov 2015 17:02:22 +0800 Subject: [PATCH 2/2] Fix text color parser for TextField widget --- extensions/cocostudio/loader/parsers/uiParser-1.x.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/extensions/cocostudio/loader/parsers/uiParser-1.x.js b/extensions/cocostudio/loader/parsers/uiParser-1.x.js index c14763e875..4f88976592 100644 --- a/extensions/cocostudio/loader/parsers/uiParser-1.x.js +++ b/extensions/cocostudio/loader/parsers/uiParser-1.x.js @@ -662,6 +662,13 @@ var va = options["vAlignment"]; if(va) widget.setTextVerticalAlignment(va); + + var r = options["colorR"]; + var g = options["colorG"]; + var b = options["colorB"]; + if (r !== undefined && g !== undefined && b !== undefined) { + widget.setTextColor(cc.color(r, g, b)); + } }; var register = [