1

egret/libs/new_wx/MainBase.ts

@@ -255,7 +255,7 @@ export default class MainBase extends eui.UILayer {
         RES.getResAsync(`candynums_fnt`);
 
         //新加的5种基础消除特效
-        RES.loadGroup("eleDisNew")
+        RES.loadGroup("eleDisNew");
 
         if (!window['development']) {
             RES.getResAsync(`common_json`);
@@ -289,8 +289,8 @@ export default class MainBase extends eui.UILayer {
                 RES.getResAsync("boom" + i + "_png")
             }
             for (var i = 0; i < 5; i++) {
-                RES.getResAsync("ele" + i + "_png")
-                RES.getResAsync("ele" + i + "Line" + "_png")
+                RES.getResAsync("ele" + i + "_png");
+                RES.getResAsync("ele" + i + "Line" + "_png");
                 RES.getResAsync("ele" + i + "Exp" + "_png")
             }
             for (var i = 0; i < 21; i++) {
@@ -339,6 +339,8 @@ export default class MainBase extends eui.UILayer {
 
             RES.getResAsync("propBg_png");  // 道具栏背景
 
+            RES.getResAsync("guide5_png");
+
             // for (var i = 1; i <= 5; i++) {
             //     RES.getResAsync("guideTxt" + i + "_png")
             // }

egret/resource/default.res.json

@@ -21,7 +21,7 @@
 			"name": "buy3"
 		},
 		{
-			"keys": "宝箱_png,宝箱1_png,宝箱2_png,宝箱3_png,宝箱bg_png,宝箱btn_png,道具_png,关闭 拷贝_png,光 副本 4_png,设置_png,设置bg_png,声音_png,声音关闭_png,狮子_png,退出_png,问题_png,无星星_png,星星_png,星星bg_png,音乐_png,音乐关闭_png,有星星_png,有星星2_png,有星星3_png,元宝bg_png,ad_icon_png,animal1_png,avatar_png,friend_avatar_png,guideBox_png,guideLevel_png,guideLove_png,guideMoney_png,guideOver_png,icon_png,iconbg_png,icongray_png,invite_icon_png,invite_txtbg_png,lionMsgBg_png,map_signicon_png,map1_jpg,map2_jpg,map2+_png,map2+bg_png,map2红包大作战_png,map2热门引导_png,map2周一红包雨_png,map3_jpg,map大转盘_png,map刮现金红包_png,map今日可领_png,map明日可领_png,maphot_png,msgTri_png,namebg_png,progress1_png,progress2_png,recordbtn_png,taskicon_png,map2+bg2_png,mapredbagicom_png,maplight2_png,taskBtn_png,txtbg_blue_png,txtbg_orange_png,txtbg_purple_png,mapredbagicom2_png,iconnow_png,arrow_png",
+			"keys": "宝箱_png,宝箱1_png,宝箱2_png,宝箱3_png,宝箱bg_png,宝箱btn_png,道具_png,关闭 拷贝_png,光 副本 4_png,设置_png,设置bg_png,声音_png,声音关闭_png,狮子_png,退出_png,问题_png,无星星_png,星星_png,星星bg_png,音乐_png,音乐关闭_png,有星星_png,有星星2_png,有星星3_png,元宝bg_png,ad_icon_png,animal1_png,avatar_png,friend_avatar_png,guideBox_png,guideLevel_png,guideLove_png,guideMoney_png,guideOver_png,icon_png,iconbg_png,icongray_png,invite_icon_png,invite_txtbg_png,lionMsgBg_png,map_signicon_png,map1_jpg,map2_jpg,map2+_png,map2+bg_png,map2红包大作战_png,map2热门引导_png,map2周一红包雨_png,map3_jpg,map大转盘_png,map刮现金红包_png,map今日可领_png,map明日可领_png,maphot_png,msgTri_png,namebg_png,progress1_png,progress2_png,recordbtn_png,taskicon_png,map2+bg2_png,mapredbagicom_png,maplight2_png,taskBtn_png,txtbg_blue_png,txtbg_orange_png,txtbg_purple_png,mapredbagicom2_png,iconnow_png,arrow_png,guide5_png",
 			"name": "map"
 		},
 		{
@@ -5332,6 +5332,11 @@
 			"url": "assets/common/nums4.fnt",
 			"type": "font",
 			"name": "nums4_fnt"
+		},
+		{
+			"url": "assets/map/guide5.png",
+			"type": "image",
+			"name": "guide5_png"
 		}
 	]
 }
\ No newline at end of file

egret/src/mapScene/GuideCon.ts

@@ -6,7 +6,7 @@ let cacheKey = "happyClear" + window["CFG"].consumerId;
 
 export const getCacheKey = () => {
     return cacheKey
-}
+};
 
 /**
  * 读取缓存
@@ -44,7 +44,7 @@ let arrow: eui.Group;
  *   \n
  */
 export class GuideCon extends egret.DisplayObjectContainer {
-    private steps: number = 4;
+    private steps: number = 5;
     private curStep: number = 1;
     groups: any[];
     couldOver: boolean = false;
@@ -64,7 +64,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
         bg.touchEnabled = true;
         this.addChild(bg);
 
-        var board = new egret.Bitmap(RES.getRes("lionMsgBg_png"))
+        var board = new egret.Bitmap(RES.getRes("lionMsgBg_png"));
         board.x = 143;
         board.y = 737;
         board.touchEnabled = true;
@@ -114,15 +114,18 @@ export class GuideCon extends egret.DisplayObjectContainer {
         this.groups.push(box);
         //两个图标，道具商城和我的奖励
         var gg = new egret.DisplayObjectContainer();
-        gg.addChild(new egret.Bitmap(RES.getRes("道具_png")));
-        var recordBtn = new egret.Bitmap(RES.getRes("recordbtn_png"));
-        recordBtn.x = 620.14 - 615.08;
-        recordBtn.y = 255.91 - 128.01;
-        gg.addChild(recordBtn);
+        gg.addChild(new egret.Bitmap(RES.getRes("guide5_png")));
+        // gg.addChild(new egret.Bitmap(RES.getRes("道具_png")));
+        gg.x = 16.5;
+        gg.y = 30.5;
+
+        // var recordBtn = new egret.Bitmap(RES.getRes("recordbtn_png"));
+        // recordBtn.x = 620.14 - 615.08;
+        // recordBtn.y = 255.91 - 128.01;
+        // gg.addChild(recordBtn);
+
         this.addChild(gg);
         this.groups.push(gg);
-        gg.x = 615.08;
-        gg.y = 128.01;
 
         //跳过提示
         var guideOver = new egret.Bitmap(RES.getRes("guideOver_png"));
@@ -134,7 +137,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
             clearTimeout(this.timeoutId);
             writeCache();
             if(this.callback) this.callback();
-        }, this)
+        }, this);
         this.addChild(guideOver);
 
         //箭头
