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

egret/resource/TextureMerger/map.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png","../assets/map/map2+bg2.png","../assets/map/mapredbagicom.png","../assets/map/maplight2.png","../assets/map/taskBtn.png","../assets/map/txtbg_blue.png","../assets/map/txtbg_orange.png","../assets/map/txtbg_purple.png","../assets/map/mapredbagicom2.png","../assets/map/iconnow.png","../assets/map/arrow.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png","../assets/map/map2+bg2.png","../assets/map/mapredbagicom.png","../assets/map/maplight2.png","../assets/map/taskBtn.png","../assets/map/txtbg_blue.png","../assets/map/txtbg_orange.png","../assets/map/txtbg_purple.png","../assets/map/mapredbagicom2.png","../assets/map/iconnow.png","../assets/map/arrow.png","../assets/map/guide5.png"]}
\ No newline at end of file

egret/resource/TextureMerger/prize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/点亮gray.png","../assets/prize/点亮.png","../assets/prize/点亮 副本 2gray.png","../assets/prize/点亮 副本 2.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/点亮gray.png","../assets/prize/点亮.png","../assets/prize/点亮 副本 2gray.png","../assets/prize/点亮 副本 2.png","../assets/prize/prize_icon2.png","../assets/prize/prize_icon3.png","../assets/prize/prize_icon1.png","../assets/prize/prize_blood.png","../assets/prize/prize_money.png","../assets/prize/物品奖励.png"]}
\ No newline at end of file

egret/resource/TextureMerger/sign.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/sign_quan10.png","../assets/sign/sign_quan23.png","../assets/sign/sign_quan36.png","../assets/sign/sign_quan25.png","../assets/sign/sign_quan35.png","../assets/sign/sign_quan30.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/sign_quan10.png","../assets/sign/sign_quan23.png","../assets/sign/sign_quan36.png","../assets/sign/sign_quan25.png","../assets/sign/sign_quan35.png","../assets/sign/sign_quan30.png","../assets/sign/sign_mask.png","../assets/sign/signitemno.png","../assets/sign/signitemyes.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntable.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntable","version":5,"files":["../assets/turntable/turnable_icon1.png","../assets/turntable/turnable_icon2.png","../assets/turntable/turnable_icon3.png","../assets/turntable/turntable_bg.png","../assets/turntable/turntable_panel.png","../assets/turntable/turntable_rulebtn.png","../assets/turntable/turntable_startbtn.png","../assets/turntable/turntable_oupon.png","../assets/turntable/turntable_prop.png","../assets/turntable/turntable_scratch.png","../assets/turntable/turntable_thanks.png","../assets/turntable/turntable_wealth.png","../assets/turntable/turntable_gameTime.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntable","version":5,"files":["../assets/turntable/turnable_icon1.png","../assets/turntable/turnable_icon2.png","../assets/turntable/turnable_icon3.png","../assets/turntable/turntable_bg.png","../assets/turntable/turntable_panel.png","../assets/turntable/turntable_rulebtn.png","../assets/turntable/turntable_startbtn.png","../assets/turntable/turntable_oupon.png","../assets/turntable/turntable_prop.png","../assets/turntable/turntable_scratch.png","../assets/turntable/turntable_thanks.png","../assets/turntable/turntable_wealth.png","../assets/turntable/turntable_gameTime.png","../assets/turntable/turntable_paneldi.png","../assets/turntable/turntabletit.png"]}
\ No newline at end of file

egret/resource/skins/TurntableSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="LoadingSceneSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Group id="container" y="-45.45" x="-3"/>
-	<e:Image source="turntabletit_png" horizontalCenter="0" verticalCenter="-623"/>
-	<e:Image scaleX="1" scaleY="1" y="73.35" horizontalCenter="0" source=""/>
-	<e:Image id="di" source="turntable_paneldi_png" scaleX="1" scaleY="1" y="232" width="761" horizontalCenter="-5.5" height="883"/>
-	<e:Group touchEnabled="false" verticalCenter="19.5" horizontalCenter="0.5">
+	<e:Group id="container" y="-83.45" x="-3"/>
+	<e:Image source="turntabletit_png" horizontalCenter="0" verticalCenter="-661"/>
+	<e:Image scaleX="1" scaleY="1" y="35.35" horizontalCenter="41.5" source=""/>
+	<e:Image id="di" source="turntable_paneldi_png" scaleX="1" scaleY="1" y="194" width="761" horizontalCenter="-5.5" height="883"/>
+	<e:Group touchEnabled="false" verticalCenter="-18.5" horizontalCenter="0.5">
 		<e:Group id="panel" anchorOffsetX="253.5" anchorOffsetY="253.5" rotation="0" horizontalCenter="0" verticalCenter="0" width="507" height="507">
 		<e:Image scaleX="1" scaleY="1" anchorOffsetX="234" anchorOffsetY="234" rotation="0" verticalCenter="0" source="turntable_panel_png" fillMode="scale" width="468" height="468" horizontalCenter="0"/>
 		<e:Group id="prize0" y="-8.98" x="179.33" anchorOffsetX="0" width="154" anchorOffsetY="0" height="133">
@@ -42,7 +42,7 @@
 		</e:Button>
 
 	</e:Group>
-	<e:Button id="closeBtn" label="" y="421.37" x="605">
+	<e:Button id="closeBtn" label="" y="383.37" x="605">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
@@ -50,8 +50,8 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group id="container2"/>
-	<e:Label id="nums" text="我的元宝：0" y="379.95" fontFamily="FZY3JW" horizontalCenter="0.5" textColor="0xffe9c0" size="32"/>
-	<e:Label id="btnLabel" text="Label" size="28" verticalCenter="353" verticalAlign="middle" textAlign="center" bold="true" touchEnabled="false" fontFamily="FZY3JW" horizontalCenter="0.5" textColor="0xffe9c0"/>
-	<e:Image id="rulebtn" source="turntable_rulebtn_png" y="1200.01" horizontalCenter="0"/>
+	<e:Group id="container2" y="-38"/>
+	<e:Label id="nums" text="我的元宝：0" y="323.95" fontFamily="FZY3JW" horizontalCenter="1" textColor="0xffe9c0" size="32"/>
+	<e:Label id="btnLabel" text="Label" size="28" verticalCenter="315" verticalAlign="middle" textAlign="center" bold="true" touchEnabled="false" fontFamily="FZY3JW" horizontalCenter="0.5" textColor="0xffe9c0"/>
+	<e:Image id="rulebtn" source="turntable_rulebtn_png" y="1162.01" horizontalCenter="0"/>
 </e:Skin>
\ No newline at end of file