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

egret/index.html

@@ -60,7 +60,7 @@
 <script src="libs/fileSave.js"></script>
 <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/>
 <script>
-    window['hbRainTime'] = 30;
+    window['hbRainTime'] = 30;  // 红包雨倒计时
     window['plugs'] = [1, 2, 3]
     // localStorage.clear();
     window['isInvitePage'] = 0;

egret/src/mapScene/icon/HbRainIcon.ts

@@ -2,6 +2,7 @@ import IconBase from "./IconBase";
 import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
 import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
+import { getlogItem } from "../../Main";
 
 export default class HbRainIcon extends IconBase {
 
@@ -30,6 +31,9 @@ export default class HbRainIcon extends IconBase {
             }
             this.visible = true;
         })
+        if(this.visible){
+            NetManager.ins.showLog(getlogItem(57));
+        }
     }
 
     /**
@@ -38,7 +42,7 @@ export default class HbRainIcon extends IconBase {
      */
     protected onTouchBtn(e: egret.TouchEvent) {
         super.onTouchBtn(e);
-
+        NetManager.ins.clickLog(getlogItem(57));
         NetManager.ins.hbRainBaseInfo((success, res) => {
             PanelCtrl.instance.show("HbCutTime", {res: res});
         });

egret/src/panels/HongbaoRain/HbCutTime.ts

@@ -3,6 +3,7 @@ import CutTimer from "../../CutTimer";
 import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
 import { NetManager } from "../../../libs/tw/manager/NetManager";
 import HbRule from "./HbRule";
+import { getlogItem } from "../../Main";
 
 /**
  * 红包雨倒计时
@@ -50,6 +51,7 @@ export default class HbCutTime extends Panel {
             time = data.currentSession.endTime - sysTime + 3000;
             if(data.canJoin) {
                 this.ok_btn.source = 'hbCutTime_btn_enable_png';
+                NetManager.ins.showLog(getlogItem(59));
                 this.btnEffect();
                 this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
             } else {
@@ -128,6 +130,7 @@ export default class HbCutTime extends Panel {
     }
 
     onTouchOK() {
+        NetManager.ins.clickLog(getlogItem(59));
         PanelCtrl.instance.show('HbGame', {needScore: this.data.res.data.currentSession.limitScore});
     }
 

egret/src/panels/HongbaoRain/HbNoPrize.ts

@@ -6,6 +6,8 @@ import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
 import { addAdComp } from "../BoxPanel";
 import Utils from "../../Utils";
 import CutTimer from "../../CutTimer";
+import { NetManager } from "../../../libs/tw/manager/NetManager";
+import { getlogItem } from "../../Main";
 
 /**
  * 红包雨无奖励
@@ -26,6 +28,7 @@ export default class HbNoPrize extends Panel {
     }
 
     initUI() {
+        NetManager.ins.showLog(getlogItem(61));
         let type = this.data.type;
         switch(true) {
             case (type == 1):
@@ -62,6 +65,7 @@ export default class HbNoPrize extends Panel {
     }
 
     onTouchOK() {
+        NetManager.ins.clickLog(getlogItem(61));
         if((getHomeData().levels.length + 1) > window['last_level']) {
             changeMapScene();
             super.hidePanel();

egret/src/panels/HongbaoRain/HbPrize.ts

@@ -4,6 +4,8 @@ import { changeMapScene } from "../../startScene/StartScene";
 import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
 import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
 import { HtmlTextParser } from "../../../libs/new_wx/HtmlTextParser";
+import { getlogItem } from "../../Main";
+import { NetManager } from "../../../libs/tw/manager/NetManager";
 
 /**
  * 红包雨奖励
@@ -57,6 +59,7 @@ export default class HbPrize extends Panel {
     }
 
     initUI() {
+        NetManager.ins.showLog(getlogItem(60));
 
     }
 
@@ -76,6 +79,7 @@ export default class HbPrize extends Panel {
     }
 
     onTouchOK() {
+        NetManager.ins.clickLog(getlogItem(60));
         if((getHomeData().levels.length + 1) > window['last_level']) {
             changeMapScene();
             super.hidePanel();