修复红包插屏不弹出问题

增加人物属性埋点

assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/version.manifest"}

assets/resources/module/moreGame/moreGamePopNode.prefab

@@ -765,7 +765,7 @@
     "design_block_node": {
       "__id__": 2
     },
-    "bClickClose": true,
+    "bClickClose": false,
     "onComplete": [],
     "_id": ""
   },

assets/resources/module/reward/rewardLuck.prefab

@@ -27,6 +27,9 @@
     "_active": true,
     "_components": [
       {
+        "__id__": 127
+      },
+      {
         "__id__": 128
       },
       {
@@ -34,13 +37,10 @@
       },
       {
         "__id__": 130
-      },
-      {
-        "__id__": 131
       }
     ],
     "_prefab": {
-      "__id__": 132
+      "__id__": 131
     },
     "_opacity": 255,
     "_color": {
@@ -4352,11 +4352,11 @@
         "__id__": 123
       },
       {
-        "__id__": 126
+        "__id__": 125
       }
     ],
     "_prefab": {
-      "__id__": 127
+      "__id__": 126
     },
     "_opacity": 255,
     "_color": {
@@ -4452,9 +4452,6 @@
     "onComplete": [
       {
         "__id__": 124
-      },
-      {
-        "__id__": 125
       }
     ],
     "_id": ""
@@ -4466,16 +4463,6 @@
     },
     "component": "",
     "_componentId": "43f3akkA71HA76UhTj/R19X",
-    "handler": "onClickClose",
-    "customEventData": ""
-  },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "43f3akkA71HA76UhTj/R19X",
     "handler": "clickGetReward",
     "customEventData": ""
   },

