增加星云打点

assets/script/before/GamePlay.ts

@@ -1044,6 +1044,9 @@ export default class GamePlay extends cc.Component {
         GamePlay.Inst.ifGetPass = false;
 
         let levelNum = gData.gameData.getProp(GameProp.levelNum);
+        if(levelNum == 0){
+            mk.data.sendXYEvent("firstlevel","完成第一关");
+        }
         mk.console.log("[Game]pass passLevelNum", levelNum);
         GamePlay.Inst.ifGetPass = true;
         gData.gameData.setProp(GameProp.levelNum, ++levelNum);

assets/script/game/data/AdData.ts

@@ -1,4 +1,5 @@
 import { Data } from "../../mk/data/Data";
+import { GameProp } from "./GameData";
 
 /**
  * @description 广告数据
@@ -35,9 +36,10 @@ export class AdData {
         return this._watchNumToday;
     }
 
-    private adMap: Map<number, Data>;
+    private adMap: Map<number, Data>
 
     public init() {
+        this.adMap = new Map<number, Data>();
         this.adMap.set(AdFun.bubble, gData.reward)
         this.adMap.set(AdFun.checkpoint, gData.reward)
         this.adMap.set(AdFun.settlement, gData.reward)
@@ -113,6 +115,11 @@ export class AdData {
         if (response.errcode != 0) {
             return;
         }
+        let times = gData.gameData.getProp(GameProp.videoTimes);
+        gData.gameData.setProp(GameProp.videoTimes, times++);
+        if (times < 5) {
+            mk.data.sendXYEvent("ad_" + times, "第" + times + "次看视频");
+        }
 
         let curData = this.adMap.get(this.ad_subType)
         if (curData) {

assets/script/game/data/GameData.ts

@@ -215,6 +215,10 @@ export enum GameProp {
     isAutoOpenPanel = 3,
     /** 关闭常规提现时需要自动开存钱罐 每天一次 表示今日有没有开过 */
     isOpenBankOnCloseCash = 4,
+    //看视频次数
+    videoTimes = 5,
+    //提现次数
+    cashTimes = 6,
 
     /** ------------------ 游戏核心数据 --------------------------- */
     /** 关卡数 */

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

assets/script/game/data/LoginData.ts

@@ -46,6 +46,9 @@ export class LoginData {
             this.rule_data = result.json.server;
             this.privacy_data = result.json.privacy;
             this.loadResCompelete = true;
+            if(CC_DEBUG){
+                gData.appData.getDeviceInfoCompelete = true;
+            }
         }
 
     }

assets/script/game/module/login/Login.ts

