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

egret/resource/TextureMerger/back.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"back","version":5,"files":["../assets/back/back按钮 副本 91.png","../assets/back/backbg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/bag.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bag","version":5,"files":["../assets/bag/bagbtn我的奖券.png","../assets/bag/bagbtn我的道具.png","../assets/bag/bag我的奖券.png","../assets/bag/bag我的道具.png","../assets/bag/bag_item_bg2.png","../assets/bag/bag_item_bg.png","../assets/bag/bag_icon3.png","../assets/bag/bag_icon2.png","../assets/bag/bag_icon1.png","../assets/bag/bag按钮 副本 9.png","../assets/bag/bag按钮 副本 10.png","../assets/bag/bagbg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/bagquit.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"bagquit","version":5,"files":["../assets/bagquit/bag退出弹窗.png","../assets/bagquit/bag退出按钮.png","../assets/bagquit/bag继续按钮.png"]}
\ No newline at end of file

egret/resource/TextureMerger/common.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/common_yuanbao.png","../assets/common/common_prizelight.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/exchangebtn.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/common_yuanbao.png","../assets/common/common_prizelight.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/exchangebtn.png","../assets/common/turnnoprize再来一次.png"]}
\ No newline at end of file

egret/resource/TextureMerger/h52.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"h52","version":5,"files":["../assets/h52/h52按钮.png"]}
\ No newline at end of file

egret/resource/TextureMerger/scratch.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"scratch","version":5,"files":["../assets/scratch/scratch_bg.png","../assets/scratch/scratch_hongbao.png","../assets/scratch/scratch_help.png","../assets/scratch/scratch_progress_bg.png","../assets/scratch/scratch_wx_tip.png","../assets/scratch/scratchbg2.png","../assets/scratch/scratch_invite.png","../assets/scratch/scratch_card_90.png","../assets/scratch/scratch_card_96.png","../assets/scratch/scratch_card_94.png","../assets/scratch/scratch_card_98.png","../assets/scratch/scratch_user1.png","../assets/scratch/scratch_card_bg.png","../assets/scratch/scratch_card_92.png","../assets/scratch/scratch_user2.png"]}
\ No newline at end of file

egret/resource/TextureMerger/scratchprizepanel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"scratchprizepanel","version":5,"files":["../assets/scratch/prize/scratchPrize_bg.png","../assets/scratch/prize/scratchPrize_btn.png","../assets/scratch/prize/scratchPrize_game_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/scratchrulepanel.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"scratchrulepanel","version":5,"files":["../assets/scratch/rule/scratch_rule_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/startpanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png","../assets/startpanel2/startpanel_ele10.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turnrule.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turnrule","version":5,"files":["../assets/turnrule/turnrule抽奖说明.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/turntable_bg.png","../assets/turntable/turntable_panel.png","../assets/turntable/turntable_startbtn.png","../assets/turntable/turntable_rulebtn.png","../assets/turntable/turnable_icon1.png","../assets/turntable/turnable_icon2.png","../assets/turntable/turnable_icon3.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntablenoprize.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntablenoprize","version":5,"files":["../assets/turnnoprize/turnnoprize再来一次.png","../assets/turnnoprize/turnnoprize离奖励只差一毫米！ 再来一次吧！.png","../assets/turnnoprize/turnnoprize奖励溜走了，再试一次吧！.png","../assets/turnnoprize/turnnoprize继续闯关.png","../assets/turnnoprize/turnnoprize换个姿势再来一次！.png","../assets/turnnoprize/turnnoprizebg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntableprize.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntableprize","version":5,"files":["../assets/turntableprize/turprize继续闯关按钮.png","../assets/turntableprize/turprizebg.png","../assets/turntableprize/turnprize_icon1.png","../assets/turntableprize/turnprize_icon2.png","../assets/turntableprize/turnprize_icon3.png"]}
\ No newline at end of file

egret/resource/TextureMerger/turntableprize2.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"turntableprize2","version":5,"files":["../assets/turnprize2/turnprize2按钮.png","../assets/turnprize2/turnprize2bg.png"]}
\ No newline at end of file

egret/resource/default.res.json