@@ -163,7 +166,6 @@ export class GuideCon extends egret.DisplayObjectContainer {
                 .to({x: 0, y: -40}, 350, egret.Ease.quadInOut)
                 .to({x: 0, y: 0}, 350, egret.Ease.quadInOut);
 
-            // this.groups.push(arrowImg);
         }
 
 
@@ -173,23 +175,15 @@ export class GuideCon extends egret.DisplayObjectContainer {
         }
     }
 
-    // positions: number[][] = [
-    //     [338, 310, 180],
-    //     [530, 310, 180],
-    //     [369, 380, 0],
-    //     [743, 310, 180],
-    //     [440, 350, -90],
-    // ];
-
     positions: number[][] = [
-        [283, 190, 180],
-        [473, 190, 180],
+        [285, 190, 180],
+        [475, 190, 180],
         [445, 500, 0],
-        [675, 190, 180],
-        [440, 350, -90],
+        [672, 190, 180],
+        [100, 210, 180],
     ];
     words: string[] = [
-        "这里是体力值，闯关失败会\n扣除1体力值，闯关成功不扣\n除哦~",
+        "这里是体力值，闯关失败会\n扣除1体力值，闯关成功不\n扣除哦~",
         "这里是元宝，闯关成功后可\n随机获得大量元宝，元宝可\n用于兑换体力值和游戏道具",
         "在这里选择查看关卡，闯关\n成功后还有机会赢得丰厚奖\n励哟！",
         "每个关卡收集的星星可用于\n开启宝箱，宝箱里还有更多\n无敌券、品牌券在等你！",
@@ -228,11 +222,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
 
     private toggleVisible(step: number) {
         for(var i = 0; i < this.groups.length; i++) {
-            if(i + 1 == step) {
-                this.groups[i].visible = true;
-            } else {
-                this.groups[i].visible = false
-            }
+            this.groups[i].visible = i + 1 == step;
         }
     }