发包

assets/script/game/data/AdData.ts

@@ -70,29 +70,29 @@ export class AdData {
 
 
     public updateData(placementId, data) {
-        if (this.isGroMore) {
-            let desNum = 0;
-            switch (data.network_firm_id) {
-                case 1:
-                    desNum = 15;
-                    break;
-                case 3:
-                    desNum = 8;
-                    break;
-                case 7:
-                    desNum = 28;
-                    break;
-                case 8:
-                    desNum = 29;
-                    break;
-                case 4:
-                    desNum = 6;
-                    break;
-            }
+        // if (this.isGroMore) {
+        //     let desNum = 0;
+        //     switch (data.network_firm_id) {
+        //         case 1:
+        //             desNum = 15;
+        //             break;
+        //         case 3:
+        //             desNum = 8;
+        //             break;
+        //         case 7:
+        //             desNum = 28;
+        //             break;
+        //         case 8:
+        //             desNum = 29;
+        //             break;
+        //         case 4:
+        //             desNum = 6;
+        //             break;
+        //     }
 
-            data.network_firm_id = desNum;
-            data.adsource_price = data.adsource_price * 0.01;
-        }
+        //     data.network_firm_id = desNum;
+        //     data.adsource_price = data.adsource_price * 0.01;
+        // }
 
         mk.console.logSingle("updateADData:" + placementId, data);
         this.placementId = placementId;

assets/script/mk/system/AdSystem.ts

@@ -51,7 +51,7 @@ export default class AdSystem {
      */
     public watchAd(callBack: Function) {
         console.log("==[观看激励视频")
-      
+
         if (this.isAdCooling()) {
             return;
         }
@@ -64,7 +64,7 @@ export default class AdSystem {
         else {
             //FC;显示GroMore广告
             JsbSystem.showGMoreRewardAd();
-   
+
             // if (cc.sys.platform != cc.sys.WECHAT_GAME) {
             //     if (cc.sys.os == cc.sys.OS_ANDROID) {
             //         this.adSdk.showVideo();
@@ -102,6 +102,7 @@ export default class AdSystem {
         //广告过后，渲染会有问题，统一下一帧再处理逻辑
         mk.ui.scheduleOnce(() => {
             if (!gData.adData.checkAdMax()) {
+                mk.console.log("===[Cocoscreator wacthAdSuccess  1111");
                 this.videoAdcallBack(true);
             }
             this.initLastTimeStamp();
@@ -110,7 +111,7 @@ export default class AdSystem {
 
     /** 显示原生广告 */
     public showNative(type = 4) {
-      
+
         if (!this.ifShowAd) {
             return;
         }
@@ -133,7 +134,7 @@ export default class AdSystem {
 
     /** 销毁原生广告 */
     public destroyNativeAd() {
-    
+
         if (!this.ifShowAd) {
             return;
         }
@@ -179,7 +180,7 @@ export default class AdSystem {
     }
 
     public showBanner() {
-       
+
         if (CC_DEBUG) {
             return;
         }
@@ -192,13 +193,13 @@ export default class AdSystem {
         // // if (gData.gameData.adShowConfig && gData.gameData.adShowConfig.is_show_banner == 1) {
         // this.adSdk.showBanner();
         // //}
-        
+
         //GroMore banner广告
         JsbSystem.showGMoreBannerAd();
     }
 
     public destoryBanner() {
-     
+
         if (CC_DEBUG) {
             return;
         }
@@ -218,7 +219,7 @@ export default class AdSystem {
      * @param type 0 插屏 1 全屏
      */
     public showInterAd(type: number) {
-      
+
         if (CC_DEBUG) {
             return;
         }

assets/script/mk/system/JsbSystem.ts

@@ -514,6 +514,7 @@ export default class JsbSystem {
 
 
         let data = JSON.parse(arr[1])
+        data.adsource_id = '';
         gData.adData.updateADLog(type, arr[0], data);
 
         mk.console.logSingle('updateSplashAdLog  type ', type);

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -188,8 +188,8 @@
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />

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

@@ -703,7 +703,7 @@ public class AppActivity extends Cocos2dxActivity {
         //检测奖励
         checkReward();
 
-        TToast.show(this,"关闭广告");
+//        TToast.show(this,"关闭广告");
         loadAdWithCallback(mVerticalCodeId_rewardAd, TTAdConstant.VERTICAL);
     }
 
@@ -1001,6 +1001,8 @@ public class AppActivity extends Cocos2dxActivity {
             mInterstitialAd.destroy();
         }
 
+        isLoadSuccess = false;
+
         loadInteractionAd();
     }
 

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

@@ -1939,31 +1939,6 @@ return !0;
 return !1;
 };
 t.prototype.updateData = function(t, e) {
-if (this.isGroMore) {
-var n = 0;
-switch (e.network_firm_id) {
-case 1:
-n = 15;
-break;
-
-case 3:
-n = 8;
-break;
-
-case 7:
-n = 28;
-break;
-
-case 8:
-n = 29;
-break;
-
-case 4:
-n = 6;
-}
-e.network_firm_id = n;
-e.adsource_price = .01 * e.adsource_price;
-}
 mk.console.logSingle("updateADData:" + t, e);
 this.placementId = t;
 this.adunit_format = e.adunit_format;
@@ -2177,7 +2152,10 @@ void 0 === t && (t = "");
 mk.console.log("===[Cocoscreator wacthAdSuccess");
 mk.data.setTAEventUser(1, "video_time", 1);
 mk.ui.scheduleOnce(function() {
-gData.adData.checkAdMax() || e.videoAdcallBack(!0);
+if (!gData.adData.checkAdMax()) {
+mk.console.log("===[Cocoscreator wacthAdSuccess  1111");
+e.videoAdcallBack(!0);
+}
 e.initLastTimeStamp();
 }, 0);
 };
@@ -12057,6 +12035,7 @@ t.updateSplashAdLog = function(t) {
 var e = t.split("#"), n = 6;
 e[2] && (n = parseInt(e[2]));
 var o = JSON.parse(e[1]);
+o.adsource_id = "";
 gData.adData.updateADLog(n, e[0], o);
 mk.console.logSingle("updateSplashAdLog  type ", n);
 mk.console.logSingle("updateSplashAdLog  data ", o);

packages-hot-update/cfg.json

@@ -19,7 +19,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/groMoreRemote/"
     ],
-    "buildTime": 1632706747739,
-    "genTime": 1632706747739,
+    "buildTime": 1632741310487,
+    "genTime": 1632741310487,
     "genVersion": null
 }