[FC]：修复很多广告问题

assets/resources/game/prefab/gameplay.prefab

@@ -2885,7 +2885,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "c4431030-4432-406f-a5e5-715b3bf622a5"
+      "__uuid__": "eab4a3e2-1348-4a4a-b624-155f21f77e04"
     },
     "_type": 3,
     "_sizeMode": 0,

assets/resources/game/prefab/nodepool/CellItem.prefab

@@ -27,11 +27,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -224,20 +224,87 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "spr_redPacketIcon",
+    "_name": "node_redPacket",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 10
+      }
+    ],
     "_active": false,
+    "_components": [],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        16.384,
+        -14.534,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.4,
+        0.4,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "qipao",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [],
+    "_active": true,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -249,8 +316,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 83,
-      "height": 78
+      "width": 115,
+      "height": 108
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -261,15 +328,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        15,
-        -15,
         0,
         0,
         0,
         0,
+        0,
+        0,
+        1,
+        1,
         1,
-        -0.5,
-        0.5,
         1
       ]
     },
@@ -291,8 +358,115 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "dc5d4911-076d-4863-a00f-faeea29ceb86"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "43529976-dd3c-4e7d-9c15-28537bac2f0b"
+    },
+    "fileId": "8fJhVI6JhIQLmL71+CsfX0",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "qipao_hb",
+    "_objFlags": 0,
+    "_parent": {
       "__id__": 6
     },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 61,
+      "height": 79
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
     "_enabled": true,
     "_materials": [
       {
@@ -302,10 +476,10 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "9c7771f6-3761-476c-a467-e8b449080e65"
+      "__uuid__": "c4431030-4432-406f-a5e5-715b3bf622a5"
     },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -326,7 +500,18 @@
     "asset": {
       "__uuid__": "43529976-dd3c-4e7d-9c15-28537bac2f0b"
     },
-    "fileId": "10MDEwKB1Aros1Lqj95VzI",
+    "fileId": "62/Aa2eLlOaJLjfbXSW4Hn",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "43529976-dd3c-4e7d-9c15-28537bac2f0b"
+    },
+    "fileId": "3efWeTNLhEarDHBaWKdVQN",
     "sync": false
   },
   {
@@ -343,8 +528,8 @@
     "spr_cellItemIcon": {
       "__id__": 3
     },
-    "spr_redPackIcon": {
-      "__id__": 7
+    "node_redPackIcon": {
+      "__id__": 6
     },
     "_id": ""
   },

assets/resources/module/redBagCode/redBagCode.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 34
-      },
-      {
         "__id__": 35
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 37
+      },
+      {
+        "__id__": 38
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -107,20 +107,20 @@
         "__id__": 18
       },
       {
-        "__id__": 24
+        "__id__": 25
       },
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -699,7 +699,7 @@
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -867,10 +867,24 @@
       "__id__": 1
     },
     "transition_type": 3,
-    "onComplete": [],
+    "onComplete": [
+      {
+        "__id__": 23
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "f7616rh8MtO1ZZziaU2Xf1w",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -892,11 +906,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -950,7 +964,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1002,14 +1016,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 29
       },
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -1063,7 +1077,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_materials": [
@@ -1095,7 +1109,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 28
     },
     "_enabled": true,
     "_normalMaterial": {
@@ -1106,7 +1120,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_N$interactable": true,
@@ -1235,7 +1249,7 @@
       "__id__": 15
     },
     "lbl_none": {
-      "__id__": 25
+      "__id__": 26
     },
     "videoPre": {
       "__uuid__": "33e934e4-3ffd-4bc1-bd4d-58a9b515f7f5"
@@ -1288,6 +1302,7 @@
       "__id__": 3
     },
     "bClickClose": true,
