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

egret/resource/skins/MapTopSkin.exml

@@ -6,8 +6,8 @@
 		<e:BitmapLabel width="76" x="12" y="18.69" text="1" font="nums_fnt" textAlign="center"/>
 	</e:Group>
 	<e:Group id="icon1" x="455" y="691">
-		<e:Image source="icon_png" x="2.66" y="2.66"/>
-		<e:BitmapLabel width="76" x="12" y="18.69" text="2" font="nums_fnt" textAlign="center"/>
+		<e:Image source="icon_png" x="0" y="0"/>
+		<e:BitmapLabel width="76" y="16.69" text="2" font="nums_fnt" textAlign="center" x="13"/>
 	</e:Group>
 	<e:Group x="321.67" y="751.66" id="icon2">
 		<e:Image source="icon_png" x="0" y="0"/>

egret/src/mapScene/GuideCon.ts

@@ -61,7 +61,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
 
         var board = new egret.Bitmap(RES.getRes("lionMsgBg_png"))
         board.x = 30;
-        board.y = 570;
+        board.y = 620;
         board.touchEnabled = true;
         board.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             if (this.couldOver) {
@@ -79,7 +79,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
         this.addChild(tri);
         this.showWord = new ShowWord();
         this.showWord.x = 315;
-        this.showWord.y = 692;
+        this.showWord.y = 742;
         this.addChild(this.showWord);
 
         this.groups = [];

egret/src/mapScene/MapScene.ts

@@ -225,10 +225,10 @@ export default class MapScene extends Scene {
             localStorage.setItem('taskCenter' + window['CFG'].consumerId, 'false');
 
             let res = DataManager.ins.getData('hc_redBombBaseInfo');
-            let _t = res.data.redBombSwitchTime;
+            let _t = res.data.redBombSwitchTime || "";
             if(res.data.remain > 0) {
                 let showBomb = localStorage.getItem('showBomb' + window['CFG'].consumerId);
-                if(showBomb != _t.toString()) {
+                if(showBomb != _t.toString() && _t != "") {
                     localStorage.setItem('showBomb' + window['CFG'].consumerId, _t.toString());
                     panels.push('BombTips2Panel');
                 }

mock/happyclear/baseinfo.json

@@ -2,7 +2,7 @@
     "code":"0000000000",
     "data":{
         "remain": 7,
-        "redBombSwitchTime": 77798963487234
+        "redBombSwitchTime": "77798963487234"
     },
     "desc":"OK",
     "success":true,