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

egret/resource/skins/MapSkin.exml

@@ -84,7 +84,7 @@
 				</e:Skin>
 				</e:skinName>
 			</e:Button>
-			<e:Button id="musicOffBtn" label="" y="73.95" horizontalCenter="0.5" visible="false">
+			<e:Button id="musicOffBtn" label="" y="13.69" horizontalCenter="0.5" visible="false">
 				<e:skinName>
 					<e:Skin states="up,down,disabled">
 					<e:Image width="100%" height="100%" source="音乐关闭_png" source.down="音乐关闭_png" source.disabled="音乐关闭_png"/>
@@ -92,7 +92,7 @@
 					</e:Skin>
 				</e:skinName>
 			</e:Button>
-			<e:Button id="soundOffBtn" label="" y="120.24" horizontalCenter="0.5" visible="false">
+			<e:Button id="soundOffBtn" label="" y="60.32" horizontalCenter="0.5" visible="false">
 				<e:skinName>
 					<e:Skin states="up,down,disabled">
 					<e:Image width="100%" height="100%" source="声音关闭_png" source.down="声音关闭_png" source.disabled="声音关闭_png"/>

egret/src/panels/FailedPanel.ts

@@ -21,6 +21,11 @@ export default class FailedPanel extends Panel {
         }, this);
     }
 
+    onTouchTap_closeBtn() {
+        super.onTouchTap_closeBtn();
+        SceneCtrl.instance.change(ModuleTypes.START_SCENE);
+    }
+
     protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
     get skinKey() { return 'Fail' }
 }
\ No newline at end of file