@@ -21,7 +21,7 @@
 			"name": "buy3"
 		},
 		{
-			"keys": "taskicon_png,recordbtn_png,progress2_png,progress1_png,namebg_png,msgTri_png,map3_jpg,map2_jpg,map1_jpg,map_signicon_png,lionMsgBg_png,invite_txtbg_png,invite_icon_png,iconbg_png,icon_png,guideOver_png,guideMoney_png,guideLove_png,guideLevel_png,guideBox_png,friend_avatar_png,avatar_png,animal1_png,ad_icon_png,元宝bg_png,有星星_png,音乐关闭_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音关闭_png,声音_png,设置bg_png,设置_png,光 副本 4_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱3_png,宝箱2_png,宝箱1_png,宝箱_png,map明日可领_png,map今日可领_png",
+			"keys": "taskicon_png,recordbtn_png,progress2_png,progress1_png,namebg_png,msgTri_png,map3_jpg,map2_jpg,map1_jpg,map_signicon_png,lionMsgBg_png,invite_txtbg_png,invite_icon_png,iconbg_png,icon_png,guideOver_png,guideMoney_png,guideLove_png,guideLevel_png,guideBox_png,friend_avatar_png,avatar_png,animal1_png,ad_icon_png,元宝bg_png,有星星_png,音乐关闭_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音关闭_png,声音_png,设置bg_png,设置_png,光 副本 4_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱3_png,宝箱2_png,宝箱1_png,宝箱_png,map明日可领_png,map今日可领_png,map刮现金红包_png,map大转盘_png",
 			"name": "map"
 		},
 		{

egret/resource/default.thm.json

@@ -7,12 +7,10 @@
 		"resource/skins/AlertSkin.exml",
 		"resource/skins/AvatarSkin.exml",
 		"resource/skins/BackSkin.exml",
-        "resource/skins/BagSkin.exml",
-        "resource/skins/BagItemSkin.exml",
 		"resource/skins/BagItem2Skin.exml",
 		"resource/skins/BagItemSkin.exml",
-        "resource/skins/BagSkin.exml",
 		"resource/skins/BagQuitSkin.exml",
+		"resource/skins/BagSkin.exml",
 		"resource/skins/Blood2Skin.exml",
 		"resource/skins/BloodSkin.exml",
 		"resource/skins/Box2Skin.exml",
@@ -26,8 +24,8 @@
 		"resource/skins/FriendItemSkin.exml",
 		"resource/skins/FriendShareSkin.exml",
 		"resource/skins/FriendSkin.exml",
-        "resource/skins/H5Skin.exml",
 		"resource/skins/H52Skin.exml",
+		"resource/skins/H5Skin.exml",
 		"resource/skins/IconButtonSkin.exml",
 		"resource/skins/InviteCutTimePanelSkin.exml",
 		"resource/skins/InviteItemSkin.exml",
@@ -72,13 +70,13 @@
 		"resource/skins/TaskItemSkin.exml",
 		"resource/skins/TaskPrizeSkin.exml",
 		"resource/skins/TaskSkin.exml",
-        "resource/skins/ToastSkin.exml",
 		"resource/skins/Toast2Skin.exml",
-        "resource/skins/TurntableSkin.exml",
+		"resource/skins/ToastSkin.exml",
 		"resource/skins/TurnRuleSkin.exml",
+		"resource/skins/TurntableNoPrizeSkin.exml",
 		"resource/skins/TurntablePrize2Skin.exml",
 		"resource/skins/TurntablePrizeSkin.exml",
-        "resource/skins/TurntableNoPrizeSkin.exml",
+		"resource/skins/TurntableSkin.exml",
 		"resource/skins/VScrollBarSkin.exml"
 	],
 	"path": "resource/default.thm.json"

egret/src/mapScene/MapScene.ts

@@ -75,20 +75,11 @@ export default class MapScene extends Scene {
     async start(data?) {
         super.start();
 
-        NetManager.ins.hc_turnableDojoin((s,res)=>{
-            loadSvga(getResPath() + 'resource/assets/svgas/turnprize.svga').then(async (mv: any) => {
-                const data = res.data;
-                const _data = Utils.deepClone(data);
-                _data.mv = mv;
-                PanelCtrl.instance.show('TurnPrizePanel', _data);
-            });
-        });
-
         this.addIcon(); // 添加Icon
 
         this.sendInvite();
 
-        PanelCtrl.instance.show('back');
+        
 
         this.updateMyInfo();
         this.updateAdData();