1

assets/script/game/data/AdData.ts

@@ -155,6 +155,7 @@ export class AdData {
      * @param type 1:激励视频完播、2:插屏展示、3:信息流展示、 4:激励视频展⽰、5:激励视频加载失败、6:开屏展示、7:banner展示、
      * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败、
      * 51:激励视频点击、52:插屏点击、53:信息流点击、54:开屏点击、55:banner点击、56:插屏-全屏视频点击
+     * 71:激励视频去重点击、72:插屏去重点击、73:信息流去重点击、74:开屏去重点击、75:banner去重点击、76:插屏-全屏视频去重点击
      */
     public async updateADLog(type, placementId, data = null) {
         let sData = null

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/mk/system/AdSystem.ts

@@ -196,7 +196,10 @@ export default class AdSystem {
         }
 
         if (gap_time_stamp < needTime) {
+            console.log(`AdSystem======curSolution=>${gData.warnTipData.curSolution}`);
+            console.log(`AdSystem======needTime=>${needTime}====gap_time_stamp=>${gap_time_stamp}`)
             const time = Math.ceil((needTime - gap_time_stamp) / 1000);
+            console.log(`AdSystem======time=>${time}`);
             const leftTime = mk.time.formatWithUnit(time);
             mk.tip.pop('当前看视频太频繁了，请' + leftTime + '后再试');
 

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

@@ -846,6 +846,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.bannerAdState = 0;
 e.ifLoadShow = !1;
 e.ifWatchEnd = !1;
+e.singleClick = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -894,11 +895,16 @@ this.bannerAdState = i.Show;
 mk.console.logSingle("banner  ", "onBannerAdShow");
 var o = JSON.parse(e);
 gData.adData.updateADLog(7, t, o);
+this.singleClick = !0;
 };
 e.prototype.onBannerAdClick = function(t, e) {
 mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.bannerAdType);
 var o = JSON.parse(e);
 gData.adData.updateADLog(55, t, o);
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(75, t, o);
+}
 };
 e.prototype.onBannerAdAutoRefresh = function() {
 mk.console.logSingle("banner  ", "onBannerAdAutoRefresh");
@@ -1189,6 +1195,8 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.interAdStateArr = new Array();
 e.ifLoadShowArr = new Array();
+e.singleClick = !1;
+e.singleClickFull = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -1291,8 +1299,12 @@ this.ifLoadShowArr[o] = !1;
 this.interAdStateArr[o] = c.Show;
 var n = JSON.parse(e), a = 2;
 mk.console.logSingle("ATInterstitialJS  ", "onInterstitialAdShow " + o);
-if (0 == o) a = 2; else if (1 == o) {
+if (0 == o) {
+a = 2;
+this.singleClick = !0;
+} else if (1 == o) {
 a = 9;
+this.singleClickFull = !0;
 mk.data.sendDataEvent(s.DataEventId.interstitial2_init, mk.ad.interFullAdType);
 }
 gData.adData.updateADLog(a, t, n);
@@ -1302,9 +1314,17 @@ var o = this.checkPlacementIDType(t), n = JSON.parse(e);
 if (1 == o) {
 mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interFullAdType);
 gData.adData.updateADLog(56, t, n);
+if (this.singleClickFull) {
+this.singleClickFull = !1;
+gData.adData.updateADLog(76, t, n);
+}
 } else {
 mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interAdType);
 gData.adData.updateADLog(52, t, n);
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(72, t, n);
+}
 }
 };
 e.prototype.onInterstitialAdClose = function(t, e) {
@@ -1625,6 +1645,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.nativeAdType = 4;
 e.nativeAdState = 0;
 e.ifLoadShow = !1;
+e.singleClick = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -1694,10 +1715,15 @@ this.nativeAdState = i.Show;
 this.ifLoadShow = !1;
 var o = JSON.parse(e);
 gData.adData.updateADLog(3, t, o);
+this.singleClick = !0;
 };
 e.prototype.onNativeAdClick = function(t, e) {
 var o = JSON.parse(e);
 gData.adData.updateADLog(53, t, o);
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(73, t, o);
+}
 };
 return e;
 }(r.zgSingleton);
@@ -1809,6 +1835,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.reawardAdState = 0;
 e.ifLoadShow = !1;
 e.canGet = !1;
+e.singleClick = !1;
 return e;
 }
 e.prototype.init = function() {
@@ -1870,6 +1897,7 @@ var n = mk.storage.getStorage("ad_videoEcpm");
 n ? n++ : n = 1;
 mk.storage.setStorage("ad_videoEcpm", n);
 n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + n, o.adsource_price) : n % 10 == 0 && mk.data.sendDataEventValue(r.DataEventId.ad_videoEcpm, "ad_video_ecpm" + n, o.adsource_price));
