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

egret/src/mapScene/AdSmallComp.ts

@@ -7,7 +7,7 @@ import wait from "../../libs/new_tc/wait";
 export default class AdSmallComp extends ComponentBase {
 
     start(data?) {
-        this.visible=false;
+        this.visible = false;
         let result;
         // this.touchEnabled = this.touchChildren = false;
         super.start(data);
@@ -28,10 +28,10 @@ export default class AdSmallComp extends ComponentBase {
         });
 
         this['img'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
-            if(data.logid)
+            if (data.logid)
                 NetManager.ins.clickLog(getlogItem(data.logid));
-            wait(50).then(()=>{
-                window.location.href = result.url;
+            wait(50).then(() => {
+                if (result.url != 0) window.location.href = result.url;
             });
         }, this);
     }

egret/src/mapScene/MapScene.ts

@@ -735,6 +735,7 @@ export default class MapScene extends Scene {
             this['adBtn'].source = result.img;
             this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
                 NetManager.ins.clickLog(getlogItem(32));
+                if(result.url!=0)
                     window.location.href = result.url;
             }, this);
         }

egret/src/something/uis/GameGuide.ts

@@ -281,7 +281,8 @@ const chapterFuns = {
             [63, 72],
         ],
         msg: [
-            "将两个特效互相拖动即可直\n接触发组合特效，组合特效的效\n果视组合的两个特效类型而定"
+            "拖动两个特效即可触发\n组合特效"
+            // "将两个特效互相拖动即可直\n接触发组合特效，组合特效的效\n果视组合的两个特效类型而定"
             // "五个相同动物形成一字型即可合成魔力花特效",
             // "拖动魔力花特效即可直接触发"
         ]