1

egret/libs/new_wx/MainBase.ts

@@ -132,6 +132,8 @@ export default class MainBase extends eui.UILayer {
         RES.getResAsync('mapBg_mp3');
         RES.getResAsync(`nums_png`);
         RES.getResAsync(`nums_fnt`);
+        RES.getResAsync(`nums2_png`);
+        RES.getResAsync(`nums2_fnt`);
         if (!window['development'])
             RES.getResAsync(`common_json`);
         else {

egret/resource/default.res.json

@@ -44,10 +44,6 @@
 			"keys": "道具商城_png,按钮 副本_png",
 			"name": "shop"
 		},
-		{
-			"keys": "通关条件_png,数量_png,数量 副本 3_png,按钮_png",
-			"name": "startpanel"
-		},
 		{
 			"keys": "yezi1_png,unlightedStar_png,targetBoard_png,stepsBoard_png,stepNumber9_png,stepNumber8_png,stepNumber7_png,stepNumber6_png,stepNumber5_png,stepNumber4_png,stepNumber3_png,stepNumber2_png,stepNumber1_png,stepNumber0_png,stepBtn_png,starProgress_png,setting_png,scoreNumber9_png,scoreNumber8_png,scoreNumber7_png,scoreNumber6_png,scoreNumber5_png,scoreNumber4_png,scoreNumber3_png,scoreNumber2_png,scoreNumber1_png,scoreNumber0_png,rock6_png,rock5_png,rock4_png,rock3_png,rock2_png,rock1_png,rightMark_png,rightArrow_png,rectLat_png,progressDown_png,playSceneBg_png,magicLionBg_png,magicLion_png,lockUp_png,lockDown_png,lineLight_png,lightedStar_png,leftArrow_png,ice6_png,ice5_png,ice4_png,ice3_png,ice2_png,ice1_png,hammerBtn_png,eleDis9_png,eleDis8_png,eleDis7_png,eleDis6_png,eleDis5_png,eleDis4_png,eleDis3_png,eleDis2_png,eleDis12_png,eleDis11_png,eleDis10_png,eleDis1_png,ele5_png,ele42_png,ele41_png,ele40_png,ele4_png,ele32_png,ele31_png,ele30_png,ele3_png,ele22_png,ele21_png,ele20_png,ele2_png,ele12_png,ele11_png,ele10_png,ele1_png,ele02_png,ele01_png,ele00_png,ele0_png,dangqianfenshu_png,chooseRect_png,boomBtn_png,boom9_png,boom8_png,boom7_png,boom6_png,boom5_png,boom4_png,boom3_png,boom2_png,boom18_png,boom17_png,boom16_png,boom15_png,boom14_png,boom13_png,boom12_png,boom11_png,boom10_png,boom1_png,mainSoundBtnOn_png,mainSettingBg_png,mainQuestionBtn_png,mainMusicBtnOn_png,mainQuitBtn_png,mainSoundBtnOff_png,mainMusicBtnOff_png,targetNumber9_png,targetNumber8_png,targetNumber7_png,targetNumber6_png,targetNumber5_png,targetNumber4_png,targetNumber3_png,targetNumber2_png,targetNumber1_png,targetNumber0_png,ele7_png,ele6_png,bonusFra9_png,bonusFra8_png,bonusFra7_png,bonusFra6_png,bonusFra5_png,bonusFra4_png,bonusFra3_png,bonusFra27_png,bonusFra26_png,bonusFra25_png,bonusFra24_png,bonusFra23_png,bonusFra22_png,bonusFra21_png,bonusFra20_png,bonusFra2_png,bonusFra19_png,bonusFra18_png,bonusFra17_png,bonusFra16_png,bonusFra15_png,bonusFra14_png,bonusFra13_png,bonusFra12_png,bonusFra11_png,bonusFra10_png,bonusFra1_png,bonusShoot_png,guideTxt5_png,guideTxt4_png,guideTxt3_png,guideTxt2_png,guideTxt1_png,guideKnowBtn_png,guideBg_png,propNum9_png,propNum8_png,propNum7_png,propNum6_png,propNum5_png,propNum4_png,propNum3_png,propNum2_png,propNum1_png,propNum0_png,propNumBg_png,bonusTime_png,eleDis19_png,eleDis18_png,eleDis17_png,eleDis16_png,eleDis15_png,eleDis14_png,eleDis13_png",
 			"name": "main2"
@@ -71,6 +67,10 @@
 		{
 			"keys": "prize2_icon_png",
 			"name": "prize2"
+		},
+		{
+			"name": "preload",
+			"keys": "startpanel数量_png,startpanel按钮_png,startpanel数量 副本 3_png,startpanel通关条件_png,startpanel_block2_png,startpanel目标3_png,startpanel目标33_png"
 		}
 	],
 	"resources": [
@@ -429,26 +429,6 @@
 			"type": "image",
 			"name": "按钮 副本 8_png"
 		},
-		{
-			"url": "assets/startpanel2/按钮.png",
-			"type": "image",
-			"name": "按钮_png"
-		},
-		{
-			"url": "assets/startpanel2/数量 副本 3.png",
-			"type": "image",
-			"name": "数量 副本 3_png"
-		},
-		{
-			"url": "assets/startpanel2/数量.png",
-			"type": "image",
-			"name": "数量_png"
-		},
-		{
-			"url": "assets/startpanel2/通关条件.png",
-			"type": "image",
-			"name": "通关条件_png"
-		},
 		{
 			"url": "assets/map/光 副本 4.png",
 			"type": "image",
@@ -1573,6 +1553,41 @@
 			"url": "assets/common/common_yuanbao.png",
 			"type": "image",
 			"name": "common_yuanbao_png"
+		},
+		{
+			"name": "startpanel数量_png",
+			"type": "image",
+			"url": "assets/startpanel2/startpanel数量.png"
+		},
+		{
+			"name": "startpanel按钮_png",
+			"type": "image",
+			"url": "assets/startpanel2/startpanel按钮.png"
+		},
+		{
+			"name": "startpanel数量 副本 3_png",
+			"type": "image",
+			"url": "assets/startpanel2/startpanel数量 副本 3.png"
+		},
+		{
+			"name": "startpanel通关条件_png",
+			"type": "image",
+			"url": "assets/startpanel2/startpanel通关条件.png"
+		},
+		{
+			"name": "startpanel_block2_png",
+			"type": "image",
+			"url": "assets/startpanel2/startpanel_block2.png"
+		},
+		{
+			"name": "startpanel目标3_png",
+			"type": "image",
+			"url": "assets/startpanel2/startpanel目标3.png"
+		},
+		{
+			"name": "startpanel目标33_png",
+			"type": "image",
+			"url": "assets/startpanel2/startpanel目标33.png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/StartPanelSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="StartPanelSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16cd285c715"/>
-	<e:Image source="通关条件_png" y="52" horizontalCenter="0"/>
+	<e:Image y="52" horizontalCenter="0" source="startpanel通关条件_png"/>
 	<e:Label id="levelTxt" text="第一关" y="204" horizontalCenter="0" size="42"/>
-	<e:Label id="targetTxt" text="在规定的步数内\n消除足够数量目标" y="332" width="444" x="157" textAlign="center" lineSpacing="15" verticalAlign="middle" height="156" anchorOffsetX="0" textColor="0xa32020"/>
+	<e:Label id="targetTxt" text="在规定的步数内\n消除足够数量目标" y="332" width="444" x="157" textAlign="center" lineSpacing="15" verticalAlign="middle" height="156" anchorOffsetX="0" textColor="0xa32020" visible="false"/>
 	<e:Button id="startBtn" label="" y="787" horizontalCenter="0">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="按钮_png" source.down="按钮_png" source.disabled="按钮_png"/>
+			<e:Image width="100%" height="100%" source="startpanel按钮_png" source.down="startpanel按钮_png" source.disabled="startpanel按钮_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 		</e:skinName>
@@ -15,7 +15,7 @@
 	<e:Button id="buy2btn" label="" y="683" x="240">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="数量 副本 3_png" source.down="数量 副本 3_png" source.disabled="数量 副本 3_png"/>
+			<e:Image width="100%" height="100%" source="startpanel数量 副本 3_png" source.down="startpanel数量 副本 3_png" source.disabled="startpanel数量 副本 3_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 		</e:skinName>
@@ -23,7 +23,7 @@
 	<e:Button id="buy1btn" label="" y="683" x="403">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="数量 副本 3_png" source.down="数量 副本 3_png" source.disabled="数量 副本 3_png"/>
+			<e:Image width="100%" height="100%" source="startpanel数量 副本 3_png" source.down="startpanel数量 副本 3_png" source.disabled="startpanel数量 副本 3_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 		</e:skinName>
@@ -31,7 +31,7 @@
 	<e:Button id="buy3btn" label="" y="683" x="566">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="数量 副本 3_png" source.down="数量 副本 3_png" source.disabled="数量 副本 3_png"/>
+			<e:Image width="100%" height="100%" source="startpanel数量 副本 3_png" source.down="startpanel数量 副本 3_png" source.disabled="startpanel数量 副本 3_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 		</e:skinName>
@@ -47,4 +47,8 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Group id="scoreGroup" x="223" y="400">
+		<e:Image source="startpanel目标3_png" x="0" y="1"/>
+		<e:BitmapLabel id="targetScoreTxt" x="76" y="0" text="33121" font="nums_fnt" scaleX="2" scaleY="2"/>
+	</e:Group>
 </e:Skin>
\ No newline at end of file

egret/src/panels/StartPanel.ts

@@ -23,10 +23,14 @@ export default class StartPanel extends Panel {
             mapDataIndex = data - 20
         }
         const levelType = Chapters[mapDataIndex].passTarget.type;
-        if (levelType == PassType.ELEMENT_TARGET)
-            this['targetTxt'].text = '在规定步数内\n消除足够数量目标';
-        else if (levelType == PassType.SCORE_TARGET)
-            this['targetTxt'].text = `在规定步数内\n分数达到${Chapters[mapDataIndex].passTarget.score}分`;
+        if (levelType == PassType.ELEMENT_TARGET) {
+
+            // this['targetTxt'].text = '在规定步数内\n消除足够数量目标';
+        }
+        else if (levelType == PassType.SCORE_TARGET) {
+            this['targetScoreTxt'].text = `${Chapters[mapDataIndex].passTarget.score}`;
+            // this['targetTxt'].text = `在规定步数内\n分数达到${Chapters[mapDataIndex].passTarget.score}分`;
+        }
 
         const prop2Nums = getPropNums(PropType.BOOM);
         const prop1Nums = getPropNums(PropType.HAMMER);