+this.singleClick = !0;
 };
 e.prototype.onRewardedVideoAdPlayEnd = function() {};
 e.prototype.onRewardedVideoAdPlayFailed = function(t, e, o) {
@@ -1894,6 +1922,10 @@ e.prototype.onRewardedVideoAdPlayClicked = function(t, e) {
 mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.videoAdType);
 var o = JSON.parse(e);
 gData.adData.updateADLog(51, t, o);
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(71, t, o);
+}
 };
 e.prototype.onReward = function() {
 console.log("onReward  ");
@@ -2890,7 +2922,11 @@ mk.ui.openPanel("module/warnTip/WarnTipPanel");
 return !0;
 }
 if (t < e) {
-var o = Math.ceil((e - t) / 1e3), n = mk.time.formatWithUnit(o);
+console.log("AdSystem======curSolution=>" + gData.warnTipData.curSolution);
+console.log("AdSystem======needTime=>" + e + "====gap_time_stamp=>" + t);
+var o = Math.ceil((e - t) / 1e3);
+console.log("AdSystem======time=>" + o);
+var n = mk.time.formatWithUnit(o);
 mk.tip.pop("当前看视频太频繁了，请" + n + "后再试");
 return !0;
 }
@@ -5003,10 +5039,6 @@ e.prototype.Click_AdProgressBtn = function() {
 var t = this;
 mk.audio.playEffect("button");
 if (1 == gData.blessingBag.videoRbData.isVideo) gData.blessingBag.addProgress(); else {
-if (cc.sys.isNative && !gData.loginData.isAuth) {
-mk.ui.openPanel("module/authUI/authUI");
-return;
-}
 mk.ad.videoAdType = p.VideoAdType.video_init_15;
 mk.ad.watchAd(function(e) {
 return r(t, void 0, void 0, function() {
@@ -5031,7 +5063,7 @@ return [ 2 ];
 console.log("---\x3eYou Click AdProgressBtn  ", gData.blessingBag.videoRbData);
 };
 e.prototype.OpenRbPanel = function() {
-gData.blessingBag.HttpCashTask();
+!cc.sys.isNative || gData.loginData.isAuth ? gData.blessingBag.HttpCashTask() : mk.ui.openPanel("module/authUI/authUI");
 };
 e.prototype.CheckCashRedCode = function() {
 var t = gData.blessingBag.videoRbData;
@@ -16579,7 +16611,7 @@ value: !0
 o.ServerUrl = o.HttpData = void 0;
 var n, a = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -17384,6 +17416,10 @@ n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad
 t.clickSplash = function() {
 mk.data.sendDataEvent(a.DataEventId.Ad_click, "splash_click");
 gData.adData.updateADLog(54, this.splashADid);
+if (this.singleClick) {
+this.singleClick = !1;
+gData.adData.updateADLog(74, this.splashADid);
+}
 };
 t.getAliRiskDeviceToken = function() {
 var t = "";
@@ -17425,6 +17461,7 @@ t._JSB_ANDROID_PATH = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
 t._JSB_IOS_PATH = "ThirdSdkMgr";
 t._JSB_ANDROID_PATH_JSDK = "org/cocos2dx/javascript/thirdSdk/ysdk/YSDKMgr";
 t.callBack = null;
+t.singleClick = !0;
 t.splashADid = "";
 return t;
 }();
@@ -24523,7 +24560,7 @@ cc._RF.pop();
 } ],
 RestoreProductTimes: [ function(t, e, o) {
 "use strict";
-cc._RF.push(e, "8ba093FAVJIK7+9OVVRKnD3", "RestoreProductTimes");
+cc._RF.push(e, "ec75fZ/ANxFpLHsBPezJ7q7", "RestoreProductTimes");
 var n, a = this && this.__extends || (n = function(t, e) {
 return (n = Object.setPrototypeOf || {
 __proto__: []
@@ -30620,6 +30657,10 @@ e.prototype.clickCashOutBtn = function() {
 mk.audio.playEffect("button");
 console.log("=========>", this.isCanCash);
 if (this.isCanCash) if (this.checkShowTip()) mk.tip.pop("请先提现完前一档次数"); else {
+if (cc.sys.isNative && !gData.loginData.isAuth) {
+mk.ui.openPanel("module/authUI/authUI");
+return;
+}
 gData.adData.checkPopCashFull();
 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
 } else mk.tip.pop("红包币不足");

packages-hot-update/cfg.json

@@ -10,7 +10,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/"
     ],
-    "buildTime": 1634200484340,
-    "genTime": 1634200484340,
+    "buildTime": 1634353231357,
+    "genTime": 1634353231357,
     "genVersion": null
 }

settings/project.json

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