广告点击星云上报

assets/script/game/data/AdData.ts

@@ -153,7 +153,8 @@ export class AdData {
 
     /** 更新其他广告次数
      * @param type 1:激励视频完播、2:插屏展示、3:信息流展示、 4:激励视频展⽰、5:激励视频加载失败、6:开屏展示、7:banner展示、
-     * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败
+     * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败、
+     * 51:激励视频点击、52:插屏点击、53:信息流点击、54:开屏点击、55:banner点击、56:插屏-全屏视频点击
      */
     public updateADLog(type, placementId, data = null) {
         let sData = null

assets/script/game/module/guideWeak/GuideWeak.ts

@@ -90,6 +90,6 @@ export default class GuideWeak extends cc.Component {
     protected onDestroy(): void {
         // super.onDestroy();
         this._eventManager.removeListener(this._touchListener, this.node);
-        mk.event.remove('close-panel', this.onClosePanel, this);
+        mk.event.remove('close-panel', this);
     }
 }

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

@@ -143,6 +143,8 @@ export default class ATBanner extends zgSingleton {
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdClick(" + placementId + ", " + callbackInfo + ")");
 
         mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.bannerAdType);
+        let data = JSON.parse(callbackInfo);
+        gData.adData.updateADLog(55, placementId, data);
     }
 
     /** banner自动刷新成功 */

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

@@ -178,11 +178,14 @@ export default class ATInterstitial extends zgSingleton {
 
     onInterstitialAdClick(placementId, callbackInfo) {
         let type = this.checkPlacementIDType(placementId);
+        let data = JSON.parse(callbackInfo)
         if (type == 1) {
             mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.interFullAdType);
+            gData.adData.updateADLog(56, placementId, data);
         }
         else {
             mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.interAdType);
+            gData.adData.updateADLog(52, placementId, data);
         }
         // let data = JSON.parse(callbackInfo)
 

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

@@ -201,6 +201,8 @@ export class ATNative extends zgSingleton {
      */
     onNativeAdClick(placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkNativeDemo::onNativeAdClick(" + placementId + ", " + callbackInfo + ")");
+        let data = JSON.parse(callbackInfo)
+        gData.adData.updateADLog(53, placementId, data);
     }
 }
 

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

@@ -94,7 +94,7 @@ export class ATRewardVideo extends zgSingleton {
             adsource_id: adInfo.adsource_id,
             adsource_price: adInfo.adsource_price
         }
-    
+
         gData.adData.savePreLoadEcpm(data);
     }
 
@@ -200,6 +200,8 @@ export class ATRewardVideo extends zgSingleton {
      */
     onRewardedVideoAdPlayClicked(placementId, callbackInfo) {
         mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.videoAdType);
+        let data = JSON.parse(callbackInfo)
+        gData.adData.updateADLog(51, placementId, data);
     }
 
     /**

assets/script/mk/system/EventSystem.ts

@@ -7,7 +7,7 @@ export default class EventSystem {
 
     /** 监听数组 */
     private listeners: { [key: string]: Observer[] } = {};
-    
+
     /** 
      * 注册事件
      * @param name     事件名称
@@ -37,11 +37,9 @@ export default class EventSystem {
     /**
      * 移除事件
      * @param name     事件名称
-     * @param callback 回调函数
      * @param target   目标脚本（this)
      */
-    public remove(name: string, callback: Function, target: any) {
-
+    public remove(name: string, target: any) {
         let observers: Observer[] = this.listeners[name];
         if (!observers) return;
         let length = observers.length;
@@ -71,7 +69,7 @@ export default class EventSystem {
         let length = tempObservers.length;
         for (let i = 0; i < length; i++) {
             let observer = tempObservers[i];
-            observer.notify(...args, name);
+            observer.notify(...args);
         }
         //置空释放
         tempObservers = null;
@@ -94,7 +92,7 @@ class Observer {
     }
 
     /**
-     * 发送通知
+     * 执行回调函数
      * @param args 不定参数
      */
     notify(...args: any[]): void {

assets/script/mk/system/JsbSystem.ts

@@ -147,10 +147,10 @@ export default class JsbSystem {
         }
 
         if (CC_DEBUG) {
-            // gData.appData.appId = "wx3c0cc2f730c5ad5a";
-            // gData.appData.version = "1.0.0";
-            gData.appData.appId = "wx667751c00aad1686";
-            gData.appData.version = "1.1.2";
+            gData.appData.appId = "wx3c0cc2f730c5ad5a";
+            gData.appData.version = "1.0.0";
+            // gData.appData.appId = "wx667751c00aad1686";
+            // gData.appData.version = "1.1.2";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)
@@ -510,6 +510,7 @@ export default class JsbSystem {
         }
     }
 
+    private static splashADid = '';
     /** 上传开屏广告星云埋点 */
     public static updateSplashAdLog(info) {
         let arr = info.split('#')
@@ -517,6 +518,7 @@ export default class JsbSystem {
         // console.log('updateSplashAdLog  callbackInfo ', arr[1])
         let data = JSON.parse(arr[1])
         gData.adData.updateADLog(6, arr[0], data);
+        this.splashADid = arr[0];
 
         let times = mk.storage.getStorage('ad_openEcpm');
         if (!times) {
@@ -539,6 +541,7 @@ export default class JsbSystem {
 
     public static clickSplash() {
         mk.data.sendDataEvent(DataEventId.Ad_click, 'splash_click');
+        gData.adData.updateADLog(54, this.splashADid);
     }
 
     /** 获取阿里风控设备token */