assets/resources/module/setting/setting.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 93
       },
       {
-        "__id__": 91
+        "__id__": 94
       },
       {
-        "__id__": 92
+        "__id__": 95
       },
       {
-        "__id__": 93
+        "__id__": 96
       }
     ],
     "_prefab": {
-      "__id__": 94
+      "__id__": 97
     },
     "_opacity": 255,
     "_color": {
@@ -156,16 +156,19 @@
       },
       {
         "__id__": 85
+      },
+      {
+        "__id__": 88
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 91
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 92
     },
     "_opacity": 255,
     "_color": {
@@ -3199,6 +3202,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "labGroup",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 89
+      }
+    ],
+    "_prefab": {
+      "__id__": 90
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 182.25,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        175.59,
+        170.133,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 88
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "分组号：0",
+    "_N$string": "分组号：0",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "2f63e38a-f6a2-47c7-bb1d-2bc6a29d26bb"
+    },
+    "fileId": "53OEEqFR9GZZ1rQajvPW2R",
+    "sync": false
+  },
+  {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -3264,6 +3375,9 @@
     "lbl_version": {
       "__id__": 86
     },
+    "lbl_group": {
+      "__id__": 89
+    },
     "_id": ""
   },
   {

assets/script/Main.ts

@@ -3,7 +3,7 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class Main extends cc.Component {
     @property(cc.Node)
-    node_guide:cc.Node = null;
+    node_guide: cc.Node = null;
     start() {
         mk.ui.openPanel("module/login/login");
         mk.guide.ui = this.node_guide;

assets/script/before/GamePlay.ts

@@ -1066,7 +1066,8 @@ export default class GamePlay extends cc.Component {
 
     /**游戏结束 */
     gameOver() {
-        mk.ui.openPanel("game/prefab/uiPanel/GameOverUI")
+        mk.data.setTAEventUser(1, 'video_play_time', 1);
+        mk.ui.openPanel("game/prefab/uiPanel/GameOverUI");
     }
 
     checkBonusNum(cleanCellItemNum: number) {

assets/script/game/data/AdData.ts

@@ -216,7 +216,10 @@ export class AdData {
                 mk.storage.setStorage('popFullIndex', popFullIndex);
 
                 let index = popFullIndex % this.fullInterShowStr.length;
+                mk.console.log('checkShowFullInter  this.fullInterShowStr  ', this.fullInterShowStr);
+                mk.console.log('checkShowFullInter  index', index);
                 if (this.fullInterShowStr[index] == '1') {
+                    mk.console.log('checkShowFullInter showInterAd');
                     mk.ad.showInterAd(1);
                 }
             }

assets/script/game/data/GameData.ts

@@ -87,7 +87,7 @@ export class GameData {
         }
         this.adShowConfig = response.data;
         mk.console.logSingle("user/adShowConfig", response.data);
-        
+
         gData.adData.setFullInterShowStr();
 
         this.dataFinish = true;
@@ -120,7 +120,26 @@ export class GameData {
         this.gameData.userTuCaoInfo = res_data.userTuCaoInfo;
         this.gameData.versioncfg = res_data.versioncfg;
         this.gameData.isFirstRedMoney = res_data.isFirstRedMoney;
+        if (res_data.groupCode) {
+            this.gameData.groupCode = res_data.groupCode;
+        }
+        console.log('ABTest ', res_data.groupCode);
         gData.adData.watchNumToday = res_data.dayVideoTimesForRedMoney == null ? 0 : res_data.dayVideoTimesForRedMoney;
+
+        if (gData.loginData.isFirstIn) {
+            gData.loginData.isFirstIn = false;
+            mk.data.sendDataEvent('ABTest', `触发${this.gameData.groupCode}方案`);
+
+            //星云uid
+            mk.data.setTAEventUserStr(0, 'xy_uid', gData.loginData.uin);
+            //注册时版本号
+            mk.data.setTAEventUserStr(0, 'regtime_app_id', gData.appData.appVersion);
+        }
+
+        //当前版本号
+        mk.data.setTAEventUserStr(0, 'now_app_id', gData.appData.appVersion);
+        //渠道号
+        mk.data.setTAEventUserStr(0, 'channel_id', gData.appData.tfChannel);
     }
 
     /**
@@ -327,6 +346,8 @@ class PlayerProp {
         this._redMoney = value;
         gData.gameData.init_coin = true;
         gData.gameData.init_red_point = true;
+        //当前红包币
+        mk.data.setTAEventUser(0, 'red_money_num', this._redMoney);
     }
     get redMoney(): number {
         return this._redMoney;
@@ -358,6 +379,8 @@ class PlayerProp {
     changePropNum = 0;
     /** 能免费领红包 1 表示是新人第一次产出红包币，不用看视频*/
     isFirstRedMoney = 0;
+    /** ABTest分组id */
+    groupCode = 0;
 }
 
 /**

assets/script/game/data/LoginData.ts

@@ -23,7 +23,7 @@ export class LoginData {
 
     public loginTicket: string = '';
 
-    public isFirstIn: boolean;
+    public isFirstIn: boolean = false;
 
     public isNew: boolean;
 

assets/script/game/data/module/MoreGameData.ts

@@ -193,7 +193,7 @@ export class MoreGameData extends Data {
 
     /** 弹出互推红包弹窗 */
     popMoreGamePopNode() {
-        if (mk.guide.isGuiding || mk.ui.getCurOnPanel('reward')) {
+        if (mk.guide.isGuiding() || mk.ui.getCurOnPanel('reward')) {
             return;
         }
 

assets/script/game/module/cashPro/CashPro.ts

@@ -88,6 +88,10 @@ export default class CashPro extends cc.Component {
         mk.tween.move(this.cashPro, 0.3, cc.v2(1000, 0), cc.v2(0, 0), () => {
             gData.adData.checkShowFullInter(1);
         }, 'elasticIn');
+        //累计成功提现次数
+        mk.data.setTAEventUser(1, 'cash_time', 1);
+        //累计提现金额
+        mk.data.setTAEventUser(1, 'cash_total', this.money);
         this.labMoney.string = `¥${this.money}`
     }
 

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

@@ -161,8 +161,6 @@ export default class Login extends cc.Component {
     public async getForceVersionInfo() {
         if (CC_DEBUG) {
             //测试用配置版本号
-            gData.appData.appId = "wxcf31f0e54f7fefda";
-            gData.appData.version = "1.1.2";
             gData.appData.tfChannel = "1";
             gData.appData.appVersion = "1.2.0";
         }

assets/script/game/module/receiptNotice/ReceiptNotice.ts

@@ -9,19 +9,15 @@ const { ccclass, property } = cc._decorator;
 export default class ReceiptNotice extends cc.Component {
 
     @property({ displayName: 'lbl收款金额', type: cc.Label })
-    private lbl_receipt_rmb: cc.Label = null!;
+    private lbl_receipt_rmb: cc.Label = null;
     @property({ displayName: 'lbl累计提现', type: cc.Label })
-    private lbl_rmb_total: cc.Label = null!;
+    private lbl_rmb_total: cc.Label = null;
     @property({ displayName: 'lbl用户名', type: cc.Label })
-    private lbl_user_name: cc.Label = null!;
-
-
-    // onLoad() {
-
-    // }
+    private lbl_user_name: cc.Label = null;
 
     start() {
         mk.audio.playEffect("receiptNotice");
+
     }
 
     update(dt) {
@@ -39,5 +35,9 @@ export default class ReceiptNotice extends cc.Component {
         this.lbl_receipt_rmb.string = '￥' + (gData.receiptNotice.receip_rmb / 100).toFixed(2) + '元';
         this.lbl_rmb_total.string = '￥' + (gData.cashNormal.receip_total_rmb / 100).toFixed(2) + '元';
         this.lbl_user_name.string = gData.wechatData.nickName || '';
+        //累计成功提现次数
+        mk.data.setTAEventUser(1, 'cash_time', 1);
+        //累计提现金额
+        mk.data.setTAEventUser(1, 'cash_total', gData.receiptNotice.receip_rmb / 100);
     }
 }

assets/script/game/module/redCode/RedCode.ts

@@ -58,6 +58,11 @@ export default class RedCode extends cc.Component {
         this.labMoney.string = `${money.toFixed(2)}元`
         this.code = code
         this.labRedCode.string = `提现红包码：${this.code}`
+
+        //累计成功提现次数
+        mk.data.setTAEventUser(1, 'cash_time', 1);
+        //累计提现金额
+        mk.data.setTAEventUser(1, 'cash_total', money);
     }
 
     /** 点击复制公众号 */

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

@@ -285,7 +285,6 @@ export default class Reward extends cc.Component {
     }
 
     onClickClose() {
-        mk.ad.destoryBanner();
         //如果是关卡消除红包 关闭之后则清除
         if (gData.reward.subType == 2) {
             console.log("清除积分啦啦啦啦啦阿拉拉拉啦--------------------------------", GamePlay.Inst.ifPass)
@@ -311,5 +310,7 @@ export default class Reward extends cc.Component {
         if (!this.hasWatchVideo) {
             gData.adData.checkShowFullInter(2);
         }
+
+        mk.ad.destoryBanner();
     }
 }

assets/script/game/module/setting/Setting.ts

@@ -23,6 +23,8 @@ export default class Setting extends cc.Component {
     img_effect: cc.Sprite = null;
     @property({ type: cc.Label, displayName: "版本号" })
     lbl_version: cc.Label = null;
+    @property({ type: cc.Label, displayName: "分组号" })
+    lbl_group: cc.Label = null;
     // @property({ type: cc.Node, displayName: "协议内容" })
     node_rule: cc.Node = null;
 
@@ -51,7 +53,16 @@ export default class Setting extends cc.Component {
         this.img_head.spriteFrame = new cc.SpriteFrame(result);
         console.log("=== loadHead:", result);
 
-        // this.img_head.spriteFrame = result;
+        if (mk.console.ifShowLog) {
+            this.lbl_group.string = `分组号：${gData.gameData.gameData.groupCode}`;
+        }
+        else {
+            this.lbl_group.string = ``;
+        }
+
+        if (gData.gameData.funOpenData['6'] != '1') {
+            this.lbl_nickname.string = '';
+        }
     }
 
     clickCopy() {

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr.ts

@@ -21,7 +21,7 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
     /**Topon 信息流广告位 */
     public static topon_native_placementId = "b5f8fa77aa5262";
     /**Topon 全屏插屏广告位 */
-    public static topon_fullinter_placementId = "b5f8fa77aa5262";
+    public static topon_fullinter_placementId = "b6113813b876a1";
     /**Topon 全屏插屏广告位 */
     public static topon_banner_placementId = "b5f8fa77aa5262";
 
@@ -74,7 +74,9 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
         ATSDKMgr.topon_native_placementId = arr[5];
 
         ATSDKMgr.topon_banner_placementId = arr[7];
-        ATSDKMgr.topon_fullinter_placementId = arr[8];
+        if (arr[8]) {
+            ATSDKMgr.topon_fullinter_placementId = arr[8];
+        }
     }
 
     //激励视频广告------------------------------------------------------------------------------

assets/script/mk/system/AdSystem.ts

@@ -61,7 +61,6 @@ export default class AdSystem {
         else {
             if (cc.sys.platform != cc.sys.WECHAT_GAME) {
                 if (cc.sys.os == cc.sys.OS_ANDROID) {
-                    // jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "showVideo", "(I)V", pop);
                     this.adSdk.showVideo();
                 }
                 else if (cc.sys.os == cc.sys.OS_IOS) {
@@ -92,6 +91,8 @@ export default class AdSystem {
      */
     public wacthAdSuccess(placementId = '') {
         mk.console.log("=== wacthAdSuccess");
+        //累计视频次数
+        mk.data.setTAEventUser(1, 'video_time', 1);
         //广告过后，渲染会有问题，统一下一帧再处理逻辑
         mk.ui.scheduleOnce(() => {
             if (!gData.adData.checkAdMax()) {
@@ -110,7 +111,6 @@ export default class AdSystem {
 
         if (cc.sys.platform != cc.sys.WECHAT_GAME) {
             if (cc.sys.os == cc.sys.OS_ANDROID) {
-                // jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "showVideo", "(I)V", pop);
                 this.adSdk.showNative(type);
             }
             else if (cc.sys.os == cc.sys.OS_IOS) {
@@ -131,7 +131,6 @@ export default class AdSystem {
 
         if (cc.sys.platform != cc.sys.WECHAT_GAME) {
             if (cc.sys.os == cc.sys.OS_ANDROID) {
-                // jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "showVideo", "(I)V", pop);
                 this.adSdk.destroyNative();
             }
             else if (cc.sys.os == cc.sys.OS_IOS) {
@@ -167,9 +166,14 @@ export default class AdSystem {
     }
 
     public showBanner() {
+        if (CC_DEBUG) {
+            return;
+        }
+
         if (!this.ifShowAd) {
             return;
         }
+
         // console.log("===[AdSystem gameData.adShowConfig", gData.gameData.adShowConfig.is_show_banner);
         // if (gData.gameData.adShowConfig && gData.gameData.adShowConfig.is_show_banner == 1) {
         this.adSdk.showBanner();
@@ -177,9 +181,14 @@ export default class AdSystem {
     }
 
     public destoryBanner() {
+        if (CC_DEBUG) {
+            return;
+        }
+
         if (!this.ifShowAd) {
             return;
         }
+
         this.adSdk.destoryBanner();
     }
 
@@ -188,6 +197,10 @@ export default class AdSystem {
      * @param type 0 插屏 1 全屏
      */
     public showInterAd(type: number) {
+        if (CC_DEBUG) {
+            return;
+        }
+
         if (!this.ifShowAd) {
             return;
         }
@@ -205,10 +218,9 @@ export default class AdSystem {
         if (!gData.gameData.adShowConfig) {
             return;
         }
+
         let chance = gData.gameData.configs.ServerConfig.interOpenChance;
-        if (!chance) {
-            chance = 0.4;
-        }
+
         if (Math.random() <= chance) {
             this.showInterAd(0);
         }

assets/script/mk/system/DataSystem.ts

@@ -22,6 +22,26 @@ export default class DataSystem {
     }
 
     /**
+    * 设置人物属性
+    * @param type 0 set  1 add
+    * @param property 属性名
+    * @param value 浮点数值 
+    */
+    public setTAEventUser(type: number, property: string, value: number) {
+        JsbSystem.setTAEventUser(type, property, value);
+    }
+
+    /**
+    * 设置人物属性
+    * @param type 0 set  1 add
+    * @param property 属性名
+    * @param value 字符串数值 
+    */
+    public setTAEventUserStr(type: number, property: string, value: string) {
+        JsbSystem.setTAEventUserStr(type, property, value);
+    }
+
+    /**
      * 星云打点
      */
     public sendXYEvent(eventId: string, des: string) {

assets/script/mk/system/JsbSystem.ts

@@ -132,6 +132,11 @@ export default class JsbSystem {
             gData.appData.appId = unicodeArr[0];
             gData.appData.version = unicodeArr[1];
         }
+
+        if (CC_DEBUG) {
+            gData.appData.appId = "wxcf31f0e54f7fefda";
+            gData.appData.version = "1.1.2";
+        }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)
         // console.log('gData.appData.version  ', gData.appData.version)
@@ -315,6 +320,36 @@ export default class JsbSystem {
     }
 
     /**
+    * 设置人物属性
+    * @param type 0 set  1 add
+    * @param property 属性名
+    * @param value 数值
+    */
+    public static setTAEventUser(type: number, property: string, value: number) {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUser", "(ILjava/lang/String;F)V", type, property, value);
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+
+        }
+    }
+
+    /**
+    * 设置人物属性
+    * @param type 0 set  1 add
+    * @param property 属性名
+    * @param value 数值
+    */
+    public static setTAEventUserStr(type: number, property: string, value: string) {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUserStr", "(ILjava/lang/String;Ljava/lang/String;)V", type, property, value);
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+
+        }
+    }
+
+    /**
      * 微信授权
      * @description 微信SDK功能 CocosToJava
      */

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/version.manifest"}

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -13,4 +13,4 @@ PACKAGE_NAME=com.aries.qsllx.mz
 VERSION_NAME=1.0.2
 VERSION_CODE=2
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313,b6113813b876a1"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏插屏
-APP_CONFIG_CODE="1.1.1"
+APP_CONFIG_CODE="1.1.2"

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -146,6 +146,26 @@ public class ThirdSdkMgr {
         UMSDKMgr.getInstance()._UMSDKEvent(ThirdSdkMgr.appActivity, eventID, des);
     }
 
+    /**
+     * 设置人物属性
+     * @param type 0 set  1 add
+     * @param property 属性名
+     * @param value 数值
+     */
+    public static void setTAEventUser(int type, String property, float value){
+        TDSDKMgr.getInstance().setTAEventUser(type, property, value);
+    }
+
+    /**
+     * 设置人物属性
+     * @param type 0 set  1 add
+     * @param property 属性名
+     * @param value 数值
+     */
+    public static void setTAEventUserStr(int type, String property, String value){
+        TDSDKMgr.getInstance().setTAEventUserStr(type, property, value);
+    }
+
     //系统相关---------------------------------------------------------------------------------------
     /**
      * 复制到剪贴板

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java

@@ -89,4 +89,58 @@ public class TDSDKMgr {
         Log.d("TAEvent", "setTAEventUser: "+timeString);
         return timeString;
     }
+
+    /**
+     * 设置人物属性
+     * @param type 0 set  1 add
+     * @param property 属性名
+     * @param value 数值
+     */
+    public void setTAEventUser(int type, String property, float value){
+        if(type == 0){
+            try {
+                JSONObject properties = new JSONObject();
+                properties.put(property,value);
+                TDInstance.user_set(properties);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+        else{
+            try {
+                JSONObject properties = new JSONObject();
+                properties.put(property,value);
+                TDInstance.user_add(properties);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 设置人物属性
+     * @param type 0 set  1 add
+     * @param property 属性名
+     * @param value 数值
+     */
+    public void setTAEventUserStr(int type, String property, String value){
+        if(type == 0){
+            try {
+                JSONObject properties = new JSONObject();
+                properties.put(property,value);
+                TDInstance.user_set(properties);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+        else{
+            try {
+                JSONObject properties = new JSONObject();
+                properties.put(property,value);
+                TDInstance.user_add(properties);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }

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

@@ -1440,7 +1440,7 @@ n.topon_rewardVideo_placementId = e[3];
 n.topon_inter_placementId = e[4];
 n.topon_native_placementId = e[5];
 n.topon_banner_placementId = e[7];
-n.topon_fullinter_placementId = e[8];
+e[8] && (n.topon_fullinter_placementId = e[8]);
 };
 e.prototype.showVideo = function() {
 console.log("===[ShowVideoAd] ", d.ATRewardVideo.getInstance().hasAdReady());
@@ -1487,7 +1487,7 @@ e.topon_android_appSecret = "66b742dd0e502b64d783d9c66a9d30c4";
 e.topon_rewardVideo_placementId = "b5f8fa6673e180";
 e.topon_inter_placementId = "b5f8fa77aa5262";
 e.topon_native_placementId = "b5f8fa77aa5262";
-e.topon_fullinter_placementId = "b5f8fa77aa5262";
+e.topon_fullinter_placementId = "b6113813b876a1";
 e.topon_banner_placementId = "b5f8fa77aa5262";
 return n = a([ f ], e);
 }(s.zgSingleton));
@@ -2003,7 +2003,12 @@ var e = mk.storage.getStorage("popFullIndex");
 null == e ? e = 0 : e++;
 mk.storage.setStorage("popFullIndex", e);
 var n = e % this.fullInterShowStr.length;
-"1" == this.fullInterShowStr[n] && mk.ad.showInterAd(1);
+console.log("this.fullInterShowStr  ", this.fullInterShowStr);
+console.log("checkShowFullInter  ", n);
+if ("1" == this.fullInterShowStr[n]) {
+console.log("showInterAd  ");
+mk.ad.showInterAd(1);
+}
 }
 };
 return t;
@@ -2058,6 +2063,7 @@ t.prototype.wacthAdSuccess = function(t) {
 var e = this;
 void 0 === t && (t = "");
 mk.console.log("=== wacthAdSuccess");
+mk.data.setTAEventUser(1, "video_time", 1);
 mk.ui.scheduleOnce(function() {
 gData.adData.checkAdMax() || e.videoAdcallBack(!0);
 e.initLastTimeStamp();
@@ -2097,7 +2103,6 @@ this.ifShowAd && this.adSdk.showInter(t);
 t.prototype.checkShowInterByChance = function() {
 if (this.ifShowAd && gData.gameData.adShowConfig) {
 var t = gData.gameData.configs.ServerConfig.interOpenChance;
-t || (t = .4);
 Math.random() <= t ? this.showInterAd(0) : gData.moreGame.popMoreGamePopNode();
 }
 };
@@ -5148,6 +5153,8 @@ this.cashPro.active = !0;
 mk.tween.move(this.cashPro, .3, cc.v2(1e3, 0), cc.v2(0, 0), function() {
 gData.adData.checkShowFullInter(1);
 }, "elasticIn");
+mk.data.setTAEventUser(1, "cash_time", 1);
+mk.data.setTAEventUser(1, "cash_total", this.money);
 this.labMoney.string = "¥" + this.money;
 };
 e.prototype.tixianFail = function() {
@@ -5665,6 +5672,12 @@ t.prototype.sendDataEvent = function(t, e) {
 console.log("===[DataSystem", t, e);
 t && e && o.default.sendEvent(t, e);
 };
+t.prototype.setTAEventUser = function(t, e, n) {
+o.default.setTAEventUser(t, e, n);
+};
+t.prototype.setTAEventUserStr = function(t, e, n) {
+o.default.setTAEventUserStr(t, e, n);
+};
 t.prototype.sendXYEvent = function(t, e) {
 if (t && e) {
 var n = {
@@ -7531,7 +7544,17 @@ this.gameData.turntableTimes = t.turntableTimes;
 this.gameData.userTuCaoInfo = t.userTuCaoInfo;
 this.gameData.versioncfg = t.versioncfg;
 this.gameData.isFirstRedMoney = t.isFirstRedMoney;
+t.groupCode && (this.gameData.groupCode = t.groupCode);
+console.log("ABTest ", t.groupCode);
 gData.adData.watchNumToday = null == t.dayVideoTimesForRedMoney ? 0 : t.dayVideoTimesForRedMoney;
+if (gData.loginData.isFirstIn) {
+gData.loginData.isFirstIn = !1;
+mk.data.sendDataEvent("ABTest", "触发" + this.gameData.groupCode + "方案");
+mk.data.setTAEventUserStr(0, "xy_uid", gData.loginData.uin);
+mk.data.setTAEventUserStr(0, "regtime_app_id", gData.appData.appVersion);
+}
+mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
+mk.data.setTAEventUserStr(0, "channel_id", gData.appData.tfChannel);
 };
 t.prototype.setProp = function(t, e) {
 return o(this, void 0, void 0, function() {
@@ -7662,6 +7685,7 @@ this.hammerPropNum = 0;
 this.resetPropNum = 0;
 this.changePropNum = 0;
 this.isFirstRedMoney = 0;
+this.groupCode = 0;
 }
 Object.defineProperty(t.prototype, "isSignInToday", {
 get: function() {
@@ -7715,6 +7739,7 @@ set: function(t) {
 this._redMoney = t;
 gData.gameData.init_coin = !0;
 gData.gameData.init_red_point = !0;
+mk.data.setTAEventUser(0, "red_money_num", this._redMoney);
 },
 enumerable: !1,
 configurable: !0
@@ -8644,6 +8669,7 @@ mk.ui.getCurOnPanel("GetPropUI") && mk.ui.closePanel("GetPropUI");
 this.gameOver();
 };
 e.prototype.gameOver = function() {
+mk.data.setTAEventUser(1, "video_play_time", 1);
 mk.ui.openPanel("game/prefab/uiPanel/GameOverUI");
 };
 e.prototype.checkBonusNum = function(t) {
@@ -10972,6 +10998,14 @@ t.sendEvent = function(t, e) {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "sendEvent", "(Ljava/lang/String;Ljava/lang/String;)V", t, e) : (cc.sys.os, 
 cc.sys.OS_IOS);
 };
+t.setTAEventUser = function(t, e, n) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUser", "(ILjava/lang/String;F)V", t, e, n) : (cc.sys.os, 
+cc.sys.OS_IOS);
+};
+t.setTAEventUserStr = function(t, e, n) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUserStr", "(ILjava/lang/String;Ljava/lang/String;)V", t, e, n) : (cc.sys.os, 
+cc.sys.OS_IOS);
+};
 t.WxAuth = function() {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "WxAuth", "()V") : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WxAuth", "");
 };
@@ -11167,7 +11201,7 @@ value: !0
 n.LogTagColor = void 0;
 var i, a = function() {
 function t() {
-this.ifShowLog = !1;
+this.ifShowLog = !0;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -11378,6 +11412,7 @@ this.randomKey = "abcdefghijklopqrstuvwxyzabcdefgh";
 this.uin = "";
 this.tempUin = "";
 this.loginTicket = "";
+this.isFirstIn = !1;
 }
 t.prototype.loadLocalRes = function() {
 return o(this, void 0, void 0, function() {
@@ -13027,7 +13062,7 @@ var t = mk.math.random(0, this.moreGameList.normal.length - 1);
 return this.moreGameList.normal[t];
 };
 e.prototype.popMoreGamePopNode = function() {
-mk.guide.isGuiding || mk.ui.getCurOnPanel("reward") || Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
+mk.guide.isGuiding() || mk.ui.getCurOnPanel("reward") || Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
 };
 e.prototype.popNodeGetRedBag = function() {
 return a(this, void 0, void 0, function() {
@@ -14807,6 +14842,8 @@ e.prototype.initStyle = function() {
 this.lbl_receipt_rmb.string = "￥" + (gData.receiptNotice.receip_rmb / 100).toFixed(2) + "元";
 this.lbl_rmb_total.string = "￥" + (gData.cashNormal.receip_total_rmb / 100).toFixed(2) + "元";
 this.lbl_user_name.string = gData.wechatData.nickName || "";
+mk.data.setTAEventUser(1, "cash_time", 1);
+mk.data.setTAEventUser(1, "cash_total", gData.receiptNotice.receip_rmb / 100);
 };
 a([ s({
 displayName: "lbl收款金额",
@@ -15867,6 +15904,8 @@ e.prototype.init = function(t, e) {
 this.labMoney.string = t.toFixed(2) + "元";
 this.code = e;
 this.labRedCode.string = "提现红包码：" + this.code;
+mk.data.setTAEventUser(1, "cash_time", 1);
+mk.data.setTAEventUser(1, "cash_total", t);
 };
 e.prototype.clickCopyOfficial = function() {
 mk.audio.playEffect("button");
@@ -16804,7 +16843,6 @@ e.prototype.onDestroy = function() {
 this.cur_stage === s.none && mk.audio.playEffect("rewardClose");
 };
 e.prototype.onClickClose = function() {
-mk.ad.destoryBanner();
 if (2 == gData.reward.subType) {
 console.log("清除积分啦啦啦啦啦阿拉拉拉啦--------------------------------", l.default.Inst.ifPass);
 gData.gameData.setProp(p.GameProp.curTotalScore, 0);
@@ -16815,6 +16853,7 @@ l.default.Inst.initScore();
 }
 l.default.Inst && l.default.Inst.ifPass ? l.default.Inst.gameCount() : mk.ad.checkShowInterByChance();
 this.hasWatchVideo || gData.adData.checkShowFullInter(2);
+mk.ad.destoryBanner();
 };
 a([ f({
 displayName: "红包类型",
@@ -17625,6 +17664,7 @@ e.lbl_id = null;
 e.img_music = null;
 e.img_effect = null;
 e.lbl_version = null;
+e.lbl_group = null;
 e.node_rule = null;
 return e;
 }
@@ -17664,6 +17704,8 @@ case 3:
 i = a.sent();
 this.img_head.spriteFrame = new cc.SpriteFrame(i);
 console.log("=== loadHead:", i);
+mk.console.ifShowLog ? this.lbl_group.string = "分组号：" + gData.gameData.gameData.groupCode : this.lbl_group.string = "";
+"1" != gData.gameData.funOpenData[6] && (this.lbl_nickname.string = "");
 return [ 2 ];
 }
 });
@@ -17762,6 +17804,10 @@ a([ d({
 type: cc.Label,
 displayName: "版本号"
 }) ], e.prototype, "lbl_version", void 0);
+a([ d({
+type: cc.Label,
+displayName: "分组号"
+}) ], e.prototype, "lbl_group", void 0);
 return a([ p ], e);
 }(cc.Component);
 n.default = h;

packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
     "version": "1.0.0",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/",
     "resourceRootDir": "D:\\mokaszProjects\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -13,7 +13,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTestT/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/"
     ],
-    "buildTime": 1628731298312,
-    "genTime": 1628731298312,
+    "buildTime": 1628755232989,
+    "genTime": 1628755232989,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/version.manifest"}