From 6d13a149469fc0eeaff1f3316a6247fb88d080ac Mon Sep 17 00:00:00 2001 From: rablwupei Date: Sun, 24 Nov 2013 17:44:07 +0800 Subject: [PATCH 1/2] fix bug: ProgressTime can't change color and opacity --- cocos2d/misc_nodes/CCProgressTimer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cocos2d/misc_nodes/CCProgressTimer.js b/cocos2d/misc_nodes/CCProgressTimer.js index 892c64cc35..34a3bb0576 100644 --- a/cocos2d/misc_nodes/CCProgressTimer.js +++ b/cocos2d/misc_nodes/CCProgressTimer.js @@ -220,6 +220,7 @@ cc.ProgressTimer = cc.NodeRGBA.extend(/** @lends cc.ProgressTimer# */{ */ setColor:function (color) { this._sprite.setColor(color); + this._updateColor(); }, /** @@ -228,6 +229,7 @@ cc.ProgressTimer = cc.NodeRGBA.extend(/** @lends cc.ProgressTimer# */{ */ setOpacity:function (opacity) { this._sprite.setOpacity(opacity); + this._updateColor(); }, /** From 789784225f01b537a1c09f97e885a853a624159d Mon Sep 17 00:00:00 2001 From: rablwupei Date: Tue, 26 Nov 2013 10:48:56 +0800 Subject: [PATCH 2/2] delete _updateColor() in _updateProgressForWebGL() --- cocos2d/misc_nodes/CCProgressTimer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/cocos2d/misc_nodes/CCProgressTimer.js b/cocos2d/misc_nodes/CCProgressTimer.js index 34a3bb0576..08c896d6f8 100644 --- a/cocos2d/misc_nodes/CCProgressTimer.js +++ b/cocos2d/misc_nodes/CCProgressTimer.js @@ -883,7 +883,6 @@ cc.ProgressTimer = cc.NodeRGBA.extend(/** @lends cc.ProgressTimer# */{ this._updateRadial(); else if(locType === cc.PROGRESS_TIMER_TYPE_BAR) this._updateBar(); - this._updateColor(); this._vertexDataDirty = true; } });