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

egret/resource/skins/MapSkin.exml

@@ -12,18 +12,18 @@
 			<e:Image id="progressbg" source="progress2_png" y="0" x="0" visible="false"/>
 			<e:Image id="progressfront" source="progress1_png" y="0" x="0" visible="false"/>
 			<e:Image source="星星_png" verticalCenter="-2.5" x="-8"/>
-			<e:Label id="totalStarTxt" text="210/210" x="34.68" verticalAlign="middle" textAlign="left" size="24" verticalCenter="1.5"/>
+			<e:Label id="totalStarTxt" text="0/0" x="34.68" verticalAlign="middle" textAlign="left" size="24" verticalCenter="1.5"/>
 		</e:Group>
 		<e:Image id="box" source="宝箱_png" right="34" verticalCenter="3" anchorOffsetX="34" anchorOffsetY="34"/>
 		<e:Group id="boxiconWrapper" x="193.68" y="34.86" touchEnabled="false" touchChildren="false">
 			<e:Image x="8.32" y="0" source="iconbg_png"/>
-			<e:Label id="boxNumsTxt" text="88" x="0" verticalAlign="middle" textAlign="center" size="18" width="46" y="6.14"/>
+			<e:Label id="boxNumsTxt" text="0" x="0" verticalAlign="middle" textAlign="center" size="18" width="46" y="6.14"/>
 		</e:Group>
 	</e:Group>
 	<e:Group id="top" x="36" y="24">
 		<e:Image source="元宝bg_png" x="0" y="0"/>
-		<e:Label id="bloodTxt" text="50/50" x="78.04" y="27.84" width="82" verticalAlign="middle" textAlign="center"/>
-		<e:Label id="goldTxt" text="50/50" x="396.04" y="27.84" width="88" verticalAlign="middle" textAlign="center"/>
+		<e:Label id="bloodTxt" text="0/5" x="78.04" y="27.84" width="82" verticalAlign="middle" textAlign="center"/>
+		<e:Label id="goldTxt" text="0" x="396.04" y="27.84" width="88" verticalAlign="middle" textAlign="center"/>
 		<e:Button id="bloodBtn" label="" x="165.72" y="16.6">
 			<e:skinName>
 				<e:Skin states="up,down,disabled">

egret/src/panels/FailedPanel.ts

 import Panel from "../../libs/new_wx/components/Panel";
 import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
 import { ModuleTypes } from "../../libs/new_wx/types/sceneTypes";
-import { createData } from "../startScene/StartScene";
 import { NetManager } from "../../libs/tw/manager/NetManager";
 
 export default class FailedPanel extends Panel {