+    "onComplete": [],
     "_id": ""
   },
   {

assets/script/before/view/PauseUI.ts

@@ -47,7 +47,7 @@ export default class PauseUI extends cc.Component {
     }
 
     start() {
-        mk.ad.showNativeAd(4);
+        mk.ad.showNative(4);
 
         this.node_bg.setContentSize(cc.winSize.width, cc.winSize.height);
         this.initEvent();

assets/script/before/view/uiItem/CellItem.ts

@@ -20,8 +20,8 @@ export default class CellItem extends cc.Component {
     @property(cc.Sprite)
     spr_cellItemIcon: cc.Sprite = null;
     /**cellItem的Icon图 */
-    @property(cc.Sprite)
-    spr_redPackIcon: cc.Sprite = null;
+    @property(cc.Node)
+    node_redPackIcon: cc.Node = null;
 
     /**纵列数 */
     public x: number = 0;
@@ -294,7 +294,7 @@ export default class CellItem extends cc.Component {
 
     /** */
     showRedPacket() {
-        this.spr_redPackIcon.node.active = true;
+        this.node_redPackIcon.active = true;
     }
 
     /**
@@ -338,7 +338,7 @@ export default class CellItem extends cc.Component {
             //LogUtil.log("10 + Game.Inst.cleanedVecArr.length * 5", 10 + Game.Inst.cleanedVecArr.length * 5);
 
             //得分
-            let score = 2 + GamePlay.Inst.cleanedVecArr.length * 2;
+            let score = 2 + (GamePlay.Inst.cleanedVecArr.length - 2) * 2;
             //得分特效
             let node_score = PoolMgr.Inst.getPoolPrefab(NODEPOOLPREFABTYPE.EliminateScore);
             //LogUtil.log("node_score", node_score);
@@ -357,7 +357,7 @@ export default class CellItem extends cc.Component {
                 node_scoreEnergy.getComponent(ScoreEnergy).init(x, y, score);
                 GamePlay.Inst.node_effectUI.addChild(node_scoreEnergy);
 
-                if (this.spr_redPackIcon.node.active) {
+                if (this.node_redPackIcon.active) {
                     this.scheduleOnce(() => {
                         if (GamePlay.Inst.finalGetScore < GamePlay.Inst.targetScore) {
                             gData.reward.subType = 2;
@@ -367,8 +367,8 @@ export default class CellItem extends cc.Component {
                 }
             }
         }
-        if (this.spr_redPackIcon.node.active) {
-            this.spr_redPackIcon.node.active = false;
+        if (this.node_redPackIcon.active) {
+            this.node_redPackIcon.active = false;
         }
         //回收
         PoolMgr.Inst.recyclePoolPrefab(NODEPOOLPREFABTYPE.CellItem, this.node);

assets/script/game/data/AppData.ts

@@ -67,6 +67,8 @@ export class AppData {
         this.androidVersion = arr[10];
 
         this.getDeviceInfoCompelete = true;
+        console.log("===[this.tfChannel",this.tfChannel);
+        console.log("===[this.appVersion",this.appVersion);
     }
 
     public init() {

assets/script/game/module/help/Help.ts

@@ -12,7 +12,7 @@ export default class Help extends cc.Component {
     lbl_desc: cc.Label = null;
 
     start() {
-        mk.ad.showNativeAd(4);
+        mk.ad.showNative(4);
     }
 
     update() {

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

@@ -101,24 +101,35 @@ export default class Login extends cc.Component {
 
     //发送请求整包更新
     public async getForceVersionInfo() {
+
         console.log("===[Login] getForceVersionInfo发送请求整包更新")
-        mk.console.log("===[Login] getForceVersionInfo", gData.loginData.uin,gData.loginData.sessionKey);
+        mk.console.log("===[Login] getForceVersionInfo", gData.loginData.uin, gData.loginData.sessionKey);
         let data: any = {
+            "appId": gData.appData.appId,
+            'channel': gData.appData.tfChannel,
             'version': gData.appData.appVersion,
-            'channel': gData.appData.tfChannel
-        }
-
-        data.timestamp = Math.floor(new Date().getTime() * 0.001)
-        data.appVersion = gData.appData.appVersion;
-        data.tfChannel = gData.appData.tfChannel;
-        data.versioncfg = gData.appData.version;
-
-        let encode = mk.encrypt.encrypt(JSON.stringify(data), gData.loginData.sessionKey, gData.loginData.sessionKey);
-        let bodyData = {
-            "uin": gData.loginData.uin,
-            "encrypt": encode
         }
-        let response = await mk.http.sendRequest("getForceVersionInfo", 'POST', JSON.stringify(bodyData), false, false)
+        mk.console.log("===[Login] getForceVersionInfo appId", gData.appData.appId);
+        mk.console.log("===[Login] getForceVersionInfo channel", gData.appData.tfChannel);
+        mk.console.log("===[Login] getForceVersionInfo version", gData.appData.appVersion);
+        // let data :any = {
+        //     "appId": "wxcf31f0e54f7fefda",
+        //     "channel": "1",
+        //     "version": "1.0.1"
+        // }
+     
+
+        // data.timestamp = Math.floor(new Date().getTime() * 0.001)
+        // data.appVersion = gData.appData.appVersion;
+        // data.tfChannel = gData.appData.tfChannel;
+        // data.versioncfg = gData.appData.version;
+
+        // let encode = mk.encrypt.encrypt(JSON.stringify(data), gData.loginData.sessionKey, gData.loginData.sessionKey);
+        // let bodyData = {
+        //     "uin": gData.loginData.uin,
+        //     "encrypt": data
+        // }
+        let response = await mk.http.sendRequest("getForceVersionInfo", 'POST', JSON.stringify(data), false, false)
         mk.console.logSingle("===[Login] getForceVersionInfo response", response);
         gData.appData.needForceUpdate = response.isForceUpdate;
         gData.appData.installVersion = response.version;

assets/script/game/module/redBagCode/RedBagCode.ts

@@ -1,3 +1,4 @@
+import MKSwitch from "../../../mk/MKSwitch";
 
 const { ccclass, property } = cc._decorator;
 /**
@@ -16,9 +17,10 @@ export default class RedBagCode extends cc.Component {
 
     start() {
         this.initList();
+        mk.ad.showNative(4);
     }
 
-    
+
     /**
      * 初始化滚动列表
      */
@@ -64,4 +66,8 @@ export default class RedBagCode extends cc.Component {
         mk.audio.setResumeMusic();
         this.coolTime = false
     }
+
+    onClickClose() {
+        mk.ad.destroyNativeAd();
+    }
 }

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

@@ -36,7 +36,7 @@ export default class RedCode extends cc.Component {
     coolTime = false
 
     start() {
-        mk.ad.showNativeAd(4);
+        mk.ad.showNative(4);
 
         this.coolTime = false
         this.labOfficial.string = `“${this.officialStr}”`

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

@@ -68,7 +68,7 @@ export default class Reward extends cc.Component {
     }
 
     start() {
-        mk.ad.showBannerAd();
+        mk.ad.showBanner();
         mk.ad.checkShowInterByChance();
 
         /** 盖子 */
@@ -273,7 +273,7 @@ export default class Reward extends cc.Component {
     }
 
     onClickClose() {
-        mk.ad.destroyNativeAd();
+        mk.ad.destoryBanner();
         mk.ad.checkShowInterByChance();
     }
 }

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

@@ -30,7 +30,7 @@ export default class Setting extends cc.Component {
     }
 
     start() {
-        mk.ad.showNativeAd(4);
+        mk.ad.showNative(4);
     }
 
     private async initData() {

assets/script/game/module/sign/Sign.ts

@@ -27,7 +27,7 @@ export default class Sign extends cc.Component {
     }
 
     start() {
-        mk.ad.showNativeAd(4);
+        mk.ad.showNative(4);
         // gData.sign.sign_can = gData.gameData.getProp(GameProp.sign_can);
         gData.sign.initListData();
         gData.sign.init_data = true;
@@ -82,6 +82,7 @@ export default class Sign extends cc.Component {
             mk.console.log("watchAD:" + success);
             if (success) {
                 gData.adData.watchVideo(AdFun.sign);
+                mk.ad.destroyNativeAd();
             }
         });
     }

assets/script/mk/sdk/ad/IADSDKMgr.ts

@@ -4,22 +4,26 @@ export interface IADSDKMgr {
     initSDK();
 
     /** 观看视频 */
-    showVideoAd();
-    
+    showVideo();
+
     /** 显示插屏 */
-    showInterAd();
-    
+    showInter(type: number);
+
     /** 加载原生 */
-    loadNativeAd(type: number, show: boolean);
-    
+    loadNative(type: number, ifLoadShow: boolean);
+
+    /** 显示原生 */
+    showNative(type: number);
+
     /** 销毁原生 */
-    destroyNativeAd();
-    
+    destroyNative();
+
+    /** 加载banner */
+    loadBanner(ifLoadShow: boolean);
+
     /** 显示banner */
-    showBannerAd();
-    
+    showBanner();
+
     /** 销毁banner */
     destoryBanner();
-
-    showInter();
 }

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

@@ -8,12 +8,25 @@ import ATSDKMgr from "./ATSDKMgr";
  */
 export default class ATBanner extends zgSingleton {
 
+    /**  */
+    private ATBannerJS: any;
+
+    /** 激励视频状态 */
+    public bannerAdState: BannerAdState = 0;
+    /** 是否加载完显示 */
+    public ifLoadShow: boolean = false;
+    /**是否观看完毕 */
+    public ifWatchEnd: boolean = false;
+
     init() {
-        cc["ATBannerJS"].proxy = this;
-        console.log("cc[ATBannerJS]", cc["ATBannerJS"]);
-        console.log("window[ATBannerJS]", window["ATBannerJS"]);
-        cc["ATBannerJS"].init();
-        this.loadBanner();
+
+        this.ATBannerJS = cc["ATBannerJS"];
+        this.ATBannerJS.proxy = this;
+        this.ATBannerJS.init();
+
+        if (this.bannerAdState == BannerAdState.Unload) {
+            this.loadBanner();
+        }
     }
 
     /** 广告位id */
@@ -25,18 +38,52 @@ export default class ATBanner extends zgSingleton {
         }
     }
 
-    /* *加载banner */
-    loadBanner() {
-        cc["ATBannerJS"].loadBanner();
+    //广告逻辑部分------------------------------------------------------------------------
+    /**
+    * 检测banner是否准备就绪
+    * @returns 
+    */
+    hasAdReady() {
+        return this.ATBannerJS.hasAdReady();
+    }
+
+    /** 加载banner
+     * @param ifLoadShow 是否显示 默认为false
+     */
+    loadBanner(ifLoadShow: boolean = false) {
+        this.ifLoadShow = ifLoadShow;
+        this.bannerAdState = BannerAdState.Loading;
+
+        this.ATBannerJS.loadBanner();
     }
 
     /** 显示banner */
     showBanner() {
-        cc["ATBannerJS"].showBanner();
+        if (this.bannerAdState == BannerAdState.Show) {
+
+        }
+        else {
+            if (this.hasAdReady()) {
+                this.bannerAdState = BannerAdState.Show;
+                this.ATBannerJS.showBanner();
+            }
+            else {
+                if (this.bannerAdState == BannerAdState.Loading) {
+                    this.ifLoadShow = true;
+                }
+                else {
+                    this.loadBanner(true);
+                }
+            }
+        }
     }
 
+    /** 销毁banner */
     destroyBanner() {
-        cc["ATBannerJS"].destroyBanner()
+        this.bannerAdState = BannerAdState.Close;
+
+        this.ATBannerJS.destroyBanner()
+        this.loadBanner();
     }
 
     //广告回调部分------------------------------------------------------------------------
@@ -46,7 +93,7 @@ export default class ATBanner extends zgSingleton {
      * @returns 
      */
     onBannerAdLoaded(placementId) {
-        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoaded(" + placementId + ")");
+        this.bannerAdState = BannerAdState.LoadSuccess;
     }
 
     /**
@@ -56,6 +103,7 @@ export default class ATBanner extends zgSingleton {
      * @returns 
      */
     onBannerAdLoadFail(placementId, errorInfo) {
+        this.bannerAdState = BannerAdState.LoadFail;
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoadFail(" + placementId + ", " + errorInfo + ")");
     }
 
@@ -66,6 +114,7 @@ export default class ATBanner extends zgSingleton {
      * @returns 
      */
     onBannerAdShow(placementId, callbackInfo) {
+        this.bannerAdState = BannerAdState.Show;
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdShow(" + placementId + ", " + callbackInfo + ")");
     }
 
@@ -105,3 +154,19 @@ export default class ATBanner extends zgSingleton {
 
     }
 }
+
+/** banner广告加载状态 */
+export enum BannerAdState {
+    /** 未加载 */
+    Unload = 0,
+    /** 加载中 */
+    Loading = 1,
+    /** 加载成功 */
+    LoadSuccess = 2,
+    /** 加载失败 */
+    LoadFail = 3,
+    /** 显示状态 */
+    Show = 4,
+    /** 关闭状态 */
+    Close = 5
+}

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBannerJS.js

@@ -46,7 +46,7 @@ var ATBannerJS = cc.Class({
      * 检测banner是否准备就绪
      * @returns 
      */
-    checkBannerReady: function () {
+    hasAdReady: function () {
         return ATBannerJSSDK.hasAdReady(this.placementID()) ? true : false
     },
 
@@ -55,9 +55,6 @@ var ATBannerJS = cc.Class({
      * @returns 
      */
     showBanner: function () {
-        if (this.bannerIsShow) {
-            return
-        }
         ATBannerJSSDK.showAdInPosition(this.placementID(), ATBannerJSSDK.kATBannerAdShowingPositionBottom);
     },
 
@@ -65,11 +62,7 @@ var ATBannerJS = cc.Class({
      * 销毁banner
      */
     destroyBanner: function () {
-        if (this.bannerIsShow) {
-            ATBannerJSSDK.removeAd(this.placementID());
-            this.bannerIsShow = false
-            this.loadBanner()
-        }
+        ATBannerJSSDK.removeAd(this.placementID());
     },
 
     /**
@@ -90,7 +83,7 @@ var ATBannerJS = cc.Class({
      * @returns 
      */
     onBannerAdLoadFail: function (placementId, errorInfo) {
-        // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdLoadFail(" + placementId + ", " + errorInfo + ")");
+        ATJSSDK.printLog("===[ AnyThinkBannerDemo::onBannerAdLoadFail(" + placementId + ", " + errorInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onBannerAdLoadFail(placementId, errorInfo);
     },
@@ -103,7 +96,6 @@ var ATBannerJS = cc.Class({
      */
     onBannerAdShow: function (placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkBannerDemo::onBannerAdShow(" + placementId + ", " + callbackInfo + ")");
-        this.bannerIsShow = true
         if (this.proxy == null) return;
         this.proxy.onBannerAdShow(placementId, callbackInfo);
     },
@@ -129,7 +121,7 @@ var ATBannerJS = cc.Class({
     /**
      * banner自动刷新失败
      * @param {*} placementId 广告位id
-     * @param {*} errorInfo   错误信息
+     * @param {*} errorInfo   回调信息
      * @returns 
      */
     onBannerAdAutoRefreshFail: function (placementId, errorInfo) {
@@ -140,7 +132,7 @@ var ATBannerJS = cc.Class({
     /**
      * banner关闭按钮被点击
      * @param {*} placementId  广告位id
-     * @param {*} callbackInfo 错误信息
+     * @param {*} callbackInfo 回调信息
      * @returns 
      */
     onBannerAdCloseButtonTapped: function (placementId, callbackInfo) {

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

@@ -9,19 +9,32 @@ import ATSDKMgr from "./ATSDKMgr";
  */
 export default class ATInterstitial extends zgSingleton {
 
+    /** */
     private ATInterstitialJS: any;
-    private interType:number ;
 
+    /** 插屏广告类型 0 插屏 1全屏 */
+    private interAdType: number = 0;
+    /** 插屏广告状态 */
+    private interAdState: InterAdState = 0;
+    /** 是否加载完显示 */
+    private ifLoadShow: boolean = false;
+
+    /** 初始化 */
     init() {
         this.ATInterstitialJS = cc["ATInterstitialJS"];
         this.ATInterstitialJS.proxy = this;;
         this.ATInterstitialJS.init();
-        this.loadInter(0);
+
+        if (this.interAdState == InterAdState.Unload) {
+            this.loadInter(0);
+        }
     }
 
-    /** 广告位id */
-    placementID(type: number) {
-        if (type == 0) {
+    /** 广告位id 
+     * @param 0 插屏 1 全屏
+     */
+    placementID() {
+        if (this.interAdType == 0) {
             if (cc.sys.os === cc.sys.OS_IOS) {
                 return ATSDKMgr.topon_inter_placementId;
             } else if (cc.sys.os === cc.sys.OS_ANDROID) {
@@ -37,16 +50,28 @@ export default class ATInterstitial extends zgSingleton {
         }
     }
 
-    /** 插屏广告
-     * @param type 0 普通插屏 1 全屏视频插屏
+    //广告逻辑部分------------------------------------------------------------------------
+    /** 检测是否插屏预备好了 */
+    hasAdReady() {
+        return this.ATInterstitialJS.hasAdReady();
+    }
+
+    /** 
+     * 加载插屏广告
+     * @param type 0 插屏 1 全屏
      */
-    loadInter(type) {
-        this.interType = type;
+    loadInter(type: number, ifLoadShow: boolean = false) {
+
+        this.interAdType = type;
+        this.ifLoadShow = ifLoadShow;
+
+        this.interAdState = InterAdState.Loading;
+        this.ATInterstitialJS.loadInter(type);
+
         // // console.log('99999999   loadInterPre  ', type)
         // if (!this.onloadInter) {
         //     this.onloadInter = true
         //     // console.log('99999999   loadInter  ', type)
-        this.ATInterstitialJS.loadInter(type);
         //     //FC:UROI事件
         //     if (GameM.commonData.ifUROI) {
         //         let eventID = EncryptUtil.randomString(32);
@@ -55,21 +80,44 @@ export default class ATInterstitial extends zgSingleton {
         // }
     }
 
-    showInter(type) {
-        this.interType = type
-        if (this.ATInterstitialJS.checkInterReady(type)) {
-            this.ATInterstitialJS.showInter(type);
+    /**
+     * 显示插屏广告
+     * @param type 0 插屏 1 全屏
+     */
+    showInter(type: number) {
+
+        this.interAdType = type;
+
+        if (this.interAdState == InterAdState.Show) {
+            //正在显示不重复弹出
         }
         else {
-            this.loadInter(type)
+            if (this.hasAdReady()) {
+                this.interAdState = InterAdState.Show;
+                this.ATInterstitialJS.showInter(type);
+            }
+            else {
+                //如果正在加载中，则不处理
+                if (this.interAdState == InterAdState.Loading) {
+                    //正在加载不重复加载
+                    this.ifLoadShow = true;
+                }
+                else {
+                    this.loadInter(type, true)
+                }
+            }
         }
-        // this.ATInterstitialJS.showInter(0);
     }
 
     //广告回调部分------------------------------------------------------------------------
     onInterstitialAdLoaded(placementId) {
-        // this.onloadInter = false
-        // // console.log('99999999   onInterstitialAdLoaded  ')
+
+        this.interAdState = InterAdState.LoadSuccess;
+
+        if (this.ifLoadShow) {
+            this.showInter(this.interAdType);
+        }
+
         // if (GameM.commonData.ifUROI) {
         //     let eventID = EncryptUtil.randomString(32);
         //     AdM.sendUROIEvent(eventID, '', placementId, "ad_fill", "interstitial", 'other', '')
@@ -77,8 +125,7 @@ export default class ATInterstitial extends zgSingleton {
     }
 
     onInterstitialAdLoadFail(placementId, errorInfo) {
-        // this.onloadInter = false
-        // // console.log('99999999   onInterstitialAdLoadFail')
+        this.interAdState = InterAdState.LoadFail;
 
         // if (placementId == GameM.commonData.fullInterPlaceId) {
         //     EffectNode.instance.PlayTip('拉取全屏视频失败，请稍后再试')
@@ -91,6 +138,8 @@ export default class ATInterstitial extends zgSingleton {
 
     //广告展示成功
     onInterstitialAdShow(placementId, callbackInfo) {
+        this.interAdState = InterAdState.Show;
+
         // // console.log('99999999   onInterstitialAdShow')
         // let data = JSON.parse(callbackInfo)
         // let id = 2
@@ -125,6 +174,9 @@ export default class ATInterstitial extends zgSingleton {
 
     //插屏广告关闭
     onInterstitialAdClose(placementId, callbackInfo) {
+        this.interAdState = InterAdState.Close;
+        this.loadInter(this.interAdType)
+
         // //给奖励
         // // console.log('AnyThinkInterstitialDemo  ', this.interType)
         // if (placementId == GameM.commonData.fullInterPlaceId) {
@@ -138,8 +190,22 @@ export default class ATInterstitial extends zgSingleton {
         //         data.network_firm_id, data.adsource_id, data.adsource_index, data.adsource_price,
         //         data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level)
         // }
-
-        this.loadInter(this.interType)
     }
+}
+
 
+/** 插屏广告加载状态 */
+export enum InterAdState {
+    /** 未加载 */
+    Unload = 0,
+    /** 加载中 */
+    Loading = 1,
+    /** 加载成功 */
+    LoadSuccess = 2,
+    /** 加载失败 */
+    LoadFail = 3,
+    /** 显示状态 */
+    Show = 4,
+    /** 关闭状态 */
+    Close = 5
 }

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitialJS.js

@@ -8,69 +8,43 @@ var ATInterstitialJS = cc.Class({
     /** 代理脚本(TS) */
     proxy: null,
 
-    /** 插屏类型 */
-    interType: 0,
-
     ctor: function () {
         // console.log("ATNativeJS created! ");
     },
 
     init: function () {
-        ATBannerJSSDK.setAdListener(this);
+        ATInterstitialJSSDK.setAdListener(this);
     },
 
     /** 广告位id */
     placementID: function () {
-        return this.proxy.placementID(this.interType);
+        return this.proxy.placementID();
     },
 
     /**
-     * 插屏广告加载
-     * @param {*} type 0 插屏 1 全屏
+     * 检查插屏是否加载成功
+     * @returns 
      */
-    loadInter: function (type) {
-        //v5.6.8新增，只针对Sigmob平台，Sigmob的激励视频广告源当做插屏使用
-        var setting = {};
-        setting[ATInterstitialJSSDK.UseRewardedVideoAsInterstitial] = false;
-        this.interType = type
-        ATInterstitialJSSDK.setAdListener(this);
-        //setting[ATInterstitialJSSDK.UseRewardedVideoAsInterstitial] = true;
-        if (this.interType == 0) {
-            ATInterstitialJSSDK.loadInterstitial(this.placementID(), setting);
-            // ATInterstitialJSSDK.showAd(this.interPlacementId);
-        }
-        else if (this.interType == 1) {
-            ATInterstitialJSSDK.loadInterstitial(this.placementID(), setting);
-            // ATInterstitialJSSDK.showAd(this.fullInterPlacementId);
-        }
+    hasAdReady: function () {
+        if (this.proxy == null) return;
+        return ATInterstitialJSSDK.hasAdReady(this.placementID()) ? true : false;
     },
 
     /**
-     * 检查插屏是否加载成功
-     * @param {*} type 0 插屏 1 全屏
-     * @returns 
+     * 插屏广告加载
      */
-    checkInterReady: function (type) {
-        if (this.proxy == null) return;
-        if (type == 0) {
-            return ATInterstitialJSSDK.hasAdReady(this.placementID()) ? true : false;
-        }
-        else if (type == 1) {
-            return ATInterstitialJSSDK.hasAdReady(this.placementID()) ? true : false;
-        }
+    loadInter: function () {
+        //v5.6.8新增，只针对Sigmob平台，Sigmob的激励视频广告源当做插屏使用
+        var setting = {};
+        setting[ATInterstitialJSSDK.UseRewardedVideoAsInterstitial] = false;
+        ATInterstitialJSSDK.loadInterstitial(this.placementID(), setting);
     },
 
     /**
      * 显示插屏
-     * @param {*} type 0 插屏 1 全屏
      */
-    showInter: function (type) {
-        if (type == 0) {
-            ATInterstitialJSSDK.showAd(this.placementID());
-        }
-        else if (type == 1) {
-            ATInterstitialJSSDK.showAd(this.placementID());
-        }
+    showInter: function () {
+        ATInterstitialJSSDK.showAd(this.placementID());
     },
 
     /**
@@ -91,7 +65,7 @@ var ATInterstitialJS = cc.Class({
      * @returns 
      */
     onInterstitialAdLoadFail: function (placementId, errorInfo) {
-        //ATJSSDK.printLog("AnyThinkInterstitialDemo::onInterstitialAdLoadFail(" + placementId + ", " + errorInfo + ")");   
+        ATJSSDK.printLog("===[AnyThinkInterstitialDemo::onInterstitialAdLoadFail(" + placementId + ", " + errorInfo + ")");   
         if (this.proxy == null) return;
         this.proxy.onInterstitialAdLoadFail(placementId, errorInfo);
     },

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

@@ -9,12 +9,23 @@ import ATSDKMgr from "./ATSDKMgr";
 export class ATNative extends zgSingleton {
 
     private ATNativeJS: any;
+
+    /** 信息流广告类型 0 弹窗里  1 最底部 2 新车奖励 3 底部小窗口 */
+    private nativeAdType: number = 4;
+    /** 信息流广告状态 */
+    private nativeAdState: NativeAdState = 0;
+    /** 是否加载显示 */
+    private ifLoadShow: boolean = false;
+
     /** 初始化 */
     init() {
         this.ATNativeJS = cc["ATNativeJS"];
         this.ATNativeJS.proxy = this;;
         this.ATNativeJS.init();
-        this.loadNative();
+
+        if (this.nativeAdState == NativeAdState.Unload) {
+            this.loadNative(4);
+        }
     }
 
     /** 广告位id */
@@ -26,21 +37,151 @@ export class ATNative extends zgSingleton {
         }
     }
 
+    //广告逻辑部分------------------------------------------------------------------------
+    /** 检测是否插屏预备好*/
+    hasAdReady() {
+        return this.ATNativeJS.hasAdReady();
+    }
+
     /**
      * 加载信息流广告
      * @param type 类型对应不同位置
-     * @param show 是否加载完显示显示
+     * @param ifLoadshow 是否加载完显示显示
      */
-    loadNative(type = 4, show = false) {
-        this.ATNativeJS.loadNative(type, show);
+    loadNative(type = 4, ifLoadshow = false) {
+
+        this.nativeAdType = type;
+        this.ifLoadShow = ifLoadshow;
+
+        this.nativeAdState = NativeAdState.Loading;
+
+        //加载原生广告时需要传入广告展示的宽高
+        var frameSize = cc.view.getFrameSize();
+        let frameWidth = frameSize.width;
+        let frameHeight = frameSize.height;
+        var per = frameWidth / 750
+        var sw = per * 656;
+        var sh = per * 440;
+
+        if (this.nativeAdType == 2) {
+            sw *= 0.9
+            sh *= 0.8
+        }
+        else if (this.nativeAdType == 3) {
+            sw *= 0.9
+            sh *= 0.75
+        }
+        else {
+            sw *= 0.9
+            sh *= 0.75
+        }
+        this.ATNativeJS.loadNative(sw, sh);
     }
 
     /** 
      * 显示原生广告 
-     * @param type 0 弹窗里  1 最底部 2 新车奖励 3 底部小窗口
+     * @param type 0 弹窗里  1 最底部 2 新车奖励 3 底部小窗口 4 最底部
+     */
+    showNative(type: number) {
+
+        if (this.nativeAdState == NativeAdState.Show) {
+            //如果已经显示则不调用显示
+        }
+        else {
+
+            if (this.hasAdReady()) {
+                if (this.nativeAdType != type) {
+                    this.destroyNative();
+                    this.loadNative(type, true);
+                }
+                else {
+                    console.log("===[ShowNative", type);
+                    //加载原生广告时需要传入广告展示的宽高
+                    let frameSize = cc.view.getFrameSize();
+                    let frameWidth = frameSize.width;
+                    let frameHeight = frameSize.height;
+
+                    //获取基本的宽高
+                    let per = frameWidth / 750
+                    let width = per * 656
+                    let height = per * 440
+                    let fontSize = 12
+
+                    //设置位置宽高
+                    let pos_y = 0
+                    if (type == 0) {
+                        // posy = this.frameHeight * 0.5 - 100
+                        pos_y = frameHeight * 0.45
+                    }
+                    else if (type == 1) {
+                        // posy = this.frameHeight * 0.5 + 280
+                        pos_y = frameHeight * 0.625
+                    }
+                    else if (type == 2) {
+                        // posy = this.frameHeight * 0.5 + 210
+                        pos_y = frameHeight * 0.595
+                        width *= 0.9
+                        height *= 0.8
+                        fontSize = 8
+                    }
+                    else if (type == 3) {
+                        // posy = this.frameHeight * 0.5 + 420
+                        pos_y = frameHeight * 0.69
+                        width *= 0.9
+                        height *= 0.75
+                        fontSize = 8
+                    }
+                    else if (type == 4) {
+                        pos_y = frameHeight * 0.75;
+                        width *= 1.1;
+                    }
+
+                    let pos_x = (frameWidth - width) * 0.5
+                    this.ATNativeJS.showNative(pos_x, pos_y, width, height);
+                }
+            }
+            else {
+                //如果正在加载中，则不处理
+                if (this.nativeAdState == NativeAdState.Loading) {
+                    //正在加载不重复加载
+                    this.ifLoadShow = true;
+                }
+                else {
+                    this.loadNative(type, true)
+                }
+            }
+        }
+    }
+
+    /** 销毁baaner */
+    destroyNative() {
+
+        this.nativeAdState = NativeAdState.Close;
+
+        this.ATNativeJS.destroyNative();
+        this.loadNative(this.nativeAdType);
+    }
+
+    //广告回调部分------------------------------------------------------------------------
+    /**
+     * 原生广告加载成功
+     * @param {*} placementId 
+     */
+    onNativeAdLoaded(placementId) {
+        this.nativeAdState = NativeAdState.LoadSuccess;
+        if (this.ifLoadShow) {
+            this.showNative(this.nativeAdType);
+        }
+    }
+
+    /**
+     * 原生广告加载失败
+     * @param {*} placementId 广告位id
+     * @param {*} errorInfo   错误信息
      */
-    showNative(type) {
-        this.ATNativeJS.showNative(type);
+    onNativeAdLoadFail(placementId, errorInfo) {
+        this.nativeAdState = NativeAdState.LoadFail;
+        // ATJSSDK.printLog("AnyThinkNativeDemo::onNativeAdLoadFail(" + placementId + ", " + errorInfo + ")");
     }
 
     /**
@@ -49,6 +190,9 @@ export class ATNative extends zgSingleton {
      * @param callbackInfo 
      */
     onNativeAdShow(placementId, callbackInfo) {
+
+        this.nativeAdState = NativeAdState.Show;
+
         // 2021/06/03（勿删）此处为星云埋点,先注释，待接口调通，恢复
         // let data = JSON.parse(callbackInfo)
         // HttpMgr.Inst.updateADLog(3, placementId, data.adunit_format, data.network_type, data.network_placement_id,
@@ -56,14 +200,28 @@ export class ATNative extends zgSingleton {
         //     data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level);
     }
 
-    /** 销毁baaner */
-    destroyNative() {
-        this.ATNativeJS.destroyNative();
-        this.loadNative();
+    /**
+     * 原生广告被点击
+     * @param placementId  广告位Id
+     * @param callbackInfo 回调信息
+     */
+    onNativeAdClick(placementId, callbackInfo) {
+        // ATJSSDK.printLog("AnyThinkNativeDemo::onNativeAdClick(" + placementId + ", " + callbackInfo + ")");
     }
+}
 
-    /** 当前是否有banner显示 */
-    getIsNativeShow() {
-        return this.ATNativeJS.nativeShow
-    }
+/** 原生信息流广告状态 */
+export enum NativeAdState {
+    /** 未加载 */
+    Unload = 0,
+    /** 加载中 */
+    Loading = 1,
+    /** 加载成功 */
+    LoadSuccess = 2,
+    /** 加载失败 */
+    LoadFail = 3,
+    /** 显示状态 */
+    Show = 4,
+    /** 关闭状态 */
+    Close = 5
 }

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNativeJS.js

@@ -10,14 +10,6 @@ var ATNativeJS = cc.Class({
     /** 代理脚本(TS) */
     proxy: null,
 
-    frameWidth: 0,
-    frameHeight: 0,
-
-    nativeIsShow: false,
-    nativeType: 0,
-    nativeShow: false,
-    nativeIsLoad: false,
-    nativeIsLoading: false,
     // timeID: 0,
 
     ctor: function () {
@@ -33,130 +25,49 @@ var ATNativeJS = cc.Class({
         return this.proxy.placementID();
     },
 
-    /**
-     * 加载原生广告
-     * @param {*} type 类型 
-     * @param {*} show 是否显示
-     */
-    loadNative: function (type = 0, show = false) {
-
-        this.nativeType = type;
-        this.nativeShow = show;
-        this.nativeIsLoading = true;
-
-        //加载原生广告时需要传入广告展示的宽高
-        var frameSize = cc.view.getFrameSize();
-        this.frameWidth = frameSize.width;
-        this.frameHeight = frameSize.height;
-        var per = this.frameWidth / 750
-        var sw = per * 656
-        var sh = per * 440
-
-        if (this.nativeType == 2) {
-            this.destroyNative(false)
-            sw *= 0.9
-            sh *= 0.8
-        }
-        else if (this.nativeType == 3) {
-            this.destroyNative(false)
-            sw *= 0.9
-            sh *= 0.75
-        }
-        else {
-            sw *= 0.9
-            sh *= 0.75
-        }
-
-        ATNativeJSSDK.loadNative(this.placementID(), ATNativeJSSDK.createLoadAdSize(sw, sh));
+    /** 检测是否插屏预备好*/
+    hasAdReady() {
+        return ATNativeJSSDK.hasAdReady(this.placementID()) ? true : false;
     },
 
     /**
-     * 销毁原生广告
-     * @param {*} ifPreloadNext 是否预加载下一个 
+     * 加载原生广告
+     * @param {*} width 类型 
+     * @param {*} height 是否显示
      */
-    destroyNative: function (ifPreloadNext = true) {
-        ATNativeJSSDK.removeAd(this.placementID());
-        this.nativeIsLoad = false
-        this.nativeIsShow = false
-        if (ifPreloadNext) {
-            this.loadNative()
-        }
+    loadNative: function (width, height) {
+        ATNativeJSSDK.loadNative(this.placementID(), ATNativeJSSDK.createLoadAdSize(width, height));
     },
 
     /** 信息流位置 
-     *  @param {*} type 0 弹窗里  1 最底部 2 新车奖励 3 底部小窗口
+     *  @param {*} posX     x位置
+     *  @param {*} posY     y位置
+     *  @param {*} width    宽度
+     *  @param {*} height   高度
+     *  @param {*} fontSize 字体大小
      */
-    showNative: function (type) {
-
-        if (this.nativeIsLoading) {
-            this.nativeType = type
-            this.nativeShow = true
-            return
-        }
-
-        if (!this.nativeIsLoad) {
-            this.loadNative(type, true)
-            return
-        }
-
-        if (this.nativeIsShow) {
-            return
-        }
-
-        this.nativeIsShow = true
-        var per = this.frameWidth / 750
-        var sw = per * 656
-        var sh = per * 440
-        var fontSize = 12
-
-        var nativeAdViewProperty = new ATNativeJSSDK.AdViewProperty();
-        var posy = 0
-        if (type == 0) {
-            // posy = this.frameHeight * 0.5 - 100
-            posy = this.frameHeight * 0.45
-        }
-        else if (type == 1) {
-            // posy = this.frameHeight * 0.5 + 280
-            posy = this.frameHeight * 0.625
-        }
-        else if (type == 2) {
-            // posy = this.frameHeight * 0.5 + 210
-            posy = this.frameHeight * 0.595
-            sw *= 0.9
-            sh *= 0.8
-            fontSize = 8
-        }
-        else if (type == 3) {
-            // posy = this.frameHeight * 0.5 + 420
-            posy = this.frameHeight * 0.69
-            sw *= 0.9
-            sh *= 0.75
-            fontSize = 8
-        }
-        else if (type == 4) {
-            posy = this.frameHeight * 0.75;
-            sw *= 1.1;
-        }
-
-        var parx = (this.frameWidth - sw) * 0.5
-
-        nativeAdViewProperty.parent = nativeAdViewProperty.createItemViewProperty(parx, posy, sw, sh, "#ffffff", "", 0);
-        nativeAdViewProperty.mainImage = nativeAdViewProperty.createItemViewProperty(0, 0, sw, sh, "#ffffff", "#ffffff", fontSize);
+    showNative: function (posX, posY, width, height, fontSize) {
+        let nativeAdViewProperty = new ATNativeJSSDK.AdViewProperty();
+        nativeAdViewProperty.parent = nativeAdViewProperty.createItemViewProperty(posX, posY, width, height, "#ffffff", "", 0);
+        nativeAdViewProperty.mainImage = nativeAdViewProperty.createItemViewProperty(0, 0, width, height, "#ffffff", "#ffffff", fontSize);
         ATNativeJSSDK.showAd(this.placementID(), nativeAdViewProperty);
     },
 
+    /**
+     * 销毁原生广告
+     */
+    destroyNative: function () {
+        ATNativeJSSDK.removeAd(this.placementID());
+    },
+
     //广告回调部分------------------------------------------------------------------------
     /**
      * 原生广告加载成功
      * @param {*} placementId 
      */
     onNativeAdLoaded: function (placementId) {
-        this.nativeIsLoad = true
-        this.nativeIsLoading = false
-        if (this.nativeShow) {
-            this.nativeIsShow = false
-            this.showNative(this.nativeType)
-        }
+        if (this.proxy == null) return;
+        this.proxy.onNativeAdLoaded(placementId);
     },
 
     /**
@@ -165,9 +76,9 @@ var ATNativeJS = cc.Class({
      * @param {*} errorInfo   错误信息
      */
     onNativeAdLoadFail: function (placementId, errorInfo) {
-        // ATJSSDK.printLog("AnyThinkNativeDemo::onNativeAdLoadFail(" + placementId + ", " + errorInfo + ")");
-        this.nativeIsLoading = false
-        this.nativeIsLoad = false
+        ATJSSDK.printLog("===[AnyThinkNativeDemo::onNativeAdLoadFail(" + placementId + ", " + errorInfo + ")");
+        if (this.proxy == null) return;
+        this.proxy.onNativeAdLoadFail(placementId, errorInfo);
     },
 
     /**

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

@@ -8,8 +8,11 @@ import ATSDKMgr, { AdPlayStateType } from "./ATSDKMgr";
  */
 export class ATRewardVideo extends zgSingleton {
 
+    /**  */
+    private ATRewardVideoJS: any;
+
     /** 激励视频状态 */
-    public reawardAdState: RewardAdLoadState = 0;
+    public reawardAdState: RewardAdState = 0;
     /** 是否加载完显示 */
     public ifLoadShow: boolean = false;
     /**是否观看完毕 */
@@ -17,11 +20,12 @@ export class ATRewardVideo extends zgSingleton {
 
     init() {
 
-        cc["ATRewardVideoJS"].proxy = this;
-        cc["ATRewardVideoJS"].init();
+        this.ATRewardVideoJS = cc["ATRewardVideoJS"];
+        this.ATRewardVideoJS.proxy = this;
+        this.ATRewardVideoJS.init();
 
         this.ifWatchEnd = false;
-        if (this.reawardAdState == RewardAdLoadState.Unload) {
+        if (this.reawardAdState == RewardAdState.Unload) {
             this.loadAd();
         }
     }
@@ -35,32 +39,33 @@ export class ATRewardVideo extends zgSingleton {
         }
     }
 
+    //广告逻辑部分------------------------------------------------------------------------
+    /** 检测是否准备完毕 */
+    hasAdReady() {
+        return this.ATRewardVideoJS.hasAdReady();
+    }
+
     /** 加载广告 */
     loadAd() {
-        console.log("anythink === 加载激励视频广告", RewardAdLoadState[this.reawardAdState]);
-        if (this.reawardAdState == RewardAdLoadState.Loading) {
+        console.log("anythink === 加载激励视频广告", RewardAdState[this.reawardAdState]);
+        if (this.reawardAdState == RewardAdState.Loading) {
             return;
         }
-        this.reawardAdState = RewardAdLoadState.Loading;
-        cc["ATRewardVideoJS"].loadAd("userIdKey", "userDataKey");
+        this.reawardAdState = RewardAdState.Loading;
+        this.ATRewardVideoJS.loadAd("userIdKey", "userDataKey");
     }
 
     /** 显示广告 */
     showAd() {
-        if (this.reawardAdState != RewardAdLoadState.LoadSuccess) {
+        if (this.reawardAdState != RewardAdState.LoadSuccess) {
             this.loadAd();
             this.ifLoadShow = true;
             return;
         }
-
-        cc["ATRewardVideoJS"].showAd();
-    }
-
-    /** 检测是否准备完毕 */
-    checkReady() {
-        return cc["ATRewardVideoJS"].checkReady();
+        this.ATRewardVideoJS.showAd();
     }
 
+    //广告回调部分------------------------------------------------------------------------
     /**
      * 激励视频加载完毕
      * @param placementId 广告位id
@@ -68,8 +73,8 @@ export class ATRewardVideo extends zgSingleton {
     onRewardedVideoAdLoaded(placementId: string) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdLoaded(" + placementId + ")");
         // ATRewardVideo.getInstance().showAd()
-        console.log("anythink === 加载激励视频广告成功", this.checkReady(), RewardAdLoadState[this.reawardAdState])
-        this.reawardAdState = RewardAdLoadState.LoadSuccess;
+        console.log("anythink === 加载激励视频广告成功", this.hasAdReady(), RewardAdState[this.reawardAdState])
+        this.reawardAdState = RewardAdState.LoadSuccess;
         if (this.ifLoadShow) {
             this.showAd();
             this.ifLoadShow = false;
@@ -83,8 +88,8 @@ export class ATRewardVideo extends zgSingleton {
      */
     onRewardedVideoAdFailed(placementId, errorInfo) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
-        console.log("anythink === 加载激励视频广告失败", RewardAdLoadState[this.reawardAdState]);
-        this.reawardAdState = RewardAdLoadState.LoadFail;
+        console.log("anythink === 加载激励视频广告失败", RewardAdState[this.reawardAdState]);
+        this.reawardAdState = RewardAdState.LoadFail;
     }
 
     /**
@@ -103,7 +108,7 @@ export class ATRewardVideo extends zgSingleton {
         //     data.adsource_isheaderbidding, data.publisher_revenue, data.precision, data.ecpm_level);
         gData.adData.updateData(placementId, data);
 
-        this.reawardAdState = RewardAdLoadState.Unload;
+        this.reawardAdState = RewardAdState.Unload;
         //点击关闭的时候重新加载（亲测，即使在start这边 加载 也是在点击关闭时候才返回成功）
         //this.loadAd();
     }
@@ -161,7 +166,7 @@ export class ATRewardVideo extends zgSingleton {
         }
 
         this.ifWatchEnd = false;
-        
+
         this.loadAd();
     }
 
@@ -187,7 +192,7 @@ export class ATRewardVideo extends zgSingleton {
 }
 
 /** 激励视频广告加载状态 */
-export enum RewardAdLoadState {
+export enum RewardAdState {
     /** 未加载 */
     Unload = 0,
     /** 加载中 */

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideoJS.js

@@ -36,8 +36,8 @@ var ATRewardVideoJS = cc.Class({
 
     //广告回调部分------------------------------------------------------------------------
     /** 检测广告是否加载好 */
-    checkReady: function () {
-        ATJSSDK.printLog("AnyThinkRewardedVideo::checkReady()   " + (ATRewardedVideoJSSDK.hasAdReady(this.placementID()) ? "Ready" : "No"));
+    hasAdReady: function () {
+        // ATJSSDK.printLog("AnyThinkRewardedVideo::checkReady()   " + (ATRewardedVideoJSSDK.hasAdReady(this.placementID()) ? "Ready" : "No"));
         if (this.proxy == null) return;
         return ATRewardedVideoJSSDK.hasAdReady(this.placementID()) ? true : false;
     },
@@ -47,7 +47,7 @@ var ATRewardVideoJS = cc.Class({
      * @param {*} placementId 广告位id
      */
     onRewardedVideoAdLoaded: function (placementId) {
-        ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdLoaded(" + placementId + ")");
+        // ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdLoaded(" + placementId + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdLoaded(placementId);
     },
@@ -59,7 +59,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdFailed: function (placementId, errorInfo) {
-        ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
+        ATJSSDK.printLog("===[AnyThinkRewardedVideo::onRewardedVideoAdFailed(" + placementId + ", " + errorInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdFailed(placementId, errorInfo);
     },
@@ -71,7 +71,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdPlayStart: function (placementId, callbackInfo) {
-        ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
+        // ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdPlayStart(" + placementId + ", " + callbackInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdPlayStart(placementId, callbackInfo);
     },
@@ -83,7 +83,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdPlayEnd: function (placementId, callbackInfo) {
-        ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
+        // ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdPlayEnd(placementId, callbackInfo);
     },
@@ -96,7 +96,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdPlayFailed: function (placementId, errorInfo, callbackInfo) {
-        ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
+        // ATJSSDK.printLog("===[AnyThinkRewardedVideo::onRewardedVideoAdPlayFailed(" + placementId + ", " + errorInfo + ", " + callbackInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdPlayFailed(placementId, errorInfo, callbackInfo);
     },
@@ -108,7 +108,7 @@ var ATRewardVideoJS = cc.Class({
      * @returns 
      */
     onRewardedVideoAdClosed: function (placementId, callbackInfo) {
-        ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
+        // ATJSSDK.printLog("AnyThinkRewardedVideo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
         if (this.proxy == null) return;
         this.proxy.onRewardedVideoAdClosed(placementId, callbackInfo);
     },

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

@@ -38,7 +38,7 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
 
         //初始化激励视频广告
         ATRewardVideo.getInstance().init();
-        console.log("===[AdSystem checkReady()",ATRewardVideo.getInstance().checkReady());
+        // console.log("===[AdSystem  ATRewardVideo hasAdReady()", ATRewardVideo.getInstance().hasAdReady());
         //初始化原生广告
         ATNative.getInstance().init();
         // //初始化插屏广告
@@ -75,11 +75,12 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
         ATSDKMgr.topon_banner_placementId = arr[7];
     }
 
+    //激励视频广告------------------------------------------------------------------------------
     /**显示视频广告 */
-    showVideoAd() {
-        console.log("===[ShowVideoAd] ",ATRewardVideo.getInstance().checkReady());
-        if (!ATRewardVideo.getInstance().checkReady()) {
-          mk.tip.pop("广告加载中，请稍后");
+    showVideo() {
+        console.log("===[ShowVideoAd] ", ATRewardVideo.getInstance().hasAdReady());
+        if (!ATRewardVideo.getInstance().hasAdReady()) {
+            mk.tip.pop("广告加载中，请稍后");
         }
         ATRewardVideo.getInstance().showAd();
     }
@@ -102,36 +103,55 @@ export default class ATSDKMgr extends zgSingleton implements IADSDKMgr {
         }
     }
 
-    /**显示插屏广告 */
-    showInterAd() {
+    //插屏广告------------------------------------------------------------------------------
+    /**
+     * 显示插屏广告
+     * @param type 0 插屏 1 全屏
+     */
+    showInter(type: number = 0) {
+        ATInterstitial.getInstance().showInter(type);
+    }
+
+    //原生广告------------------------------------------------------------------------------
 
+    /**
+     * 加载原生广告
+     * @param type       广告类型
+     * @param ifLoadShow 是否显示广告
+     */
+    loadNative(type: number, ifLoadShow: boolean) {
+        ATNative.getInstance().loadNative(type, ifLoadShow);
     }
 
     /** 
      * 加载原生广告
-     * @param type 0 是插屏 1 是全屏
-     * @param show 是否显示
+     * @param type 0 弹窗里  1 最底部 2 新车奖励 3 底部小窗口 
+     * @param ifLoadShow 是否显示
      */
-    loadNativeAd(type: number, show: boolean) {
-        ATNative.getInstance().loadNative(type, show);
+    showNative(type: number) {
+        ATNative.getInstance().showNative(type);
     }
 
     /** 销毁原生广告 */
-    destroyNativeAd() {
+    destroyNative() {
         ATNative.getInstance().destroyNative();
     }
 
-    showBannerAd() {
+    //banner广告------------------------------------------------------------------------------
+    /** 加载banner */
+    loadBanner(ifLoadShow: boolean = false) {
+        ATBanner.getInstance().loadBanner(ifLoadShow);
+    }
+
+    /** 显示banner广告 */
+    showBanner() {
         ATBanner.getInstance().showBanner();
     }
 
+    /** 销毁banner广告 */
     destoryBanner() {
         ATBanner.getInstance().destroyBanner();
     }
-
-    showInter() {
-        ATInterstitial.getInstance().showInter(0);
-    }
 }
 
 /** 广告播放状态类型 */

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgrJS.js

@@ -53,8 +53,6 @@ var ATSDKMgrJS = cc.Class({
     },
 
     placementID() {
-        console.log("this.proxy", this);
-        console.log("this.proxy", this.proxy);
         return this.proxy.placementID();
     }
 });

assets/script/mk/system/AdSystem.ts

@@ -45,7 +45,9 @@ export default class AdSystem {
      * @param callBack 广告相关的回调
      */
     public watchAd(callBack: Function) {
-        if (this.isAdCooling()) return;
+        if (this.isAdCooling()) {
+            return;
+        }
 
         this.videoAdcallBack = callBack;
 
@@ -56,7 +58,7 @@ 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.showVideoAd();
+                    this.adSdk.showVideo();
                 }
                 else if (cc.sys.os == cc.sys.OS_IOS) {
                     jsb.reflection.callStaticMethod("AppController", "showVideo", "");
@@ -91,11 +93,11 @@ export default class AdSystem {
     }
 
     /** 显示原生广告 */
-    public showNativeAd(type = 0, show = true) {
+    public showNative(type = 4) {
         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.loadNativeAd(type, show);
+                this.adSdk.showNative(type);
             }
             else if (cc.sys.os == cc.sys.OS_IOS) {
 
@@ -111,7 +113,7 @@ 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.destroyNativeAd();
+                this.adSdk.destroyNative();
             }
             else if (cc.sys.os == cc.sys.OS_IOS) {
 
@@ -145,26 +147,29 @@ export default class AdSystem {
         return false;
     }
 
-    public showBannerAd() {
+    public showBanner() {
         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();
+        //}
+    }
 
-        if (gData.gameData.adShowConfig && gData.gameData.adShowConfig.is_show_banner == 1) {
-            this.adSdk.showBannerAd();
-        }
+    public destoryBanner() {
+        this.adSdk.destoryBanner();
     }
 
     /**
      * showInterAd
-     * @param type
+     * @param type 0 插屏 1 全屏
      */
     public showInterAd(type: number) {
         if (!this.ifShowAd) {
             return;
         }
-
-        this.adSdk.showInter();
+        this.adSdk.showInter(type);
     }
 
     /**

assets/script/mk/system/JsbSystem.ts

@@ -60,7 +60,7 @@ export default class JsbSystem {
      * @param info  info(Java返回)
      */
     public static updateDeviceInfo(info) {
-        mk.console.log("updateDeviceInfo" + cc.sys.os, info)
+        mk.console.log("===[JsbSystem] updateDeviceInfo" + cc.sys.os, info)
         if (cc.sys.os == cc.sys.OS_ANDROID) {
             gData.appData.updateDeviceInfo(info);
         }
@@ -74,9 +74,11 @@ export default class JsbSystem {
      * @description 自定义功能 CocosToJava
      */
     public static getDeviceInfo() {
-        mk.console.log("getDeviceInfo", cc.sys.os)
+        let deviceInfo = "";
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-            this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()V");
+          deviceInfo =  this.callStaticMethod(this._JSB_ANDROID_PATH, "getDeviceInfo", "()Ljava/lang/String;");
+          console.log("===[JsbSystem] getDeviceInfo ",deviceInfo);
+          return deviceInfo;
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             this.callStaticMethod(this._JSB_IOS_PATH, "getDeviceInfo", "");

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

@@ -65,7 +65,7 @@ public class ThirdSdkMgr {
 
     //设备信息相关------------------------------------------------------------------------------------
     /** 获取设备信息 */
-    public static void getDeviceInfo() {
+    public static String getDeviceInfo() {
         Log.d("[ThirdSdkMgr] ","getDeviceInfo");
         //获取安卓id
         String ANDROID_ID = DevicesUtil.getAndroidId(appActivity);
@@ -85,6 +85,13 @@ public class ThirdSdkMgr {
         String androidVersion = DevicesUtil.getSystemModel();
 
         updateDeviceInfo(ANDROID_ID, "", imei1, mac, mOAID, BuildConfig.UM_AID, versionName, umengChannel, deviceType, androidVersion);
+
+        String param =  ANDROID_ID + "#" + "" + "#" + imei1 + "#" + mac + "#" + mOAID + "#" + BuildConfig.UM_AID + "#" + BuildConfig.TF_CHANNEL +
+                "#" + versionName + "#" + umengChannel + "#" + deviceType + "#" + androidVersion ;
+        Log.d("===[ThridSdkMgr ",param);
+//        return param;
+
+        return  BuildConfig.UM_AID + "#" + BuildConfig.TF_CHANNEL;
     }
 
     /** 更新设备信息 */

packages-hot-update/cfg.json

@@ -7,7 +7,7 @@
         "http://",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/"
     ],
-    "buildTime": 1624784411216,
-    "genTime": 1624784411216,
+    "buildTime": 1624887496146,
+    "genTime": 1624887496146,
     "genVersion": null
 }