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

egret/resource/skins/ScratchSkin.exml

@@ -25,7 +25,8 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="895.33" size="28" textColor="0xffffff"  horizontalCenter="0.5" fontFamily="FZY3JW"/>
+	<e:Label id="cutTimeLabel" text="23:43:21" y="895.33" size="28" textColor="0xffffff"  fontFamily="FZY3JW" bold="true" x="310"/>
+	<e:Label text="将在                后失效" y="895.33" size="28" textColor="0xFFFFFF" fontFamily="FZY3JW" horizontalCenter="0"/>
 	<e:Label text="帮刮\n记录" y="805" size="28" textColor="0xFFFFFF" horizontalCenter="-248"/>
 	<e:Scroller width="487" height="90" y="783" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="32.5">
 		<e:Group anchorOffsetX="0" y="2">
@@ -48,7 +49,7 @@
 		<e:Group id="progressGroup" x="8" verticalCenter="0">
 			<e:Image id="progressBg" source="scratch_progress_bg_png" anchorOffsetX="0" anchorOffsetY="0" x="0" y="0" width="437" height="22"/>
 			<e:Rect id="progress" fillColor="0xeb1917" left="0" verticalCenter="0" width="0" top="0" bottom="0"/>
-			<e:Label id="progressLabel" text="仅剩90.7%" size="18" verticalCenter="2" horizontalCenter="0.5" bold="true" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW"/>
+			<e:Label id="progressLabel" text="仅剩90.7%" size="18" verticalCenter="2" bold="true" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" horizontalCenter="0"/>
 		</e:Group>
 		<e:Image id="hongbao" source="scratch_hongbao_png" scaleX="1" scaleY="1" verticalCenter="0" horizontalCenter="219"/>
 	</e:Group>

egret/src/panels/ScratchPanel.ts

@@ -160,7 +160,7 @@ export default class ScratchPanel extends Panel {
         this.setProgress(+this.data.completePercent);
 
         // 倒计时
-        this.cutTimer = new CutTimer(this["cutTimeLabel"], "将在hh:mm:ss后失效", () => {
+        this.cutTimer = new CutTimer(this["cutTimeLabel"], "hh:mm:ss", () => {
                 this.hidePanel();
                 GDispatcher.dispatchEvent("updateScratchTips");
             }