@@ -53,9 +53,9 @@ export default class Login extends cc.Component {
                 gData.appData.getDeviceInfoCompelete = false;
             }
             else if (gData.gameData.dataFinish) {//登录流程完毕
-                if (mk.storage.getStorage("agreementTip",false) != 1) {
+                if (mk.storage.getStorage("agreementTip", false) != 1) {
                     mk.ui.openPanel("module/login/agreementTip");
-                    mk.storage.setStorage("agreementTip",1,false);
+                    mk.storage.setStorage("agreementTip", 1, false);
                 }
                 else {
                     mk.ui.openPanel("game/prefab/game");
@@ -135,12 +135,16 @@ export default class Login extends cc.Component {
 
     //发送请求整包更新
     public async getForceVersionInfo() {
+        if(CC_DEBUG){
+            gData.appData.tfChannel = "1";
+            gData.appData.appVersion = "1.0.0";
+        }
         let data: any = {
             appId: gData.appData.appId,
             channel: gData.appData.tfChannel,
             version: gData.appData.appVersion
         }
-          
+
         let response = await mk.http.sendRequest("getForceVersionInfo", 'POST', JSON.stringify(data), false, false)
         if (response.data) {
             gData.appData.needForceUpdate = response.data.isForceUpdate;

assets/script/game/module/redBagCash/RedBagCashItem.ts

@@ -1,4 +1,4 @@
-import { DataEventId, RewardState } from "../../data/GameData";
+import { DataEventId, GameProp, RewardState } from "../../data/GameData";
 import { CDataType } from "../../data/module/RedBagCashData";
 
 const { ccclass, property } = cc._decorator;
@@ -86,6 +86,11 @@ export default class RedBagCashItem extends cc.Component {
             return;
         }
         mk.data.sendDataEvent(DataEventId.commonWithDrawal,"常规提现-红包币提现成功");
+        let times = gData.gameData.getProp(GameProp.cashTimes);
+        gData.gameData.setProp(GameProp.cashTimes, times++);
+        if (times < 4) {
+            mk.data.sendXYEvent("cash_" + times, "第" + times + "次提现");
+        }
         gData.redBagCash.cashOP();
     }
 

assets/script/game/module/reward/Reward.ts

@@ -244,6 +244,9 @@ export default class Reward extends cc.Component {
         cc.log('获取奖励：', gData.reward.data);
         gData.reward.flyCoinAnim();
         this.onClickClose();
+        if(gData.gameData.getProp(GameProp.videoTimes) == 0){
+            mk.data.sendXYEvent("guide_receive","新手引导领取2500红包币");
+        }
     }
 
     /**

assets/script/mk/system/DataSystem.ts

@@ -10,14 +10,34 @@ export default class DataSystem {
     }
 
     /**
-     * 发生数据事件
+     * 数数打点
      * @param eventId 事件Id
      * @param des     事件内容
      */
     public sendDataEvent(eventId: string, des: string) {
-        console.log("===[DataSystem",eventId,des);
+        console.log("===[DataSystem", eventId, des);
         if (eventId && des) {
             JsbSystem.sendEvent(eventId, des);
         }
     }
+
+    /**
+     * 星云打点
+     */
+    public sendXYEvent(eventId: string, des: string) {
+        if (eventId && des) {
+            let data = {
+                "uin": gData.loginData.uin,
+                "isFirstDay": gData.gameData.gameData.loginDays == 1 ? 1 : 0,
+                "umengChannel": gData.appData.umengChannel,
+                "deviceType": gData.appData.deviceType,
+                "androidVerison": gData.appData.androidVersion,
+                "version": gData.appData.appVersion,
+                "point": eventId,
+                "description": des,
+                "tfChannel": gData.appData.tfChannel
+            }
+            mk.http.sendData('cp', data);
+        }
+    }
 }

assets/script/mk/system/GuideSystem.ts

@@ -36,6 +36,7 @@ export default class GuideSystem {
         let guide = gData.guideData.getGuidesByID(id);
         if (guide == null) {
             id = 9999;
+            mk.data.sendXYEvent("guide_end","新手引导结束");
         }
        
         gData.gameData.setProp(GameProp.guideID, id);
@@ -50,7 +51,7 @@ export default class GuideSystem {
      * @returns true 已完成
      */
     public isGuideComplete(): boolean {
-        if (!this.crtGuideID || this.crtGuideID === 999) {
+        if (!this.crtGuideID || this.crtGuideID === 9999) {
             return true;
         } else {
             return false;

build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -1816,7 +1816,7 @@ Object.defineProperty(n, "__esModule", {
 value: !0
 });
 n.AdFun = n.AdData = void 0;
-var a = function() {
+var a, r = t("./GameData"), c = function() {
 function t() {
 this.placementId = "";
 this.adunit_format = "";
@@ -1844,7 +1844,13 @@ enumerable: !1,
 configurable: !0
 });
 t.prototype.init = function() {
-this.datas = [ , gData.reward, gData.reward, gData.reward, gData.turnable, gData.sign, gData.blessingBag ];
+this.adMap = new Map();
+this.adMap.set(a.bubble, gData.reward);
+this.adMap.set(a.checkpoint, gData.reward);
+this.adMap.set(a.settlement, gData.reward);
+this.adMap.set(a.turntable, gData.turnable);
+this.adMap.set(a.sign, gData.sign);
+this.adMap.set(a.bigCash, gData.blessingBag);
 };
 t.prototype.checkAdMax = function() {
 this.watchNumToday++;
@@ -1873,9 +1879,9 @@ this.ecpm_level = e.ecpm_level;
 };
 t.prototype.watchVideo = function(t) {
 return o(this, void 0, void 0, function() {
-var e, n;
-return i(this, function(o) {
-switch (o.label) {
+var e, n, o, a;
+return i(this, function(i) {
+switch (i.label) {
 case 0:
 this.ad_subType = t;
 e = {
@@ -1906,8 +1912,11 @@ mk.console.logSingle("updateVideoData:", e);
 return [ 4, mk.http.sendData("updateVideo", e) ];
 
 case 1:
-if (0 != (n = o.sent()).errcode) return [ 2 ];
-this.datas[this.ad_subType] && this.datas[this.ad_subType].setAdData(n.data);
+if (0 != (n = i.sent()).errcode) return [ 2 ];
+o = gData.gameData.getProp(r.GameProp.videoTimes);
+gData.gameData.setProp(r.GameProp.videoTimes, o++);
+o < 5 && mk.data.sendXYEvent("ad_" + o, "第" + o + "次看视频");
+(a = this.adMap.get(this.ad_subType)) && a.setAdData(n.data);
 return [ 2 ];
 }
 });
@@ -1915,7 +1924,7 @@ return [ 2 ];
 };
 return t;
 }();
-n.AdData = a;
+n.AdData = c;
 (function(t) {
 t[t.bubble = 1] = "bubble";
 t[t.checkpoint = 2] = "checkpoint";
@@ -1923,9 +1932,11 @@ t[t.settlement = 3] = "settlement";
 t[t.turntable = 4] = "turntable";
 t[t.sign = 5] = "sign";
 t[t.bigCash = 6] = "bigCash";
-})(n.AdFun || (n.AdFun = {}));
+})(a = n.AdFun || (n.AdFun = {}));
 cc._RF.pop();
-}, {} ],
+}, {
+"./GameData": "GameData"
+} ],
 AdSystem: [ function(t, e, n) {
 "use strict";
 cc._RF.push(e, "1466aRVSRRPbZv+MJLJVOZg", "AdSystem");
@@ -5536,6 +5547,22 @@ t.prototype.sendDataEvent = function(t, e) {
 console.log("===[DataSystem", t, e);
 t && e && o.default.sendEvent(t, e);
 };
+t.prototype.sendXYEvent = function(t, e) {
+if (t && e) {
+var n = {
+uin: gData.loginData.uin,
+isFirstDay: 1 == gData.gameData.gameData.loginDays ? 1 : 0,
+umengChannel: gData.appData.umengChannel,
+deviceType: gData.appData.deviceType,
+androidVerison: gData.appData.androidVersion,
+version: gData.appData.appVersion,
+point: t,
+description: e,
+tfChannel: gData.appData.tfChannel
+};
+mk.http.sendData("cp", n);
+}
+};
 return t;
 }();
 n.default = i;
@@ -7542,6 +7569,8 @@ t[t.newPlayer = 1] = "newPlayer";
 t[t.guideID = 2] = "guideID";
 t[t.isAutoOpenPanel = 3] = "isAutoOpenPanel";
 t[t.isOpenBankOnCloseCash = 4] = "isOpenBankOnCloseCash";
+t[t.videoTimes = 5] = "videoTimes";
+t[t.cashTimes = 6] = "cashTimes";
 t[t.levelNum = 10] = "levelNum";
 t[t.hammerPropNum = 1001] = "hammerPropNum";
 t[t.resetPropNum = 1002] = "resetPropNum";
@@ -8040,7 +8069,7 @@ mk.ad.destroyNativeAd();
 mk.ui.closePanel(this.node.name);
 };
 e.prototype.onClickBackBtn = function() {
-r.default.Inst.restart(!1);
+r.default.Inst.restart();
 r.default.Inst.node.active = !1;
 mk.ad.destroyNativeAd();
 mk.ui.closePanel(this.node.name);
@@ -8483,7 +8512,7 @@ return r;
 };
 e.prototype.onWxAuthBack = function() {
 if (this.node.active) {
-this.restart(!1);
+this.restart();
 mk.ui.getCurOnPanel("RedPacketUI") && mk.ui.closePanel("RedPacketUI");
 }
 this.initLevel();
@@ -8624,6 +8653,7 @@ mk.data.sendDataEvent(y.DataEventId.level, "关卡通关");
 this.ifPass = !0;
 n.Inst.ifGetPass = !1;
 var t = gData.gameData.getProp(y.GameProp.levelNum);
+0 == t && mk.data.sendXYEvent("firstlevel", "完成第一关");
 mk.console.log("[Game]pass passLevelNum", t);
 n.Inst.ifGetPass = !0;
 gData.gameData.setProp(y.GameProp.levelNum, ++t);
@@ -9728,14 +9758,17 @@ this.setGuideID(this.crtGuideID++);
 }
 };
 t.prototype.setGuideID = function(t) {
-null == gData.guideData.getGuidesByID(t) && (t = 9999);
+if (null == gData.guideData.getGuidesByID(t)) {
+t = 9999;
+mk.data.sendXYEvent("guide_end", "新手引导结束");
+}
 gData.gameData.setProp(o.GameProp.guideID, t);
 };
 t.prototype.close = function() {
 this.crtGuideID++;
 };
 t.prototype.isGuideComplete = function() {
-return !this.crtGuideID || 999 === this.crtGuideID;
+return !this.crtGuideID || 9999 === this.crtGuideID;
 };
 t.prototype.isGuiding = function() {
 return null != mk.ui.getCurOnPanel("guide");
@@ -10597,7 +10630,7 @@ value: !0
 n.ServerUrl = n.HttpData = void 0;
 var o, i = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -11784,11 +11817,11 @@ l.default.getWxAppId();
 l.default.checkPermission();
 console.log("appversion   ", gData.appData.appVersion);
 gData.loginData.init();
-this.checkRemoveLocalHot();
 return [ 4, this.checkForceUpate() ];
 
 case 1:
 t.sent();
+this.checkRemoveLocalHot();
 mk.audio.init();
 return [ 2 ];
 }
@@ -15264,6 +15297,9 @@ this.node_unlock.active = !0;
 e.prototype.clickCashOP = function() {
 if (this.item_data.index > gData.redBagCash.cash_bar + 1) mk.tip.pop("请按顺序提现"); else {
 mk.data.sendDataEvent(s.DataEventId.commonWithDrawal, "常规提现-红包币提现成功");
+var t = gData.gameData.getProp(s.GameProp.cashTimes);
+gData.gameData.setProp(s.GameProp.cashTimes, t++);
+t < 4 && mk.data.sendXYEvent("cash_" + t, "第" + t + "次提现");
 gData.redBagCash.cashOP();
 }
 };
@@ -15370,10 +15406,12 @@ mk.tween.move(o, .6, n, a, null, "backOut");
 }, i = this, a = 0; a < e; a++) o(a);
 };
 e.prototype.initMoney = function() {
-this.lbl_redbag.string = "" + gData.gameData.gameData.redMoney;
-var t = gData.gameData.gameData.redMoney / 1e4;
-t = t > 1 ? Math.floor(t) : parseFloat(t.toFixed(2));
-this.lbl_rmb.string = "" + t;
+var t = gData.gameData.gameData.redMoney;
+t = parseFloat(t.toFixed(2));
+this.lbl_redbag.string = "" + t;
+var e = gData.gameData.gameData.redMoney / 1e4;
+e = e > 1 ? Math.floor(e) : parseFloat(e.toFixed(2));
+this.lbl_rmb.string = "" + e;
 };
 e.prototype.onDestroy = function() {
 if (!gData.gameData.getProp(c.GameProp.isOpenBankOnCloseCash)) {
@@ -16707,6 +16745,7 @@ e.prototype.clickGetReward = function() {
 cc.log("获取奖励：", gData.reward.data);
 gData.reward.flyCoinAnim();
 this.onClickClose();
+0 == gData.gameData.getProp(p.GameProp.videoTimes) && mk.data.sendXYEvent("guide_receive", "新手引导领取2500红包币");
 };
 e.prototype.clickCashOut = function() {
 gData.reward.addReward();
@@ -16717,7 +16756,7 @@ e.prototype.clickNextMission = function() {
 l.default.Inst.nextLevel();
 };
 e.prototype.clickBack = function() {
-l.default.Inst.restart(!1);
+l.default.Inst.restart();
 l.default.Inst.node.active = !1;
 };
 e.prototype.onDestroy = function() {

packages-hot-update/cfg.json

@@ -8,7 +8,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
     ],
-    "buildTime": 1627436037916,
-    "genTime": 1627436037916,
+    "buildTime": 1627545184178,
+    "genTime": 1627545184178,
     "genVersion": null
 }