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

egret/resource/skins/TaskCenterNoPrizeSkin.exml

@@ -15,7 +15,7 @@
 		<e:Label text="啊哦，奖励擦肩而过…" y="0" fontFamily="FZY3JW" size="40" horizontalCenter="0" textColor="0xc17343"/>
 	</e:Group>
 	<e:Group id="suningGroup" horizontalCenter="-1" y="321" visible="false">
-		<e:Label id="suningLabel" text="继续完成任务，还可以获得更多奖励哦～" y="20" fontFamily="FZY3JW" size="28" horizontalCenter="0" x="10" textColor="0xc17343"/>
+		<e:Label id="suningLabel" text="继续完成任务，还可以获得更多元宝哦～" y="20" fontFamily="FZY3JW" size="28" horizontalCenter="0" x="10" textColor="0xc17343"/>
 		<e:Label text="换个姿势，再来一次！" y="-40" fontFamily="FZY3JW" size="46" horizontalCenter="0" x="-30" scaleX="1" scaleY="1" textColor="0xc17343"/>
 	</e:Group>
 	<e:Group id="btn" y="722.5" horizontalCenter="0">

egret/resource/skins/TurntableNoPrizeSkin.exml

@@ -36,7 +36,7 @@
 			<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
 		</e:Group>
 	</e:Group>
-	<e:Image id="tips1" source="turnnoprize换个姿势再来一次！_png" y="436.8" horizontalCenter="0" visible="false"/>
+	<e:Image id="tips1" source="turnnoprize换个姿势再来一次！_png" y="436" horizontalCenter="0" visible="false"/>
 	<e:Image id="tips2" source="turnnoprize奖励溜走了，再试一次吧！_png" y="423.65" horizontalCenter="0" visible="false"/>
-	<e:Image id="tips3" source="turnnoprize离奖励只差一毫米！ 再来一次吧！_png" y="403.65" horizontalCenter="0.5" visible="false"/>
+	<e:Image id="tips3" source="turnnoprize离奖励只差一毫米！ 再来一次吧！_png" y="436" horizontalCenter="1" visible="false"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/TaskCenter/TaskCenterPrize.ts

@@ -85,7 +85,7 @@ export default class TaskCenterPrize extends Panel {
             default:
                 this.img.visible = true;
                 this.img.source = img;
-                this.tipsLabel.text = '继续完成任务可以获得更多优惠哦~';
+                this.tipsLabel.text = '继续完成任务可以获得更多元宝哦~';
                 break;
         }
     }