From b70ed3c78bf158ca9df0bb1f098ffd36a0277163 Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 21 Apr 2015 16:46:20 +0800 Subject: [PATCH 1/3] Change the default value --- extensions/cocostudio/loader/parsers/timelineParser-2.x.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js index 99a57fbc0a..fd1f20da33 100644 --- a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js +++ b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js @@ -610,7 +610,7 @@ ); } if(label && json["OutlineEnabled"] && json["OutlineColor"] && label.enableOutline) - label.enableOutline(getColor(json["OutlineColor"]), json["OutlineSize"] || 0); + label.enableOutline(getColor(json["OutlineColor"]), json["OutlineSize"] || 1); var displaystate = getParam(json["DisplayState"], true); widget.setBright(displaystate); From bdbf527b540125bbc31ce11a4bf1e3a758e2b6fd Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 21 Apr 2015 16:47:39 +0800 Subject: [PATCH 2/3] Change the default value --- extensions/cocostudio/loader/parsers/timelineParser-2.x.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js index fd1f20da33..2bf55fba5c 100644 --- a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js +++ b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js @@ -610,7 +610,7 @@ ); } if(label && json["OutlineEnabled"] && json["OutlineColor"] && label.enableOutline) - label.enableOutline(getColor(json["OutlineColor"]), json["OutlineSize"] || 1); + label.enableOutline(getColor(json["OutlineColor"]), getParam(json["OutlineSize"], 1)); var displaystate = getParam(json["DisplayState"], true); widget.setBright(displaystate); From 7bbe07126d1b3876a6798be9ef447d2bb4dbc7d4 Mon Sep 17 00:00:00 2001 From: VisualSJ Date: Tue, 21 Apr 2015 17:22:29 +0800 Subject: [PATCH 3/3] Change the default value --- extensions/cocostudio/loader/parsers/timelineParser-2.x.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js index 2bf55fba5c..9288442532 100644 --- a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js +++ b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js @@ -524,7 +524,7 @@ widget.setTextVerticalAlignment(v_alignment); if(json["OutlineEnabled"] && json["OutlineColor"] && widget.enableOutline) - widget.enableOutline(getColor(json["OutlineColor"]), json["OutlineSize"] || 0); + widget.enableOutline(getColor(json["OutlineColor"]), getParam(json["OutlineSize"], 1)); if(json["ShadowEnabled"] && json["ShadowColor"] && widget.enableShadow) widget.enableShadow(