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

egret/resource/skins/TurntableNoPrizeSkin.exml

@@ -30,8 +30,8 @@
 				</e:Skin>
 			</e:skinName>
 		</e:Button>
-		<e:Label id="status2" text="（免费次数:1）" x="69.3" y="62.66" size="22" touchEnabled="false" visible="false"/>
-		<e:Group id="status1" x="48.01" y="69.32" touchChildren="false" touchEnabled="false">
+
+		<e:Group id="status1" x="52" y="75" touchChildren="false" touchEnabled="false">
 			<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
 			<e:Label id="nums" text="（-50" x="7" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
 			<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
@@ -40,4 +40,5 @@
 	<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="436" horizontalCenter="1" visible="false"/>
+	<e:Label id="status2" text="（免费次数:1）" x="169.3" y="629.58" size="22" touchEnabled="false" fontFamily="FZY3JW" visible="false"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/TurntablePrizeSkin.exml

@@ -50,11 +50,11 @@
 
 
 		</e:Button>
-		<e:Group id="status1" x="52" y="69.32">
+		<e:Group id="status1" x="52" y="75" visible="false">
 			<e:Label text="）" x="120.61" size="22" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
 			<e:Label id="nums" text="（-50" x="7" size="22" textAlign="right" width="82" touchEnabled="false" fontFamily="FZY3JW" verticalCenter="0"/>
 			<e:Image source="common_yuanbao_png" x="94" scaleX="0.2" scaleY="0.2" verticalCenter="0"/>
 		</e:Group>
 	</e:Group>
-	<e:Label id="status2" text="（免费次数:1）" x="169.3" y="764.97" size="22" touchEnabled="false" visible="false"/>
+	<e:Label id="status2" text="（免费次数:1）" x="169.3" y="768.97" size="22" touchEnabled="false" fontFamily="FZY3JW"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/SignPanel.ts

@@ -472,12 +472,26 @@ export default class SignPanel extends Panel {
             this.playShineDot();
             //调整
             egret.Tween.get(this["lightbot"]).set({
-                alpha:0.3
+                alpha:1
             })
-            .wait(150)
+            .to({
+                alpha:0,
+            },300);
+
+            egret.Tween.get(this["lightbot"])
+            .wait(450)
             .to({
                 alpha:1,
-            },150)
+            },500);
+            
+
+            // egret.Tween.get(this["lightbot"]).set({
+            //     alpha:0.3
+            // })
+            // .wait(150)
+            // .to({
+            //     alpha:1,
+            // },150)
             return;
             await wait(1000);
             this["prizegroup"].visible = false;

egret/src/panels/TurntablePanel/Turntable.ts

@@ -272,7 +272,7 @@ export default class Turntable extends Panel {
 
             // 设置按钮次数显示
             if(data.remainTimes > 0) {
-                this['btnLabel'].text = `免费次数:\n${data.remainTimes}次`;
+                this['btnLabel'].text = `免费次数:${data.remainTimes}次`;
             } else {
                 this['btnLabel'].text = `${data.nextTimeNeedCoin}元宝/次`;
             }