1

egret/src/H52Scene.ts

 import Scene from "../libs/new_wx/components/Scene";
 import Utils from "./Utils";
 import PanelCtrl from "../libs/new_wx/ctrls/panelCtrl";
+import { NetManager } from "../libs/tw/manager/NetManager";
+import { getlogItem } from "./Main";
 
 
 export default class H52Scene extends Scene {
 
     async start(data?) {
+        NetManager.ins.showLog(getlogItem(51));
         super.start();
         this['group'].y = (this.stage.stageHeight -1624)/2
         // this.height=this.stage.stageHeight;
@@ -13,6 +16,7 @@ export default class H52Scene extends Scene {
         //     PanelCtrl.instance.show('inviterule')
         // },this);
         this['gobtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
+            NetManager.ins.clickLog(getlogItem(51));
             const code = Utils.getRequestByKey('shareCode');
             window.location.href =  `${window['targetUrl']}&shareCode=${code}`
         },this);

egret/src/mapScene/AdSmallComp.ts

@@ -29,7 +29,7 @@ export default class AdSmallComp extends ComponentBase {
 
         this['img'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             if(data.logid)
-                NetManager.ins.showLog(getlogItem(data.logid));
+                NetManager.ins.clickLog(getlogItem(data.logid));
             wait(50).then(()=>{
                 window.location.href = result.url;
             });

egret/src/mapScene/MapScene.ts

@@ -73,6 +73,7 @@ export default class MapScene extends Scene {
                 }
                 if(!success) { return; }
                 showToast("帮刮成功！");
+                NetManager.ins.showLog(getlogItem(52));
                 NetManager.ins.showLog(getlogItem(36));
             }, _code);
         }
@@ -301,7 +302,7 @@ export default class MapScene extends Scene {
         if(mapAdvert == null)
             mapAdvert = {enable: false, advertList: []}
         this['adBtn'].visible = mapAdvert.enable;
-        if(this['adBtn']) {
+        if(this['adBtn'].visible) {
             NetManager.ins.showLog(getlogItem(32));
         }
         if(mapAdvert.enable) {

egret/src/mapScene/icon/ScratchIcon.ts

@@ -8,12 +8,14 @@ import { loadSvga } from "../../loadSvga";
 import getResPath from "../../../libs/new_tc/getResPath";
 import Utils from "../../Utils";
 import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
+import { getlogItem } from "../../Main";
 
 export default class ScratchIcon extends IconBase {
     private cutTimer: CutTimer = null;
 
     constructor(name: string, group: eui.Group, btn: eui.Button, tipsBg?: eui.Image, tipsLabel?: eui.Label) {
         super(name, group, btn, tipsBg, tipsLabel);
+        NetManager.ins.showLog(getlogItem(49));
     }
 
     protected start() {
@@ -64,6 +66,7 @@ export default class ScratchIcon extends IconBase {
      */
     protected onTouchBtn(e: egret.TouchEvent) {
         super.onTouchBtn(e);
+        NetManager.ins.showLog(getlogItem(49));
         NetManager.ins.scratchGetTaskInfo((success, res) => {
             if(!success) {
                 return;

egret/src/mapScene/icon/TurntableIcon.ts

@@ -11,11 +11,11 @@ import { getlogItem } from "../../Main";
 export default class TurntableIcon extends IconBase {
     constructor(name: string, group: eui.Group, btn: eui.Button, tipsBg?: eui.Image, tipsLabel?: eui.Label) {
         super(name, group, btn, tipsBg, tipsLabel);
+        NetManager.ins.showLog(getlogItem(43));
     }
 
     protected start() {
         super.start();
-        NetManager.ins.showLog(getlogItem(43));
         //有免费次数
         //没有免费次数
         //如果元宝足够
@@ -23,8 +23,8 @@ export default class TurntableIcon extends IconBase {
     }
 
     updateIcon(){
-        NetManager.ins.clickLog(getlogItem(43));
         NetManager.ins.hc_turnableBaseInfo((success, res)=>{
+            NetManager.ins.clickLog(getlogItem(43));
             if(!success){
                 this.visible = false;
                 return;

egret/src/panels/BagPanel.ts

@@ -32,14 +32,14 @@ export default class BagPanel extends Panel {
         this['btn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             this['group1'].visible = true;
             this['group2'].visible = false;
-            NetManager.ins.clickLog(getlogItem(39));
+            NetManager.ins.showLog(getlogItem(39));
         }, this);
         this['recordbtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             window.location.href = window['__link__'];
         }, this);
         this['shopbtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             PanelCtrl.instance.show('Shop');
-            NetManager.ins.showLog(getlogItem(39));
+            NetManager.ins.clickLog(getlogItem(39));
         }, this);
 
         this.list.itemRenderer=BagItemRenderer;

egret/src/panels/InvitePrizePanel.ts

@@ -23,7 +23,7 @@ export default class InvitePrizePanel extends Panel {
 
     start() {
         super.start();
-        NetManager.ins.showLog(getlogItem(38));
+        NetManager.ins.showLog(getlogItem(37));
     }
 
     protected onSkinComplete() {
@@ -60,7 +60,7 @@ export default class InvitePrizePanel extends Panel {
     }
 
     onTapGoPrize() {
-        NetManager.ins.showLog(getlogItem(37));
+        NetManager.ins.clickLog(getlogItem(37));
         window.location.href = window['__link__'];
     }
 

egret/src/panels/ScratchPanel.ts

@@ -7,6 +7,7 @@ import ScratchRulePanel from "./ScratchRulePanel";
 import CutTimer from "../CutTimer";
 import Utils from "../Utils";
 import { DataManager } from "../../libs/tw/manager/DataManager";
+import { getlogItem } from "../Main";
 
 export default class ScratchPanel extends Panel {
     private cutTimer: CutTimer;
@@ -42,7 +43,7 @@ export default class ScratchPanel extends Panel {
     }
 
     showlog() {
-
+        NetManager.ins.showLog(getlogItem(50));
     }
 
     initEvents() {
@@ -221,6 +222,7 @@ class ScratchItem extends eui.ItemRenderer {
         let s = this.data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png";
         this.img.source = this.data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png";
         this.img.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            NetManager.ins.clickLog(getlogItem(50));
             NetManager.ins.scratchGetShareCode((success, res) => {
                 if(!success) {
                     return;

egret/src/panels/ScratchPrizePanel.ts

@@ -24,6 +24,7 @@ export default class ScratchPrizePanel extends Panel {
     start() {
         super.start();
         this.initUI();
+        NetManager.ins.showLog(getlogItem(53));
         NetManager.ins.showLog(getlogItem(54));
     }
 
@@ -51,6 +52,7 @@ export default class ScratchPrizePanel extends Panel {
                 super.onTouchTap_closeBtn();
                 break;
             case (e.target == this.ok_btn):     // 去领奖
+                NetManager.ins.clickLog(getlogItem(53));    
                 window.location.href = window['__link__'];
                 break;
             case (e.target == this.game_btn):   // 继续闯关

mock/happyclear/advert.json

 {
     "code": "0000000000",
     "data": {
-        "mapAdvert": {
+        "mapAdvert1": {
             "enable": true,
             "advertList": [
                 {
@@ -10,7 +10,7 @@
                 }
             ]
         },
-        "noticeAdvert": {
+        "noticeA1dvert": {
             "enable": true,
             "advertList": [
                 {
@@ -19,7 +19,7 @@
                 }
             ]
         },
-        "popupAdvert": { "enable": true,
+        "popupAd1vert": { "enable": true,
             "advertList": [
                 {
                     "img": "//yun.duiba.com.cn/images/201910/zqtdp6xibw.jpg",

mock/happyclear/getBackReward.json

@@ -16,6 +16,6 @@
         "value":"虚拟商品标识符"
     },
     "desc":"OK",
-    "success":true,
+    "success":0,
     "timestamp":1572079274940
 }
\ No newline at end of file

mock/happyclear/getInviteInfo.json

-{
-    "success": true,
+{"success":true,"code":"0000000000","desc":"OK","timestamp":1572403459420,"data":{"invitationId":null,"invitationCount":1,"sysTime":1572403459405,"endTime":1572489858000,"completeFlag":0,"openPrizMsg":null,"prizeType":"7","prizeName":null,"prizeImg":"//yun.dui88.com/images/201910/s0yhv1nlil.jpeg","facePrice":"3651404_286462788044574721","invitationUser":[]}}
\ No newline at end of file
-    "code": "0000000000",
-    "desc": "OK",
-    "timestamp": 1572249599076,
-    "data": {
-        "invitationId": null,
-        "invitationCount": null,
-        "sysTime": null,
-        "endTime": null,
-        "completeFlag": 6,
-        "openPrizMsg": null,
-        "prizeType": null,
-        "prizeName": null,
-        "prizeImg": null,
-        "facePrice": null,
-        "invitationUser": null
-    }
-}
\ No newline at end of file

mock/happyclear/home.json

@@ -22,9 +22,9 @@
                 "num": 3
             }
         ],
-        "remainEnargy": 1,
+        "remainEnargy": 5,
         "askForEnergy":false,
-        "canReceiveTreasureBoxNum": 0,
+        "canReceiveTreasureBoxNum": 10,
         "nextRangeStarsNum": 0,
         "isGetAllTreasureBox": true,
         "refectionCountdown": 1685