1

egret/libs/tc/manager/ABNetManager.ts

@@ -25,13 +25,17 @@ export abstract class ABNetManager {
         let realUrl: string = net.uri;
         if (realUrl.indexOf('?') != -1) {
             gTime = '&_=' + GTime.getTimestamp();
+
         }
 
+        realUrl += gTime;
+
         //url加参数等特殊需求（例如再玩一次需要在dostart接口的url上加埋点）
         if (net.addUrl) {
             realUrl += net.addUrl;
         }
 
+
         const obj = {
             type: net.type,
             // url: realUrl + gTime,

egret/resource/TextureMerger/startpanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/通关条件.png","../assets/startpanel2/数量.png","../assets/startpanel2/数量 副本 3.png","../assets/startpanel2/按钮.png"]}
\ No newline at end of file
+{"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_ice1.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_block2.png"]}
\ No newline at end of file

egret/resource/default.res.json

@@ -9,7 +9,7 @@
 			"name": "rule"
 		},
 		{
-			"keys": "toast_png,nums_png,nums_fnt,closeCommonBtn_png,btn_png,alertbg_png,按钮 副本 4_png,按钮 副本 3_png,share_btn2_png,朋友圈中间分享蒙层1_jpg,share_btn1_png,commmon_okbtn1_png,lightani_png,prizePanelbg_png,common_prizelight_png,common_yuanbao_png",
+			"keys": "toast_png,nums_png,nums_fnt,closeCommonBtn_png,btn_png,alertbg_png,按钮 副本 4_png,按钮 副本 3_png,share_btn2_png,朋友圈中间分享蒙层1_jpg,share_btn1_png,commmon_okbtn1_png,lightani_png,prizePanelbg_png,common_prizelight_png,common_yuanbao_png,nums2_png,nums2_fnt",
 			"name": "common"
 		},
 		{
@@ -69,8 +69,8 @@
 			"name": "prize2"
 		},
 		{
-			"name": "preload",
-			"keys": "startpanel数量_png,startpanel按钮_png,startpanel数量 副本 3_png,startpanel通关条件_png,startpanel_block2_png,startpanel目标3_png,startpanel目标33_png,nums2_fnt,nums2_png,startpanel_ele6_png,startpanel_ice1_png"
+			"keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_ice1_png,startpanel_ele6_png,startpanel_block2_png",
+			"name": "startpanel"
 		}
 	],
 	"resources": [
@@ -1555,59 +1555,59 @@
 			"name": "common_yuanbao_png"
 		},
 		{
-			"name": "startpanel数量_png",
+			"url": "assets/startpanel2/startpanel数量.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel数量.png"
+			"name": "startpanel数量_png"
 		},
 		{
-			"name": "startpanel按钮_png",
+			"url": "assets/startpanel2/startpanel按钮.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel按钮.png"
+			"name": "startpanel按钮_png"
 		},
 		{
-			"name": "startpanel数量 副本 3_png",
+			"url": "assets/startpanel2/startpanel数量 副本 3.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel数量 副本 3.png"
+			"name": "startpanel数量 副本 3_png"
 		},
 		{
-			"name": "startpanel通关条件_png",
+			"url": "assets/startpanel2/startpanel通关条件.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel通关条件.png"
+			"name": "startpanel通关条件_png"
 		},
 		{
-			"name": "startpanel_block2_png",
+			"url": "assets/startpanel2/startpanel_block2.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel_block2.png"
+			"name": "startpanel_block2_png"
 		},
 		{
-			"name": "startpanel目标3_png",
+			"url": "assets/startpanel2/startpanel目标3.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel目标3.png"
+			"name": "startpanel目标3_png"
 		},
 		{
-			"name": "startpanel目标33_png",
+			"url": "assets/startpanel2/startpanel目标33.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel目标33.png"
+			"name": "startpanel目标33_png"
 		},
 		{
-			"name": "nums2_fnt",
+			"url": "assets/common/nums2.fnt",
 			"type": "font",
-			"url": "assets/common/nums2.fnt"
+			"name": "nums2_fnt"
 		},
 		{
-			"name": "nums2_png",
+			"url": "assets/common/nums2.png",
 			"type": "image",
-			"url": "assets/common/nums2.png"
+			"name": "nums2_png"
 		},
 		{
-			"name": "startpanel_ele6_png",
+			"url": "assets/startpanel2/startpanel_ele6.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel_ele6.png"
+			"name": "startpanel_ele6_png"
 		},
 		{
-			"name": "startpanel_ice1_png",
+			"url": "assets/startpanel2/startpanel_ice1.png",
 			"type": "image",
-			"url": "assets/startpanel2/startpanel_ice1.png"
+			"name": "startpanel_ice1_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/default.thm.json

@@ -2,7 +2,6 @@
 	"skins": {},
 	"autoGenerateExmlsList": true,
 	"exmls": [
-		"resource/skins/TargetItemSkin.exml",
 		"resource/skins/AlertSkin.exml",
 		"resource/skins/BloodSkin.exml",
 		"resource/skins/Box2Skin.exml",
@@ -35,6 +34,7 @@
 		"resource/skins/StarSkin.exml",
 		"resource/skins/StartPanelSkin.exml",
 		"resource/skins/StartSkin.exml",
+		"resource/skins/TargetItemSkin.exml",
 		"resource/skins/ToastSkin.exml",
 		"resource/skins/VScrollBarSkin.exml"
 	],

egret/scripts/MyExmlPlugin.ts

@@ -8,7 +8,8 @@ import { ExmlPlugin2 } from "./ExmlPlugin2";
 export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
     async onFile(file: plugins.File) {
         const excludes = [
-            'nums.png'
+            'nums.png',
+            'nums2.png'
         ];
         if (excludes.indexOf(file.basename) != -1) {
             return file;

egret/src/mapScene/MapScene.ts

@@ -34,7 +34,7 @@ export default class MapScene extends Scene {
         }
 
         stopGamebg();
-        if (!readCache()) {
+        if (!readCache() && getHomeData().levels.length <=0) {
             var guide = new GuideCon();
             this.addChild(guide);
             guide.play(1)