Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into 猩猩

egret/resource/skins/TaskCenterPrizeSkin.exml

@@ -16,11 +16,11 @@
 	<e:Image id="img" y="374.77" touchEnabled="true" width="518" height="243" scaleX="1" scaleY="1" source="{data.url}" horizontalCenter="2" anchorOffsetX="0" anchorOffsetY="0"/>
 	<e:Image id="prop" scaleX="1" scaleY="1" horizontalCenter="-58.5" source="taskPrize_money_png" verticalCenter="-104"/>
 	<e:Group id="numsgroup" x="384.4" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62" verticalCenter="-100">
-		<e:Label id="nums" text="×8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" textColor="0xc17343" left="0" bold="true"/>
+		<e:Label id="nums" text="×8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" left="0" bold="true" textColor="0xc17343"/>
 	</e:Group>
-	<e:Label id="tipsLabel" text="继续完成任务可以获得更多元宝哦~" y="632.73" textColor="0xF54500" fontFamily="FZY3JW" size="26" horizontalCenter="0"/>
+	<e:Label id="tipsLabel" text="继续完成任务可以获得更多元宝哦~" y="632.73" fontFamily="FZY3JW" size="26" horizontalCenter="0" textColor="0xc17343"/>
 	<e:Group id="btn" y="690" anchorOffsetX="0" width="332.33" anchorOffsetY="0" height="104.33" horizontalCenter="0">
 		<e:Image y="0" source="TaskCenter_btn_png" scaleX="0.9" scaleY="0.9" x="0"/>
-		<e:Label id="btnLabel" text="继续闯关" size="42" strokeColor="0xff7038" stroke="3" fontFamily="FZY3JW" horizontalCenter="-0.16499999999999204" verticalCenter="-1.1649999999999991"/>
+		<e:Label id="btnLabel" text="继续闯关" size="42" strokeColor="0xff8b46" stroke="3" fontFamily="FZY4JW" horizontalCenter="-0.16499999999999204" verticalCenter="-1.1649999999999991"/>
 	</e:Group>
 </e:Skin>

egret/src/panels/TaskCenter/TaskCenter.ts

@@ -110,7 +110,7 @@ class TaskCenterItem extends eui.ItemRenderer {
 
     // '0x7e7e7e'   done    灰色
     // '0x1376df'   goTask  蓝色
-    // '0xf99f45'   getPrize    橙色
+    // '0xff8b46'   getPrize    橙色
     // 设置按钮
     private setBtn() {
         const count = this.data.count;  // 领取奖励*count
@@ -124,7 +124,7 @@ class TaskCenterItem extends eui.ItemRenderer {
         if(count > 0) {  // 可领奖
             this.btnImg.source = 'TaskCenter_' + 'getPrize' + 'Btn_png';
             this.btnLabel.text = `领取奖励×${count}`;
-            this.btnLabel.strokeColor = 0xf99f45;
+            this.btnLabel.strokeColor = 0xff8b46;
             this.btnGroup.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
                 // 领奖
                 this.btnGroup.touchEnabled = false;