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

egret/src/mapScene/GuideCon.ts

@@ -85,14 +85,14 @@ export class GuideCon extends egret.DisplayObjectContainer {
         this.groups = [];
         //guideLove
         var guideLove = new egret.Bitmap(RES.getRes("guideLove_png"));
-        guideLove.x = 38.72;
-        guideLove.y = 23.5;
+        guideLove.x = 169;
+        guideLove.y = 15.83;
         this.addChild(guideLove);
         this.groups.push(guideLove);
         //guideMoney
         var guideMoney = new egret.Bitmap(RES.getRes("guideMoney_png"));
-        guideMoney.x = 354;
-        guideMoney.y = 24.34;
+        guideMoney.x = 356;
+        guideMoney.y = 15.31;
         this.addChild(guideMoney);
         this.groups.push(guideMoney);
         //关卡
@@ -103,20 +103,21 @@ export class GuideCon extends egret.DisplayObjectContainer {
         this.groups.push(guideLevel);
         //宝箱
         var box = new egret.Bitmap(RES.getRes("guideBox_png"));
-        box.x = 20.61;
-        box.y = 136.24;
+        box.x = 515;
+        box.y = 12.83;
         this.addChild(box);
         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.y = 304.4 - 154;
+        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;
-        gg.y = 154;
+        gg.x = 615.08;
+        gg.y = 128.01;
 
         //跳过提示
         var guideOver = new egret.Bitmap(RES.getRes("guideOver_png"));
@@ -152,11 +153,11 @@ export class GuideCon extends egret.DisplayObjectContainer {
     }
 
     positions: number[][] = [
-        [245, 290, 180],
-        [570, 290, 180],
+        [350, 280, 180],
+        [550, 280, 180],
         [260, 280, 0],
-        [255, 430, 180],
-        [440, 390, -90],
+        [710, 280, 180],
+        [440, 350, -90],
     ]
     words: string[] = [
         "这里是体力值，闯关失败会\n扣除1体力值，闯关成功不扣\n除哦~",