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

egret/src/SAUP_sendLogData.ts

@@ -9,6 +9,7 @@ export default ([sapmodid, eleid], saData = {}) => {
     try {
         elem.setAttribute('sa-data', JSON.stringify(saData));
         if (window['SAUP'] && window['SAUP'].sendLogData) {
+            console.log('发送埋点',sapmodid,eleid)
             window['SAUP'].sendLogData("click", {
                 tag: elem,   // 必传；如果需要传拓展的信息，在tag中加一个sa-data，将需要传的内容用json格式传到sa-data
                 sapmodid: sapmodid,    // 必传；区块编码

egret/src/mapScene/MapScene.ts

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

egret/src/something/anis/HoneyPotShootAni.ts

@@ -28,7 +28,7 @@ export class HoneyPotShootAni extends egret.DisplayObjectContainer {
         // this.shoot.rotation = rotation;
         egret.Tween.get(this)
             .set({ scaleX: 0, scaleY: 0 })
-            .to({ x: p[0], y: p[1], scaleX: 1, scaleY: 1 }, 700)
+            .to({ x: p[0], y: p[1], scaleX: 1, scaleY: 1 }, 700,egret.Ease.quadIn)
             .to({ scaleX: 1.2, scaleY: 1.2 }, 400)
             .to({ scaleX: 1, scaleY: 1 }, 200)
             .call(() => {

mock/happyclear/baseinfo.json

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