增加开屏和激励视频ecpm数数埋点

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

@@ -1 +1 @@
-{"version":"1.0.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/version.manifest"}
+{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/version.manifest"}

assets/script/game/data/GameData.ts

@@ -502,6 +502,10 @@ export enum DataEventId {
     jarWithDrawal = "jarWithDrawal",
     /** 签到提现 */
     signWithDrawal = "signWithDrawal",
+    /** 激励视频ecpm */
+    ad_videoEcpm = 'ad_video',
+    /** 开屏ecpm */
+    ad_openEcpm = 'ad_open'
 }
 
 

assets/script/game/data/HttpData.ts

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

assets/script/game/data/LoginData.ts

@@ -194,6 +194,7 @@ export class LoginData {
         if (isFirstIn == null) {
             this.isFirstIn = true;
             mk.storage.setStorage(StorageKey.isFirstIn, 1);
+            mk.data.setTAEventRegister();
         }
 
         if (this.uin != data.uin) {

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

@@ -111,6 +111,25 @@ export class ATRewardVideo extends zgSingleton {
         gData.adData.updateData(placementId, data);
         mk.data.sendDataEvent(DataEventId.video_init, mk.ad.videoAdType);
         this.reawardAdState = RewardAdState.Unload;
+
+        let times = mk.storage.getStorage('ad_videoEcpm');
+        if (!times) {
+            times = 1;
+        }
+        else {
+            times++;
+        }
+        mk.storage.setStorage('ad_videoEcpm', times);
+
+        if (times <= 300) {
+            if (times <= 50) {
+                mk.data.sendDataEventValue(DataEventId.ad_videoEcpm, `ad_video_ecpm${times}`, data.adsource_price);
+            }
+            else if (times % 10 == 0) {
+                mk.data.sendDataEventValue(DataEventId.ad_videoEcpm, `ad_video_ecpm${times}`, data.adsource_price);
+            }
+        }
+
         //点击关闭的时候重新加载（亲测，即使在start这边 加载 也是在点击关闭时候才返回成功）
         //this.loadAd();
     }

assets/script/mk/system/DataSystem.ts

@@ -10,6 +10,13 @@ export default class DataSystem {
     }
 
     /**
+     * 数数注册事件
+     */
+    public setTAEventRegister() {
+        JsbSystem.setTAEventRegister();
+    }
+
+    /**
      * 数数打点
      * @param eventId 事件Id
      * @param des     事件内容
@@ -22,6 +29,18 @@ export default class DataSystem {
     }
 
     /**
+     * 数数打点
+     * @param eventId 事件Id
+     * @param des     事件内容
+     */
+    public sendDataEventValue(eventId: string, des: string, value: number) {
+        console.log("===[DataSystem", eventId, des, value);
+        if (eventId && des) {
+            JsbSystem.sendEventValue(eventId, des, value);
+        }
+    }
+
+    /**
     * 设置人物属性
     * @param type 0 set  1 add
     * @param property 属性名

assets/script/mk/system/JsbSystem.ts

@@ -1,3 +1,5 @@
+import { DataEventId } from "../../game/data/GameData";
+
 /**
  * Jsb管理类(与安卓Java类或者IOS交互)
  * @description
@@ -292,7 +294,7 @@ export default class JsbSystem {
 
     /**
      * 数数事件注册
-     * @description 数数SDK功能 已经自动放到AS授权后了 前端无需调用
+     * @description 数数SDK功能
      * @returns 
      */
     static setTAEventRegister() {
@@ -320,6 +322,21 @@ export default class JsbSystem {
     }
 
     /**
+     * 发送自定义事件 自定义功能 CocosToJava
+     * @description  发送统计事件
+     * @param key    事件的key值
+     * @param value  事件的value值
+     */
+    public static sendEventValue(key: string, value: string, value1: number) {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            this.callStaticMethod(this._JSB_ANDROID_PATH, "sendEventValue", "(Ljava/lang/String;Ljava/lang/String;F)V", key, value, value1);
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+
+        }
+    }
+
+    /**
     * 设置人物属性
     * @param type 0 set  1 add
     * @param property 属性名
@@ -469,6 +486,24 @@ export default class JsbSystem {
         // console.log('updateSplashAdLog  callbackInfo ', arr[1])
         let data = JSON.parse(arr[1])
         gData.adData.updateADLog(6, arr[0], data);
+
+        let times = mk.storage.getStorage('ad_openEcpm');
+        if (!times) {
+            times = 1;
+        }
+        else {
+            times++;
+        }
+        mk.storage.setStorage('ad_openEcpm', times);
+
+        if (times <= 300) {
+            if (times <= 50) {
+                mk.data.sendDataEventValue(DataEventId.ad_openEcpm, `ad_video_ecpm${times}`, data.adsource_price);
+            }
+            else if (times % 10 == 0) {
+                mk.data.sendDataEventValue(DataEventId.ad_openEcpm, `ad_video_ecpm${times}`, data.adsource_price);
+            }
+        }
     }
 
     /** 获取阿里风控设备token */

assets/script/mk/utils/LogUtil.ts

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

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

@@ -1 +1 @@
-{"version":"1.0.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/version.manifest"}
+{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/version.manifest"}

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

@@ -137,6 +137,13 @@ public class ThirdSdkMgr {
 
     //埋点相关---------------------------------------------------------------------------------------
     /**
+     * 注册事件埋点
+     */
+    public static void setTAEventRegister(){
+        TDSDKMgr.getInstance().setTAEventRegister();
+    }
+    
+    /**
      * 埋点
      * @param eventID
      * @param des
@@ -147,6 +154,15 @@ public class ThirdSdkMgr {
     }
 
     /**
+     * 埋点
+     * @param eventID
+     * @param des
+     */
+    public static void sendEventValue(String eventID, String des, float value){
+        TDSDKMgr.getInstance().setTAEventValue(eventID,des,value);
+    }
+
+    /**
      * 设置人物属性
      * @param type 0 set  1 add
      * @param property 属性名

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

@@ -134,6 +134,7 @@ public class SplashAdShowActivity extends FragmentActivity implements ATSplashAd
         //请参考 https://docs.toponad.com/#/zh-cn/android/android_doc/android_sdk_callback_access?id=callback_info
         Log.i("SplashAdShowActivity", "onAdShow:\n" + atAdInfo.toString());
         ThirdSdkMgr.updateSplashAdLog(unitId, atAdInfo.toString());
+
     }
 
     @Override

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

@@ -41,9 +41,6 @@ public class TDSDKMgr {
         TDConfig config = TDConfig.getInstance(this.appActivity, TA_APP_ID, TA_SERVER_URL);
         // 初始化 SDK
         this.TDInstance = ThinkingAnalyticsSDK.sharedInstance(config);
-
-        //数数注册
-        TDSDKMgr.getInstance().setTAEventRegister();
     }
 
     public void sendSuperRole(){
@@ -72,6 +69,21 @@ public class TDSDKMgr {
         }
     }
 
+    public void setTAEventValue(String eventID, String des, float value) {
+        if (this.TDInstance == null) {
+            return;
+        }
+        try {
+            JSONObject properties = new JSONObject();
+            properties.put("eventID", eventID);
+            properties.put(des, value);
+            TDInstance.track(eventID, properties);
+            Log.d("setTAEvent   ", "setTAEvent: " + eventID);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     //-- 数数相关 --
     /**注册（必须调用）*/
     public void setTAEventRegister(){

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

@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-#RELEASE_STORE_FILE=D:/mokaszProjects/mk_framework/keystore/eliminate.keystore
+#RELEASE_STORE_FILE=D:/copy/mk_framework/build/jsb-link/frameworks/runtime-src/proj.android-studio/app/keystore/eliminate.keystore
 RELEASE_STORE_PASSWORD=666888
 RELEASE_KEY_ALIAS=eliminate_1
 RELEASE_KEY_PASSWORD=123456

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

@@ -1245,11 +1245,18 @@ gData.adData.updateADLog(4, t, n);
 gData.adData.updateData(t, n);
 mk.data.sendDataEvent(r.DataEventId.video_init, mk.ad.videoAdType);
 this.reawardAdState = a.Unload;
+var o = mk.storage.getStorage("ad_videoEcpm");
+o ? o++ : o = 1;
+mk.storage.setStorage("ad_videoEcpm", o);
+o <= 300 && (o <= 50 ? mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + o, n.adsource_price) : o % 10 == 0 && mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + o, n.adsource_price));
 };
 e.prototype.onRewardedVideoAdPlayEnd = function() {
 this.ifWatchEnd = !0;
 };
 e.prototype.onRewardedVideoAdPlayFailed = function(t, e, n) {
+mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed placementId >> ", t);
+mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed errorInfo ", e);
+mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed callbackInfo ", n);
 var o = JSON.parse(n);
 gData.adData.updateADLog(5, t, o);
 s.default.getInstance().watchVideoAdCallBack(s.AdPlayStateType.PlayFail);
@@ -5695,10 +5702,17 @@ value: !0
 });
 var o = t("./JsbSystem"), i = function() {
 function t() {}
+t.prototype.setTAEventRegister = function() {
+o.default.setTAEventRegister();
+};
 t.prototype.sendDataEvent = function(t, e) {
 console.log("===[DataSystem", t, e);
 t && e && o.default.sendEvent(t, e);
 };
+t.prototype.sendDataEventValue = function(t, e, n) {
+console.log("===[DataSystem", t, e, n);
+t && e && o.default.sendEventValue(t, e, n);
+};
 t.prototype.setTAEventUser = function(t, e, n) {
 o.default.setTAEventUser(t, e, n);
 };
@@ -7839,6 +7853,8 @@ t.level = "level";
 t.commonWithDrawal = "commonWithDrawl";
 t.jarWithDrawal = "jarWithDrawal";
 t.signWithDrawal = "signWithDrawal";
+t.ad_videoEcpm = "ad_video";
+t.ad_openEcpm = "ad_open";
 })(n.DataEventId || (n.DataEventId = {}));
 (function(t) {
 t.Null = "";
@@ -10661,7 +10677,7 @@ value: !0
 n.ServerUrl = n.HttpData = void 0;
 var o, i = function() {
 function t() {
-this.serverType = 0;
+this.serverType = 1;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -10917,7 +10933,7 @@ return o;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var i = function() {
+var i = t("../../game/data/GameData"), a = function() {
 function t() {}
 t.isFileExist = function(t) {
 if (cc.sys.os == cc.sys.OS_WINDOWS) return !0;
@@ -11025,6 +11041,10 @@ 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.sendEventValue = function(t, e, n) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "sendEventValue", "(Ljava/lang/String;Ljava/lang/String;F)V", t, e, n) : (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);
@@ -11080,6 +11100,10 @@ return r;
 t.updateSplashAdLog = function(t) {
 var e = t.split("#"), n = JSON.parse(e[1]);
 gData.adData.updateADLog(6, e[0], n);
+var o = mk.storage.getStorage("ad_openEcpm");
+o ? o++ : o = 1;
+mk.storage.setStorage("ad_openEcpm", o);
+o <= 300 && (o <= 50 ? mk.data.sendDataEventValue(i.DataEventId.ad_openEcpm, "ad_video_ecpm" + o, n.adsource_price) : o % 10 == 0 && mk.data.sendDataEventValue(i.DataEventId.ad_openEcpm, "ad_video_ecpm" + o, n.adsource_price));
 };
 t.getAliRiskDeviceToken = function() {
 var t = "";
@@ -11090,10 +11114,12 @@ t._JSB_ANDROID_PATH = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
 t._JSB_IOS_PATH = "ThirdSdkMgr";
 return t;
 }();
-n.default = i;
-window.JsbMgr = i;
+n.default = a;
+window.JsbMgr = a;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../game/data/GameData": "GameData"
+} ],
 LoadResUtil: [ function(t, e, n) {
 "use strict";
 cc._RF.push(e, "027abfHullEcrlQpxOvHVc5", "LoadResUtil");
@@ -11228,7 +11254,7 @@ value: !0
 n.LogTagColor = void 0;
 var i, a = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -11566,6 +11592,7 @@ mk.storage.setStorage(a.StorageKey.loginTicket, this.loginTicket);
 if (null == mk.storage.getStorage(a.StorageKey.isFirstIn)) {
 this.isFirstIn = !0;
 mk.storage.setStorage(a.StorageKey.isFirstIn, 1);
+mk.data.setTAEventRegister();
 }
 if (this.uin != n.uin) {
 this.uin = n.uin;

packages-hot-update/cfg.json

@@ -1,7 +1,7 @@
 {
-    "version": "1.0.2",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/",
-    "resourceRootDir": "D:\\mokaszProjects\\mk_framework\\build\\jsb-link",
+    "version": "1.0.3",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/",
+    "resourceRootDir": "D:\\copy\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
         "http://",
@@ -11,9 +11,10 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTestT/baseRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTestT/baseRemote/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/"
     ],
-    "buildTime": 1629180651937,
-    "genTime": 1629180651937,
+    "buildTime": 1629770269095,
+    "genTime": 1629770269095,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote1/version.manifest"}
+{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/version.manifest"}

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1628836718016,
+  "last-module-event-record-time": 1629689896524,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }