Merge branch '225' into dev

egret/src/mapScene/MapScene.ts

@@ -450,7 +450,9 @@ export default class MapScene extends Scene {
             //         this['guide'].visible = false;
             //         return;
             //     }
-            this['guide'].visible = true;
+            if(this['actsShowBtn'].visible)
+                this['guide'].visible = true;
+
             // });
         }
     };

mock/happyclear/baseinfo.json

@@ -5,6 +5,6 @@
         "redBombSwitchTime": "77798963487234"
     },
     "desc":"OK",
-    "success":true,
+    "success":false,
     "timestamp":1572923489898
 }
\ No newline at end of file