广告相关

assets/resources/animation/Main.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "4e4c7e27-6fce-4142-bde1-d4e0cea5b72e",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/game/coregame/coregame.prefab

@@ -2202,7 +2202,7 @@
         "__uuid__": "f62225e2-b0b7-45ec-bd95-96a8668c025b"
       }
     ],
-    "playOnLoad": false,
+    "playOnLoad": true,
     "_id": ""
   },
   {

assets/resources/module/guide/guide.prefab

@@ -33,14 +33,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 34
       },
       {
-        "__id__": 36
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 36
     },
     "_opacity": 255,
     "_color": {
@@ -595,20 +595,20 @@
         "__id__": 21
       },
       {
-        "__id__": 24
+        "__id__": 23
       },
       {
-        "__id__": 27
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 33
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -773,13 +773,9 @@
     },
     "_children": [],
     "_active": true,
-    "_components": [
-      {
-        "__id__": 22
-      }
-    ],
+    "_components": [],
     "_prefab": {
-      "__id__": 23
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -829,48 +825,6 @@
     "_id": ""
   },
   {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 21
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
-      }
-    ],
-    "paused": false,
-    "defaultSkin": "default",
-    "defaultAnimation": "yingdao2",
-    "_preCacheMode": 0,
-    "_cacheMode": 0,
-    "loop": true,
-    "premultipliedAlpha": true,
-    "timeScale": 1,
-    "_accTime": 0,
-    "_playCount": 0,
-    "_frameCache": null,
-    "_curFrame": null,
-    "_skeletonCache": null,
-    "_animationName": "yingdao2",
-    "_animationQueue": [],
-    "_headAniInfo": null,
-    "_playTimes": 0,
-    "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "8f090d5d-cfa1-40d6-bcce-014cc1aa881e"
-    },
-    "_N$_defaultCacheMode": 0,
-    "_N$debugSlots": false,
-    "_N$debugBones": false,
-    "_N$debugMesh": false,
-    "_N$useTint": false,
-    "_N$enableBatch": false,
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -892,11 +846,11 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -950,7 +904,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 24
+      "__id__": 23
     },
     "_enabled": true,
     "_materials": [
@@ -997,17 +951,17 @@
     },
     "_children": [
       {
-        "__id__": 28
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 31
     },
     "_opacity": 255,
     "_color": {
@@ -1061,17 +1015,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 27
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -1126,7 +1080,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 28
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1164,7 +1118,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "80Pou2FnNKnr67Y7RAlw1N",
+    "fileId": "29E3pCQk1CmZ4BnxnhwsBa",
     "sync": false
   },
   {
@@ -1172,7 +1126,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 26
     },
     "_enabled": true,
     "_fontFamily": "Arial",
@@ -1265,13 +1219,11 @@
       "__id__": 15
     },
     "node_head": {
-      "__id__": 25
-    },
-    "node_person": {
-      "__id__": 22
+      "__id__": 24
     },
+    "node_person": null,
     "rich_dialog": {
-      "__id__": 31
+      "__id__": 30
     },
     "_id": ""
   },

assets/script/before/main/FactoryIcon.ts

@@ -1,4 +1,5 @@
 import { FactroyState, GameProp, ProductType } from "../../game/data/GameData";
+import { MoveToCenter } from "../map/MoveToCenter";
 import ProductShow from "../view/ProductShow";
 import { FarmCountDown } from "./FarmCountDown";
 import { IDHelper } from "./IDHelper";
@@ -127,6 +128,8 @@ export class FactoryIcon extends cc.Component {
             this.data.growSpan = growSpan;
             gData.gameData.setFactoryDataMap(this.configID, this.data);
 
+            this.getComponent(MoveToCenter).move();
+
             gData.gameData.leftTimes--;
             gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
             gData.gameData.init_leftTimes = true;

assets/script/before/main/FarmIcon.ts

@@ -156,6 +156,8 @@ export class FarmIcon extends cc.Component {
             gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
             gData.gameData.init_leftTimes = true;
 
+            gData.farmSystem.currSelectFarm = this;
+
             gData.adData.checkPopRed();
 
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);

assets/script/before/main/FarmSystem.ts

@@ -8,6 +8,7 @@ export class FarmSystem {
     public farms: Array<FarmIcon> = [];
     private _currSelectFarm: FarmIcon = null;
     public plantWindowIsOpening = false;
+    public _lastSeletFarm: FarmIcon = null;
 
     public set currSelectFarm(farm: FarmIcon) {
         if (this._currSelectFarm) {
@@ -29,14 +30,19 @@ export class FarmSystem {
     }
     public plant(id: number): void {
         this.currSelectFarm && this.currSelectFarm.plant(id);
+        this._lastSeletFarm = this._currSelectFarm;
     }
     public selectNextFarm(sel = true): FarmIcon | null {
         let nextFarm = this.getCanPlantFarm();
+        if (this._lastSeletFarm) {
+            this._lastSeletFarm.selectFarm(false);
+        }
         if (nextFarm) {
             if (sel) {
                 this.currSelectFarm = nextFarm;
             }
             else {
+                this._lastSeletFarm = this._currSelectFarm;
                 this._currSelectFarm = nextFarm;
             }
         }

assets/script/before/main/PastureIcon.ts

@@ -1,6 +1,7 @@
 /** 养殖类 */
 
 import { AnimalState, GameProp, PastureState, ProductType } from "../../game/data/GameData";
+import { MoveToCenter } from "../map/MoveToCenter";
 import Animals from "../view/Animals";
 import ProductShow from "../view/ProductShow";
 import { FarmCountDown } from "./FarmCountDown";
@@ -189,7 +190,7 @@ export default class PastureIcon extends cc.Component {
             this.data.growSpan = growSpan;
             gData.gameData.setPastureDataMap(this.configID, this.data);
             this.eatNode.active = false;
-
+            this.getComponent(MoveToCenter).move();
             gData.gameData.leftTimes--;
             gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
             gData.gameData.init_leftTimes = true;

assets/script/before/view/ui/ADClearSickPanel.ts

@@ -35,12 +35,7 @@ export default class ADClearSickPanel extends cc.Component {
     }
 
     onEnable() {
-        if (Math.random() < 0.5) {
-            gData.adData.checkShowFullInter(3);
-        }
-        else {
-            gData.adData.checkShowFullInter(4);
-        }
+        gData.adData.checkPopInter();
 
         mk.ad.showBanner();
     }

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

@@ -14,10 +14,10 @@ export default class PlantItem extends cc.Component {
     @property({ type: BitmapFontC, tooltip: "获得数量文本" }) awardLabel: BitmapFontC = null;
     @property({ type: BitmapFontC, tooltip: "成熟时间文本" }) timeLabel: BitmapFontC = null;
     @property({ type: cc.Label, tooltip: "未开条件" }) labUnlock: cc.Label = null;
-    @property({ type: cc.Label, tooltip: '进度文本'}) lbl_progress: cc.Label = null;
+    @property({ type: cc.Label, tooltip: '进度文本' }) lbl_progress: cc.Label = null;
 
-    @property({type: cc.Node}) node_plant: cc.Node =null;
-    @property({type: cc.Node}) node_product: cc.Node =null;
+    @property({ type: cc.Node }) node_plant: cc.Node = null;
+    @property({ type: cc.Node }) node_product: cc.Node = null;
 
 
     private data = null;
@@ -86,25 +86,11 @@ export default class PlantItem extends cc.Component {
     }
 
     clickMake() {
-        if (Math.random() < 0.5) {
-            mk.ad.watchAd((success: boolean) => {
-                if (success) {
-                    if (this.data.tab == ProductType.nzw) {
-                        gData.farmSystem.plant(this.data.picture);
-                    }
-                    else {
-                        gData.factorySystem.make(this.data.picture);
-                    }
-                }
-            })
+        if (this.data.tab == ProductType.nzw) {
+            gData.farmSystem.plant(this.data.picture);
         }
         else {
-            if (this.data.tab == ProductType.nzw) {
-                gData.farmSystem.plant(this.data.picture);
-            }
-            else {
-                gData.factorySystem.make(this.data.picture);
-            }
+            gData.factorySystem.make(this.data.picture);
         }
     }
 

assets/script/game/data/AdData.ts

@@ -36,8 +36,20 @@ export class AdData {
 
     private adMap: Map<number, Data>
 
-    /** 全屏插屏弹出规则 */
-    private fullInterShowStr = ''
+    /** 用户价值等级 1 低 2 中 3 高 等等*/
+    public ecpmLevel = 0;
+    /** 自动弹窗间隔时间字典 */
+    private AutoRedMoneyMap: Map<number, number> = new Map();
+    /** 弹出红包ecpm等级数组 */
+    private TimingRedMoneyArr = [];
+    /** 生产按钮和菜单里的种植按钮，概率弹出恭喜发财红包ecpm等级数组 */
+    private ProductionButtonArr = [];
+    /** 概率弹出全屏广告ecpm等级数组 */
+    private FullScreenAdArr = [];
+    /** 弹出插屏、互推概率数组 */
+    private ABCInsertAdPercentArr = [];
+    /** 概率弹出AB插屏广告ecpm等级数组 */
+    private ABCInsertAdArr = [];
 
     public init() {
         this.adMap = new Map<number, Data>();
@@ -184,8 +196,48 @@ export class AdData {
         mk.http.sendData('updateADLog', sData);
     }
 
-    /** 检查是否显示全屏插屏
-     * @type  1:只对 ecpmLevel == 1 生效;  2:对所有玩家生效  3:延时弹出  4:先弹出插屏，再弹出全屏插屏
+    /** 初始化ecpm及弹出广告相关数据 */
+    initEcpmData() {
+        gData.adData.setEcpmLevel();
+        gData.adData.setPopClickTimes();
+
+        this.TimingRedMoneyArr = gData.gameData.configs.ServerConfig.TimingRedMoney.split(',');
+        this.ProductionButtonArr = gData.gameData.configs.ServerConfig.ProductionButton.split(',');
+        this.FullScreenAdArr = gData.gameData.configs.ServerConfig.FullScreenAd.split(',');
+        let arr = gData.gameData.configs.ServerConfig.ABCInsertAdPercent.split(',');
+        let per = 0;
+        for (var i = 0; i < arr.length; i++) {
+            per += parseFloat(arr[i]);
+            this.ABCInsertAdPercentArr[i] = per;
+        }
+        this.ABCInsertAdArr = gData.gameData.configs.ServerConfig.ABCInsertAd.split(',');
+    }
+
+    /** 设置用户ecpm分级, 自动弹窗字典等 */
+    public setEcpmLevel() {
+        //test
+        this.ecpmLevel = 1;
+        this.AutoRedMoneyMap.set(1, 20);
+        return;
+
+        let forceAd = gData.gameData.configs.forceAd;
+        let len = forceAd.length;
+        let ecpmlevel = -1;
+        for (var i = 0; i < len; i++) {
+            if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)) {
+                if (ecpmlevel == -1) {
+                    ecpmlevel = parseInt(forceAd[i].value);
+                }
+
+                this.AutoRedMoneyMap.set(parseInt(forceAd[i].value), parseInt(forceAd[i].AutoRedMoney))
+            }
+        }
+
+        this.ecpmLevel = ecpmlevel;
+    }
+
+    /** 检查是否显示插屏、互推（概率弹出）
+     * @type  1:弹出全屏插屏广告  2:延时弹出大插屏  3:先弹出插屏，再弹出大插屏  4:互推红包
      */
     checkShowFullInter(type) {
         let per = this.getPerByEcpm();
@@ -195,23 +247,21 @@ export class AdData {
         }
         switch (type) {
             case 1:
-                if (gData.gameData.ecpmLevel == 1) {
-                    mk.ad.showInterAd(1);
+                if (this.FullScreenAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
+                    return;
                 }
-                break;
-            case 2:
                 mk.ad.showInterAd(1);
                 break;
-            case 3:
+            case 2:
                 let delayArr = gData.gameData.configs.ServerConfig.AdDelay.split(',');
                 let min = parseFloat(delayArr[0]);
                 let max = parseFloat(delayArr[1]);
                 let delay = (min + (max - min) * Math.random()) * 1000;
                 setTimeout(() => {
-                    mk.ad.showInterAd(1);
+                    mk.ad.showInterAd(2);
                 }, delay);
                 break;
-            case 4:
+            case 3:
                 let delayArr1 = gData.gameData.configs.ServerConfig.AdDelay.split(',');
                 let min1 = parseFloat(delayArr1[0]);
                 let max1 = parseFloat(delayArr1[1]);
@@ -224,30 +274,44 @@ export class AdData {
                     }, delay2);
                 }, delay1);
                 break;
+            case 4:
+                gData.moreGame.popMoreGamePopNode();
+                break;
         }
     }
 
+    /** 弹出插屏 */
+    checkPopInter() {
+        if (this.ABCInsertAdArr.indexOf(this.ecpmLevel.toString()) == -1) {
+            return;
+        }
+
+        let ran = Math.random();
+        let len = this.ABCInsertAdPercentArr.length;
+        let index = 0;
+        for (var i = 0; i < len; i++) {
+            if (ran <= this.ABCInsertAdPercentArr[i]) {
+                index = i + 2;
+                break;
+            }
+        }
+
+        this.checkShowFullInter(index);
+    }
+
     //定时弹出计时
     private timeAd = 0;
     /** 定时弹出红包 */
     startPopRed(dt) {
+        if (this.TimingRedMoneyArr.indexOf(this.ecpmLevel.toString()) == -1) {
+            return;
+        }
+
         this.timeAd += dt;
-        switch (gData.gameData.ecpmLevel) {
-            case 1:
-                if (this.timeAd >= 30 * 1000) {
-                    this.timeAd = 0;
-                    mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
-                }
-                break;
-            case 2:
-                if (this.timeAd >= 60 * 1000) {
-                    this.timeAd = 0;
-                    mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
-                }
-                break;
-            case 3:
-                this.timeAd = 0;
-                break;
+        let span = this.AutoRedMoneyMap.get(this.ecpmLevel);
+        if (this.timeAd >= span * 1000) {
+            this.timeAd = 0;
+            mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
         }
     }
 
@@ -262,6 +326,10 @@ export class AdData {
     }
 
     checkPopRed() {
+        if (this.ProductionButtonArr.indexOf(this.ecpmLevel.toString()) == -1) {
+            return;
+        }
+
         this.clickTimesAdd++;
         if (this.clickTimesAdd >= this.popClickTimes) {
             this.clickTimesAdd = 0;

assets/script/game/data/GameData.ts

@@ -68,9 +68,6 @@ export class GameData {
     /** 正在生产 */
     public isProducting = false;
 
-    /** 用户价值等级 1 低 2 中 3 高*/
-    public ecpmLevel = 0;
-
     /** 标志位 刷新任务描述 */
     public init_task = false;
     /**
@@ -110,8 +107,7 @@ export class GameData {
         }
         this.adShowConfig = response.data;
         mk.console.logSingle("user/adShowConfig", response.data);
-        this.setEcpmLevel();
-        gData.adData.setPopClickTimes();
+        gData.adData.initEcpmData();
 
         data = {};
         response = await mk.http.sendData('welFare/getUserWelFareTaskInfo', data);
@@ -159,6 +155,23 @@ export class GameData {
         this.gameData.versioncfg = res_data.versioncfg;
         this.gameData.isFirstRedMoney = res_data.isFirstRedMoney;
         gData.adData.watchNumToday = res_data.dayVideoTimesForRedMoney == null ? 0 : res_data.dayVideoTimesForRedMoney;
+
+        mk.data.setTAUserID(gData.loginData.uin);
+
+        if (gData.loginData.isFirstIn) {
+            gData.loginData.isFirstIn = false;
+
+            mk.data.setTAEventRegister();
+            mk.data.sendDataEvent('ABTest', `触发${this.gameData.groupCode}方案`);
+
+            //注册时版本号
+            mk.data.setTAEventUserStr(0, 'regtime_app_id', gData.appData.appVersion);
+        }
+
+        //当前版本号
+        mk.data.setTAEventUserStr(0, 'now_app_id', gData.appData.appVersion);
+        //渠道号
+        mk.data.setTAEventUserStr(0, 'channel_id', gData.appData.umengChannel);
     }
 
     /**
@@ -393,7 +406,7 @@ export class GameData {
     firstCheckNext() {
         if (!this.hasFirstCheck && gData.pastureSystem.pastureIcons.length >= 3 && gData.factorySystem.factoryIcons.length >= 6) {
             this.hasFirstCheck = true;
-            gData.gameData.setNextProduct();
+            gData.gameData.setNextProduct(false);
         }
     }
 
@@ -406,7 +419,7 @@ export class GameData {
                 gData.farmSystem.btnMake();
                 gData.gameData.nextMake = null;
                 this.nextMake = null;
-                this.setNextProduct();
+                this.setNextProduct(false);
                 break;
             case 2:
                 gData.pastureSystem.btnMake();
@@ -861,22 +874,6 @@ export class GameData {
             }
         }
     }
-
-    /** 设置用户ecpm分级 */
-    private setEcpmLevel() {
-        let low = parseInt(gData.gameData.configs.ServerConfig.LowValueEcpm.split(',')[1]);
-        let medium = parseInt(gData.gameData.configs.ServerConfig.MediumValueEcpm.split(',')[1]);
-        let high = parseInt(gData.gameData.configs.ServerConfig.HighValueEcpm.split(',')[1]);
-        if (this.adShowConfig.average_ecpm <= low) {
-            this.ecpmLevel = 1;
-        }
-        else if (this.adShowConfig.average_ecpm <= medium) {
-            this.ecpmLevel = 2;
-        }
-        else {
-            this.ecpmLevel = 3;
-        }
-    }
 }
 
 /**
@@ -1038,6 +1035,9 @@ class PlayerProp {
 
     //农场等级
     gradeLevel = 6;
+
+    /** ABTest分组id */
+    groupCode = 0;
 }
 
 /**
@@ -1193,6 +1193,10 @@ export enum DataEventId {
     jarWithDrawal = "jarWithDrawal",
     /** 签到提现 */
     signWithDrawal = "signWithDrawal",
+    /** 激励视频ecpm */
+    ad_videoEcpm = 'ad_video',
+    /** 开屏ecpm */
+    ad_openEcpm = 'ad_open'
 }
 
 

assets/script/game/data/LoginData.ts

@@ -194,7 +194,6 @@ 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/game/game/AniControl.ts

@@ -4,48 +4,48 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class AniControl extends cc.Component {
 
-    @property({displayName: 'bird_1', type: cc.Animation})
+    @property({ displayName: 'bird_1', type: cc.Animation })
     private flyBird_1: cc.Animation = null;
 
-    @property({displayName: 'bird_2', type: cc.Animation})
+    @property({ displayName: 'bird_2', type: cc.Animation })
     private flyBird_2: cc.Animation = null;
 
-    @property({displayName: 'star_1', type: cc.Animation})
+    @property({ displayName: 'star_1', type: cc.Animation })
     private star_1: cc.Animation = null;
-    @property({displayName: 'star_2', type: cc.Animation})
+    @property({ displayName: 'star_2', type: cc.Animation })
     private star_2: cc.Animation = null;
-    @property({displayName: 'star_3', type: cc.Animation})
+    @property({ displayName: 'star_3', type: cc.Animation })
     private star_3: cc.Animation = null;
 
-    @property({displayName: 'dog', type: cc.Animation})
+    @property({ displayName: 'dog', type: cc.Animation })
     private dogMove: cc.Animation = null;
 
-    @property({displayName: 'duck', type: cc.Animation})
+    @property({ displayName: 'duck', type: cc.Animation })
     private moveDuck: cc.Animation = null;
 
-    @property({displayName: 'moveSheep', type: cc.Animation})
+    @property({ displayName: 'moveSheep', type: cc.Animation })
     private moveSheep: cc.Animation = null;
 
-    @property({displayName: 'sheep', type: cc.Animation})
+    @property({ displayName: 'sheep', type: cc.Animation })
     private sheep: cc.Animation = null;
 
-    @property({displayName: '红包按钮', type: cc.Node})
+    @property({ displayName: '红包按钮', type: cc.Node })
     private hb_btn: cc.Node = null;
 
     private starPos_1: cc.Vec2 = cc.Vec2.ZERO;
     private starPos_2: cc.Vec2 = cc.Vec2.ZERO;
     private starPos_3: cc.Vec2 = cc.Vec2.ZERO;
-    private time_1: number = 8; 
+    private time_1: number = 8;
     private time_2: number = 16;
     private time_3: number = 22;
     private isShow_1: boolean = false;
     private isShow_2: boolean = false;
     private isShow_3: boolean = false;
 
-    private sheepMoveEnd:boolean = false;
+    private sheepMoveEnd: boolean = false;
 
 
-    start(){     
+    start() {
         this.doFlyBirdLogic();
         //this.doStarLogic();
         this.doDogMoveLogic();
@@ -56,93 +56,85 @@ export default class AniControl extends cc.Component {
     private doFlyBirdLogic() {
 
         let time = mk.math.random(5, 15);
-        cc.tween(this.flyBird_1.node).delay(time).call(()=>{
+        cc.tween(this.flyBird_1.node).delay(time).call(() => {
             this.flyBird_1.node.active = true;
         }).start();
         this.flyBird_1.on('finished', this.flyBirdFinished_1, this);
 
 
         time = mk.math.random(5, 15);
-        cc.tween(this.flyBird_2.node).delay(time).call(()=>{
+        cc.tween(this.flyBird_2.node).delay(time).call(() => {
             this.flyBird_2.node.active = true;
         }).start();
         this.flyBird_2.on('finished', this.flyBirdFinished_2, this)
     }
 
-    private flyBirdFinished_1()
-    {
+    private flyBirdFinished_1() {
         let time = mk.math.random(5, 15);
         this.flyBird_1.node.active = false;
         cc.Tween.stopAllByTarget(this.flyBird_1.node);
-        cc.tween(this.flyBird_1.node).delay(time).call(()=>{
+        cc.tween(this.flyBird_1.node).delay(time).call(() => {
             this.flyBird_1.node.active = true;
             this.flyBird_1.play();
         }).start();
     }
 
-    private flyBirdFinished_2()
-    {
+    private flyBirdFinished_2() {
         let time = mk.math.random(5, 15);
         this.flyBird_2.node.active = false;
         cc.Tween.stopAllByTarget(this.flyBird_2.node);
-        cc.tween(this.flyBird_2.node).delay(time).call(()=>{
+        cc.tween(this.flyBird_2.node).delay(time).call(() => {
             this.flyBird_2.node.active = true;
             this.flyBird_2.play();
         }).start();
     }
 
-    private doStarLogic()
-    {
+    private doStarLogic() {
         this.starPos_1 = this.star_1.node.getPosition();
         this.starPos_2 = this.star_2.node.getPosition();
         this.starPos_3 = this.star_3.node.getPosition();
     }
 
-    private doDogMoveLogic()
-    {
+    private doDogMoveLogic() {
         let time = mk.math.random(5, 8);
-        cc.tween(this.dogMove.node).delay(time).call(()=>{
+        cc.tween(this.dogMove.node).delay(time).call(() => {
             this.dogMove.node.active = true;
             this.dogMove.play();
         }).start();
         this.dogMove.on('finished', this.moveDogFinished, this);
     }
 
-    private moveDogFinished()
-    {
+    private moveDogFinished() {
         let time = mk.math.random(5, 8);
         this.dogMove.node.active = false;
         this.dogMove.node.scaleX = 1;
         cc.Tween.stopAllByTarget(this.dogMove.node);
-        cc.tween(this.dogMove.node).delay(time).call(()=>{
+        cc.tween(this.dogMove.node).delay(time).call(() => {
             this.dogMove.node.active = true;
             this.dogMove.play();
         }).start();
     }
 
-    private doDuckMoveLogic()
-    {
+    private doDuckMoveLogic() {
         let time = mk.math.random(5, 8);
-        cc.tween(this.moveDuck.node).delay(time).call(()=>{
+        cc.tween(this.moveDuck.node).delay(time).call(() => {
             this.moveDuck.node.active = true;
             this.moveDuck.play();
         }).start();
         this.moveDuck.on('finished', this.moveDuckFinished, this);
     }
 
-    private moveDuckFinished(event)
-    {
+    private moveDuckFinished(event) {
         let time = mk.math.random(5, 8);
-        cc.tween(this.moveDuck.node).delay(time).call(()=>{
+        cc.tween(this.moveDuck.node).delay(time).call(() => {
             this.moveDuck.play();
         }).start();
     }
 
-    private doSheepMoveLogic()
-    {
+    private doSheepMoveLogic() {
         this.sheepMoveEnd = false;
         let time = mk.math.random(5, 8);
-        cc.tween(this.moveSheep.node).delay(time).call(()=>{
+        cc.tween(this.moveSheep.node).delay(time).call(() => {
             this.moveSheep.node.active = true;
             this.sheep.play('sheepMove');
             this.moveSheep.play();
@@ -150,8 +142,7 @@ export default class AniControl extends cc.Component {
         this.moveSheep.on('finished', this.moveSheepFinished, this);
     }
 
-    private moveSheepFinished(event)
-    {
+    private moveSheepFinished(event) {
         this.sheepMoveEnd = true;
         // let time = mk.math.random(5, 8);
         // cc.tween(this.moveSheep.node).delay(time).call(()=>{
@@ -159,16 +150,14 @@ export default class AniControl extends cc.Component {
         // }).start();
     }
 
-    private clickSheepBtn()  
-    {
-        if(this.sheepMoveEnd)
-        {
+    private clickSheepBtn() {
+        if (this.sheepMoveEnd) {
             mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
             this.sheepMoveEnd = false;
             this.hb_btn.active = false;
             this.moveSheep.node.active = false;
             let time = mk.math.random(5, 8);
-            cc.tween(this.moveSheep.node).delay(time).call(()=>{
+            cc.tween(this.moveSheep.node).delay(time).call(() => {
                 this.moveSheep.node.active = true;
                 this.sheep.play('sheepMove');
                 this.moveSheep.play();
@@ -194,7 +183,7 @@ export default class AniControl extends cc.Component {
     //             this.star_1.node.setPosition(this.starPos_1.subtract(cc.v2(p, p)));
     //             cc.tween(this.star_1.node).to(0.2, {opacity: 255}).start();
     //         }
-            
+
     //     }else{
     //         this.time_1 =  this.time_1-dt;
     //     }
@@ -215,7 +204,7 @@ export default class AniControl extends cc.Component {
     //             this.star_2.node.setPosition(this.starPos_2.subtract(cc.v2(p, p)));
     //             cc.tween(this.star_2.node).to(0.2, {opacity: 255}).start();
     //         }
-            
+
     //     }else{
     //         this.time_2 =  this.time_2-dt;
     //     }
@@ -236,35 +225,31 @@ export default class AniControl extends cc.Component {
     //             this.star_3.node.setPosition(this.starPos_3.subtract(cc.v2(p, p)));
     //             cc.tween(this.star_3.node).to(0.2, {opacity: 255}).start();
     //         }
-            
+
     //     }else{
     //         this.time_3 =  this.time_3-dt;
     //     }
     // }
 
-    private clickAnimalIconBtn(event, customEvenData)
-    {
+    private clickAnimalIconBtn(event, customEvenData) {
         mk.audio.playEffect("button");
-        if(customEvenData == 'bird_1')
-        {
+        if (customEvenData == 'bird_1') {
             this.flyBirdFinished_1();
-            mk.fly.PlayCoinAnim(1, 5, this.flyBird_1.node, '', ()=>{
+            mk.fly.PlayCoinAnim(1, 5, this.flyBird_1.node, '', () => {
 
                 console.log('--');
             }, 2);
-        }else if(customEvenData == 'bird_2')
-        {
+        } else if (customEvenData == 'bird_2') {
             this.flyBirdFinished_2();
-            mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, '', null,2);
-        }else if(customEvenData == 'dog')
-        {
+            mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, '', null, 2);
+        } else if (customEvenData == 'dog') {
             this.moveDogFinished();
-            mk.fly.PlayCoinAnim(1, 5, this.dogMove.node,'', null,2);
-        }else if(customEvenData == 'sheep')
-        {
+            mk.fly.PlayCoinAnim(1, 5, this.dogMove.node, '', null, 2);
+        } else if (customEvenData == 'sheep') {
             mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
             //mk.fly.PlayCoinAnim(1, 5, this.moveSheep.node);
         }
-        
+
+        gData.adData.checkShowFullInter(1);
     }
 }

assets/script/game/game/Game.ts

@@ -1,6 +1,5 @@
 import JsbSystem from "../../mk/system/JsbSystem";
-import { DataEventId, FarmState, GameProp, ProductType, VideoAdType } from "../data/GameData";
-import FunBtns from "./FunBtns";
+import { DataEventId, GameProp, ProductType, VideoAdType } from "../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 
@@ -62,7 +61,6 @@ export default class Game extends cc.Component {
   
 
     /** 是否开始增加次数倒计时 */
-    private leftTimesScheduleOn = false;
     private lastTimeSpan = 0;
     private span = 0;
 
@@ -267,14 +265,8 @@ export default class Game extends cc.Component {
                 this.lastTimeSpan = Date.now();
                 mk.storage.setStorage('lastTimeSpan', this.lastTimeSpan);
             }
-
-            // if (!this.leftTimesScheduleOn) {
-            //     this.schedule(this.onCount, 1);
-            // }
         }
         else {
-            // this.unschedule(this.onCount);
-            // this.leftTimesScheduleOn = false;
             this.lastTimeSpan = 0;
             mk.storage.setStorage('lastTimeSpan', this.lastTimeSpan);
         }

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -122,36 +122,30 @@ export default class BlessingBag extends cc.Component {
         }
 
         let isAllComplete = true;
-        for(let i = 0; i != data.welFareTaskList.length; ++i)
-        {
-            if(data.welFareTaskList[i].progressRate < 1)
-            {
+        for (let i = 0; i != data.welFareTaskList.length; ++i) {
+            if (data.welFareTaskList[i].progressRate < 1) {
                 isAllComplete = false;
-                break;            
+                break;
             }
         }
         //if(isAllComplete || data.leftVideoTimes <= 0)
-        if(isAllComplete)
-        {
+        if (isAllComplete) {
             this.video_btn.interactable = false;
             let cmp = this.video_btn.getComponent(SetGray);
-            if(cmp)
-            {
+            if (cmp) {
                 cmp.setGray(true);
             }
         }
         {
-            if(!this.video_btn.interactable)
-            {
+            if (!this.video_btn.interactable) {
                 this.video_btn.interactable = false;
                 let cmp = this.video_btn.getComponent(SetGray);
-                if(cmp)
-                {
+                if (cmp) {
                     cmp.setGray(true);
                 }
             }
         }
-                
+
         this.txtRemaindAdNum.string = "<color=#FDFCF5>今日剩余次数：</c><color=#FFE533>" + data.leftVideoTimes + "</color>";
         this.adIcon.active = data.isVideo != 1;
 
@@ -168,14 +162,13 @@ export default class BlessingBag extends cc.Component {
             }
             this.itemContent.emit('srollview-init', this.adrbArray);
 
-            cc.tween(this.node).delay(0.2).call(()=>{
+            cc.tween(this.node).delay(0.2).call(() => {
                 let allItem = this.tableview.getFrontPositionItemByCount(5);
-                
-                for(let i = 0; i != allItem.length; ++i)
-                {
+
+                for (let i = 0; i != allItem.length; ++i) {
                     allItem[i].active = true;
                     allItem[i].setPosition(allItem[i].position.x, allItem[i].position.y - 600);
-                    cc.tween(allItem[i]).delay(i*0.1).by(0.3, {y: 600}, cc.easeSineOut()).start();
+                    cc.tween(allItem[i]).delay(i * 0.1).by(0.3, { y: 600 }, cc.easeSineOut()).start();
                 }
             }).start();
         } else {
@@ -239,7 +232,7 @@ export default class BlessingBag extends cc.Component {
 
 
     Click_AdProgressBtn() {
-      
+
         mk.audio.playEffect("button");
         if (cc.sys.isNative && !gData.loginData.isAuth) {
             JsbSystem.WxAuth();
@@ -250,16 +243,16 @@ export default class BlessingBag extends cc.Component {
             gData.blessingBag.addProgress();
         } else {
             //if (gData.blessingBag.videoRbData.leftVideoTimes > 0) {
-                mk.ad.videoAdType = VideoAdType.Fudai;
-                mk.ad.watchAd((success: boolean) => {
-                    mk.console.log("watchAD:" + success);
-                    if (success) {
-                        gData.blessingBag.addProgress();
-                        //gData.adData.watchVideo(AdFun.bigCash)
-                    }
-                });
+            mk.ad.videoAdType = VideoAdType.Fudai;
+            mk.ad.watchAd((success: boolean) => {
+                mk.console.log("watchAD:" + success);
+                if (success) {
+                    gData.blessingBag.addProgress();
+                    //gData.adData.watchVideo(AdFun.bigCash)
+                }
+            });
             //} else {             
-                //mk.tip.pop('今日观看次数已用完');
+            //mk.tip.pop('今日观看次数已用完');
             //}
         }
         mk.audio.playEffect('button');
@@ -324,7 +317,7 @@ export default class BlessingBag extends cc.Component {
         this.canOpen = false;
 
         if (this.rbPanelType == 1) {
-           
+
             gData.cashPro.openCashPro(cashProType.blessing_bigCash, gData.blessingBag.bigRbNum)
         } else {
             //弹确认提现界面
@@ -366,6 +359,9 @@ export default class BlessingBag extends cc.Component {
 
     /** 点击关闭 */
     onClickClose() {
-        mk.ad.checkShowInterByChance();
+    }
+
+    onDisable() {
+        gData.adData.checkShowFullInter(4);
     }
 }

assets/script/game/module/gradeReward/GradeReward.ts

@@ -4,18 +4,18 @@ import { GradeRewardItem } from "./GradeRewardItem";
 
 const { ccclass, property } = cc._decorator;
 @ccclass
-export class GradeReward extends cc.Component{
+export class GradeReward extends cc.Component {
 
-    @property({displayName:"进度条", type: cc.Sprite})
+    @property({ displayName: "进度条", type: cc.Sprite })
     private sp_slider: cc.Sprite = null;
 
-    @property({displayName:"内容节点", type: cc.Node})
+    @property({ displayName: "内容节点", type: cc.Node })
     private node_content: cc.Node = null;
 
     @property(cc.Prefab)
     private node_child: cc.Prefab = null;
 
-    @property({displayName: '进度文本', type: cc.Label})
+    @property({ displayName: '进度文本', type: cc.Label })
     private lbl_progress: cc.Label[] = [];
 
     private gradeExp: number[] = [100, 200, 400, 700, 900];
@@ -23,16 +23,15 @@ export class GradeReward extends cc.Component{
 
     private gradeOffset: number[] = [0.11, 0.33, 0.56, 0.78, 1];
 
-    onLoad(){
+    onLoad() {
 
 
     }
 
-    start(){
-        for(let i = 5; i != 0; --i)
-        {
+    start() {
+        for (let i = 5; i != 0; --i) {
             let child = cc.instantiate(this.node_child);
-            let item = child.getComponent(GradeRewardItem);    
+            let item = child.getComponent(GradeRewardItem);
             item.id = i;
             item.lbl_value.string = "0.3元";
             item.lbl_grade.string = "LV:12";
@@ -41,65 +40,59 @@ export class GradeReward extends cc.Component{
         this.calulateExpAndShowUI();
     }
 
-    private calulateExpAndShowUI()
-    {
+    private calulateExpAndShowUI() {
         let curIndex = -1;
-        for(let i = 0; i != this.gradeExp.length; ++i)
-        {
-            if(this.curExp < this.gradeExp[i])
-            {
-                if(curIndex == -1)
-                {
+        for (let i = 0; i != this.gradeExp.length; ++i) {
+            if (this.curExp < this.gradeExp[i]) {
+                if (curIndex == -1) {
                     curIndex = i;
-                }else
-                {
+                } else {
                     this.lbl_progress[i].string = "0%";
                 }
-            }else
-            {
+            } else {
                 this.lbl_progress[i].string = "100%";
             }
         }
-        if(curIndex != -1)
-        {
+        if (curIndex != -1) {
             let remainExp = this.curExp;
-            for(let i = 0; i != curIndex; ++i)
-            {
+            for (let i = 0; i != curIndex; ++i) {
                 remainExp = this.curExp - this.gradeExp[i];
             }
-            let per = Math.floor(remainExp/this.gradeExp[curIndex] * 100);
+            let per = Math.floor(remainExp / this.gradeExp[curIndex] * 100);
             this.lbl_progress[curIndex].string = per + "%";
 
             let lastIndex = -1
             let lastPro = 0;
-            if(curIndex > 0)
-            {
-                lastIndex = curIndex-1;           
+            if (curIndex > 0) {
+                lastIndex = curIndex - 1;
             }
-            
+
             let offset = this.gradeOffset[curIndex];
-            if(lastIndex != -1)
-            {
+            if (lastIndex != -1) {
                 offset = offset - this.gradeOffset[lastIndex];
                 lastPro = this.gradeOffset[lastIndex];
             }
-            let pro = offset * per / 100;        
+            let pro = offset * per / 100;
 
             this.sp_slider.fillRange = lastPro + pro;
-        }else{
+        } else {
             this.sp_slider.fillRange = 1;
         }
 
     }
 
-    private clickVideoBtn(){
+    private clickVideoBtn() {
         mk.audio.playEffect("button");
 
         this.curExp += 30;
         this.calulateExpAndShowUI();
     }
 
-    private clickCloseBtn(){
+    private clickCloseBtn() {
         mk.audio.playEffect("closeButton");
     }
+
+    onDisable() {
+        gData.adData.checkShowFullInter(4);
+    }
 }

assets/script/game/module/guide/Guide.ts

@@ -191,11 +191,11 @@ export default class Guide extends cc.Component {
 
             if (this.crtGuide.tr_form == 1) {
                 this.node_head.node.active = true;
-                this.node_person.node.active = false;
+                // this.node_person.node.active = false;
             }
             else {
                 this.node_head.node.active = false;
-                this.node_person.node.active = true;
+                // this.node_person.node.active = true;
             }
 
             this.rich_dialog.string = this.crtGuide.dialog;

assets/script/game/module/moreGame/MoreGame.ts

@@ -56,6 +56,5 @@ export default class MoreGame extends cc.Component {
     }
     
     onClickClose() {
-        mk.ad.checkShowInterByChance();
     }
 }

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -8,75 +8,64 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class WalletCashOut extends cc.Component {
 
-    @property({displayName: '进度条', type: cc.Sprite})
+    @property({ displayName: '进度条', type: cc.Sprite })
     private sp_progress: cc.Sprite = null;
 
-    @property({displayName: '红包币', type: cc.Label})
+    @property({ displayName: '红包币', type: cc.Label })
     private lbl_redMoney: cc.Label = null;
-    @property({displayName: '金额', type: cc.Label})
+    @property({ displayName: '金额', type: cc.Label })
     private lbl_value: cc.Label = null;
-    @property({displayName: '提示', type: cc.Label})
+    @property({ displayName: '提示', type: cc.Label })
     private lbl_tip: cc.Label = null;
 
-    @property({displayName: '6个选择按钮', type: CheckButton})
+    @property({ displayName: '6个选择按钮', type: CheckButton })
     private check_button: CheckButton[] = [];
 
     private curChooseIndex: number = 0;
 
-    start(){
-        mk.ad.showNative(4);
-        
+    start() {
+        // mk.ad.showNative(4);
+
         let data = [{}, {}, {}, {}, {}, {}];
-        for(let i = 0; i != this.check_button.length; ++i)
-        {
-            if(i < data.length)
-            {
+        for (let i = 0; i != this.check_button.length; ++i) {
+            if (i < data.length) {
                 this.check_button[i].setShowUI(data[i]);
-            }else
-            {
+            } else {
                 this.check_button[i].setShowUI(null);
             }
         }
     }
 
-    private clickChooseBtn(event, customEvenData)
-    {
+    private clickChooseBtn(event, customEvenData) {
         mk.audio.playEffect('button');
 
         let id = parseInt(customEvenData);
-        if(id == this.curChooseIndex)
-        {
+        if (id == this.curChooseIndex) {
             return;
         }
-        
-        if(this.check_button[id].getIsCanNotChoose())
-        {
+
+        if (this.check_button[id].getIsCanNotChoose()) {
             return;
         }
 
         this.curChooseIndex = id;
 
-        for(let i = 0; i != this.check_button.length; ++i)
-        {
-            if(i == this.curChooseIndex)
-            {
+        for (let i = 0; i != this.check_button.length; ++i) {
+            if (i == this.curChooseIndex) {
                 this.check_button[i].setIsChoose(true);
-            }else
-            {
+            } else {
                 this.check_button[i].setIsChoose(false);
             }
         }
     }
 
-    private clickCashOutBtn()
-    {
+    private clickCashOutBtn() {
         mk.audio.playEffect("button");
 
         //this.check_button[this.curChooseIndex].setIsCanNotChoose();
     }
 
-    private clickAddProgressBtn()
-    {
+    private clickAddProgressBtn() {
         mk.audio.playEffect("button");
 
         mk.ad.videoAdType = VideoAdType.CashOutNoviceWelfare;
@@ -87,13 +76,12 @@ export default class WalletCashOut extends cc.Component {
             if (success) {
                 gData.adData.watchVideo(AdFun.cashOutNoviceWelfare);
 
-                mk.ad.destroyNativeAd();
+                // mk.ad.destroyNativeAd();
             }
         });
     }
 
-    private clickAddCashBtn()
-    {
+    private clickAddCashBtn() {
         mk.audio.playEffect("button");
 
         mk.ad.videoAdType = VideoAdType.CashOutNoviceWelfare;
@@ -104,19 +92,21 @@ export default class WalletCashOut extends cc.Component {
             if (success) {
                 gData.adData.watchVideo(AdFun.cashOutAddCash);
 
-                mk.ad.destroyNativeAd();
+                // mk.ad.destroyNativeAd();
             }
         });
 
     }
 
-    private clickEnoughCashOutBtn()
-    {
+    private clickEnoughCashOutBtn() {
         mk.audio.playEffect("button");
     }
 
-    private clickCloseBtn()
-    {
+    private clickCloseBtn() {
         mk.audio.playEffect("closeButton");
     }
+
+    onDisable() {
+        gData.adData.checkShowFullInter(4);
+    }
 }

assets/script/game/module/newNotice/NewNotice.ts

@@ -29,7 +29,7 @@ export default class NewNotice extends cc.Component {
     }
 
     private clickCloseBtn() {
-        gData.adData.checkShowFullInter(2);
+        gData.adData.checkShowFullInter(1);
     }
 
 }

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -32,12 +32,7 @@ export default class NewOpenRedBag extends cc.Component {
     }
 
     onEnable() {
-        if (Math.random() < 0.5) {
-            gData.adData.checkShowFullInter(3);
-        }
-        else {
-            gData.adData.checkShowFullInter(4);
-        }
+        gData.adData.checkPopInter();
 
         mk.ad.showBanner();
     }

assets/script/game/module/pigBank/PigBank.ts

@@ -109,7 +109,6 @@ export default class PigBank extends cc.Component {
 
     /** 点击关闭 */
     onClickClose() {
-        mk.ad.checkShowInterByChance();
     }
 
     onDestroy() {

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

@@ -79,7 +79,6 @@ export default class Reward extends cc.Component {
 
     start() {
         mk.ad.showBanner();
-        mk.ad.checkShowInterByChance();
 
         /** 盖子 */
         this.initLid();
@@ -88,12 +87,7 @@ export default class Reward extends cc.Component {
     }
 
     onEnable() {
-        if (Math.random() < 0.5) {
-            gData.adData.checkShowFullInter(3);
-        }
-        else {
-            gData.adData.checkShowFullInter(4);
-        }
+        gData.adData.checkPopInter();
 
         mk.ad.showBanner();
     }
@@ -290,6 +284,5 @@ export default class Reward extends cc.Component {
 
     onClickClose() {
         mk.ad.destoryBanner();
-        mk.ad.checkShowInterByChance();
     }
 }

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

@@ -134,6 +134,5 @@ export default class Setting extends cc.Component {
     onClickClose() {
         mk.audio.playEffect("closeButton");
         mk.ad.destroyNativeAd();
-        mk.ad.checkShowInterByChance();
     }
 }

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

@@ -156,6 +156,5 @@ export default class Sign extends cc.Component {
     onClickClose() {
         mk.audio.playEffect("closeButton");
         //mk.ad.destroyNativeAd();
-        //mk.ad.checkShowInterByChance();
     }
 }

assets/script/game/module/turntable/Turnable.ts

@@ -187,6 +187,5 @@ export default class Turnable extends cc.Component {
     }
 
     onClickClose() {
-        mk.ad.checkShowInterByChance();
     }
 }

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

@@ -66,7 +66,6 @@ export class ATRewardVideo extends zgSingleton {
             this.ifLoadShow = true;
             return;
         }
-        console.log("anythink === 播放广告 showAd ");
         this.ATRewardVideoJS.showAd();
     }
 
@@ -112,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();
     }
@@ -179,6 +197,7 @@ export class ATRewardVideo extends zgSingleton {
      */
     onReward(placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
+        console.log('onReward  ');
         this.canGet = true;
     }
 }

assets/script/mk/system/AdSystem.ts

@@ -207,30 +207,4 @@ export default class AdSystem {
         }
         this.adSdk.showInter(type);
     }
-
-    /**
-     * 根据几率检测弹出插屏
-     */
-    public checkShowInterByChance() {
-        if (!this.ifShowAd) {
-            return;
-        }
-
-        if (!gData.gameData.adShowConfig) {
-            return;
-        }
-
-        let chance = gData.gameData.configs.ServerConfig.interOpenChance;
-
-        if (Math.random() <= chance) {
-            let delay = Number(gData.gameData.configs.ServerConfig.interOpenDelayMin)
-                + Math.random() * (Number(gData.gameData.configs.ServerConfig.interOpenDelayMax) - Number(gData.gameData.configs.ServerConfig.interOpenDelayMin));
-            setTimeout(() => {
-                this.showInterAd(0);
-            }, delay * 1000);
-        }
-        else {
-            gData.moreGame.popMoreGamePopNode();
-        }
-    }
 }

assets/script/mk/system/DataSystem.ts

@@ -29,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 属性名
@@ -49,6 +61,13 @@ export default class DataSystem {
     }
 
     /**
+    * 设置人物uin
+    */
+    public setTAUserID(id: string) {
+        JsbSystem.setTAUserID(id);
+    }
+
+    /**
      * 星云打点
      */
     public sendXYEvent(eventId: string, des: string) {

assets/script/mk/system/GuideSystem.ts

@@ -8,7 +8,7 @@ import { OpenActionType } from "./UISystem";
 export default class GuideSystem {
 
     private crtGuideID: number;
-    public ui:cc.Node;
+    public ui: cc.Node;
 
     public open(id) {
         return;
@@ -16,7 +16,6 @@ export default class GuideSystem {
         //测试永远新手引导，永远第一关
         if (!cc.sys.isNative) {
             this.crtGuideID = 1;
-            gData.gameData.setProp(GameProp.levelNum, 0);
         }
         if (this.crtGuideID >= 9999) {
             mk.console.log("新手引导已做完");
@@ -28,18 +27,17 @@ export default class GuideSystem {
         }
         gData.guideData.crtID = id;
         this.crtGuideID = id;
-        mk.ui.openPanel("module/guide/guide",OpenActionType.normal,this.ui);
+        mk.ui.openPanel("module/guide/guide", OpenActionType.normal, this.ui);
         this.setGuideID(this.crtGuideID++);
     }
 
     /** 开启一个引导后直接默认已完成 */
     private setGuideID(id: number) {
-        let guide = gData.guideData.getGuidesByID(id);
         if (id == 2) {
             id = 9999;
-            mk.data.sendXYEvent("guide_end","新手引导结束");
+            mk.data.sendXYEvent("guide_end", "新手引导结束");
         }
-       
+
         gData.gameData.setProp(GameProp.guideID, id);
     }
 
@@ -63,7 +61,7 @@ export default class GuideSystem {
      * 当前是否正在引导
      * @returns 
      */
-    public isGuiding():boolean{
+    public isGuiding(): boolean {
         return mk.ui.getCurOnPanel("guide") != null;
     }
 }

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 属性名
@@ -349,6 +366,18 @@ export default class JsbSystem {
         }
     }
 
+    /** 设置人物uin到数数
+     * id  uin
+     */
+    public static setTAUserID(id: string) {
+        if (cc.sys.os == cc.sys.OS_ANDROID) {
+            this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAUserID", "(Ljava/lang/String;)V", id);
+        }
+        else if (cc.sys.os == cc.sys.OS_IOS) {
+
+        }
+    }
+
     /**
      * 微信授权
      * @description 微信SDK功能 CocosToJava
@@ -469,6 +498,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 */

build/jsb-link/assets/resources/import/26/26068860-88ac-4831-bc68-c16d9580de6b.json

@@ -1 +1 @@
-[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\r\nzhuanpan.png\r\nsize: 175,101\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\nbg\r\n  rotate: false\r\n  xy: 2, 2\r\n  size: 97, 97\r\n  orig: 97, 97\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan\r\n  rotate: false\r\n  xy: 101, 27\r\n  size: 72, 72\r\n  orig: 72, 72\r\n  offset: 0, 0\r\n  index: -1\r\nzhuanpan1\r\n  rotate: false\r\n  xy: 101, 2\r\n  size: 20, 23\r\n  orig: 21, 24\r\n  offset: 0, 1\r\n  index: -1\r\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["c7ezvvJ61MBLgInHwdxgS7"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"zhuanpan","\nzhuanpan.png\nsize: 175,101\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\nbg\n  rotate: false\n  xy: 2, 2\n  size: 97, 97\n  orig: 97, 97\n  offset: 0, 0\n  index: -1\nzhuanpan\n  rotate: false\n  xy: 101, 27\n  size: 72, 72\n  orig: 72, 72\n  offset: 0, 0\n  index: -1\nzhuanpan1\n  rotate: false\n  xy: 101, 2\n  size: 20, 23\n  orig: 21, 24\n  offset: 0, 1\n  index: -1\n",["zhuanpan.png"],{"skeleton":{"hash":"+YrprJEAGsqE0XVM+MfB1+ruwAQ","spine":"3.8.99","x":-48.5,"y":-48.5,"width":97,"height":97,"images":"","audio":""},"bones":[{"name":"root"},{"name":"bg","parent":"root","length":19.84,"rotation":90,"x":-1.22,"y":-41.77},{"name":"zhuanpan","parent":"bg","x":41.6,"y":-2,"scaleX":0.98,"scaleY":0.98}],"slots":[{"name":"bg","bone":"bg","attachment":"bg"},{"name":"zhuanpan","bone":"zhuanpan","attachment":"zhuanpan"},{"name":"zhuanpan1","bone":"root","attachment":"zhuanpan1"}],"skins":[{"name":"default","attachments":{"bg":{"bg":{"x":41.77,"y":-1.22,"rotation":-90,"width":97,"height":97}},"zhuanpan":{"zhuanpan":{"x":0.17,"y":0.78,"width":72,"height":72}},"zhuanpan1":{"zhuanpan1":{"x":1.82,"y":0.19,"width":21,"height":24}}}}],"animations":{"animation":{"bones":{"zhuanpan":{"rotate":[{"angle":-90},{"time":0.6667,"angle":-180},{"time":1.3333,"angle":90},{"time":2},{"time":2.6667,"angle":-90}]}}}}},[0]]],0,0,[0],[-1],[0]]

build/jsb-link/assets/resources/import/79/79de3169-75ed-43f8-abaf-8a5a9b38b727.json

@@ -1 +1 @@
-[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\r\nlight.png\r\nsize: 1382,1360\r\nformat: RGBA8888\r\nfilter: Linear,Linear\r\nrepeat: none\r\ndeng1\r\n  rotate: true\r\n  xy: 2, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng2\r\n  rotate: true\r\n  xy: 688, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\ndeng3\r\n  rotate: true\r\n  xy: 692, 2\r\n  size: 679, 688\r\n  orig: 683, 692\r\n  offset: 2, 2\r\n  index: -1\r\ndeng4\r\n  rotate: true\r\n  xy: 2, 683\r\n  size: 675, 684\r\n  orig: 683, 692\r\n  offset: 4, 4\r\n  index: -1\r\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]
+[1,["b3bts3M+lPULj/Fidt+oIR"],0,[["sp.SkeletonData",["_name","_atlasText","textureNames","_skeletonJson","textures"],-1,3]],[[0,0,1,2,3,4,5]],[[0,"light","\nlight.png\nsize: 1382,1360\nformat: RGBA8888\nfilter: Linear,Linear\nrepeat: none\ndeng1\n  rotate: true\n  xy: 2, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng2\n  rotate: true\n  xy: 688, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\ndeng3\n  rotate: true\n  xy: 692, 2\n  size: 679, 688\n  orig: 683, 692\n  offset: 2, 2\n  index: -1\ndeng4\n  rotate: true\n  xy: 2, 683\n  size: 675, 684\n  orig: 683, 692\n  offset: 4, 4\n  index: -1\n",["light.png"],{"skeleton":{"hash":"JohK5TUu0lUroLrlSwXiPn4dSGA","spine":"3.8.99","x":-341.5,"y":-346,"width":683,"height":692,"images":"C:/Users/jyh12059/Desktop/donghua/灯动画","audio":""},"bones":[{"name":"root"}],"slots":[{"name":"deng1","bone":"root","attachment":"deng4"}],"skins":[{"name":"default","attachments":{"deng1":{"deng1":{"width":683,"height":692},"deng2":{"width":683,"height":692},"deng3":{"width":683,"height":692},"deng4":{"width":683,"height":692}}}}],"animations":{"animation":{"slots":{"deng1":{"attachment":[{"name":"deng1"},{"time":0.1,"name":"deng2"},{"time":0.2,"name":"deng3"},{"time":0.3,"name":"deng4"},{"time":0.4,"name":"deng1"}]}}}}},[0]]],0,0,[0],[-1],[0]]

build/jsb-link/assets/resources/native/03/03be9c7c-fdd9-4b58-8468-91188bfb3d62.atlas

@@ -1,27 +1,27 @@
-
-zhuanpan.png
-size: 175,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-zhuanpan
-  rotate: false
-  xy: 101, 27
-  size: 72, 72
-  orig: 72, 72
-  offset: 0, 0
-  index: -1
-zhuanpan1
-  rotate: false
-  xy: 101, 2
-  size: 20, 23
-  orig: 21, 24
-  offset: 0, 1
-  index: -1
+
+zhuanpan.png
+size: 175,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+zhuanpan
+  rotate: false
+  xy: 101, 27
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
+zhuanpan1
+  rotate: false
+  xy: 101, 2
+  size: 20, 23
+  orig: 21, 24
+  offset: 0, 1
+  index: -1

build/jsb-link/assets/resources/native/03/03d9c064-1b11-47c4-97d4-4973c1d96697.atlas

@@ -1,34 +1,34 @@
-
-libao.png
-size: 234,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-lihe-1
-  rotate: false
-  xy: 101, 42
-  size: 78, 57
-  orig: 78, 57
-  offset: 0, 0
-  index: -1
-lihe-2
-  rotate: true
-  xy: 181, 26
-  size: 73, 51
-  orig: 74, 51
-  offset: 1, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 8
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+libao.png
+size: 234,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+lihe-1
+  rotate: false
+  xy: 101, 42
+  size: 78, 57
+  orig: 78, 57
+  offset: 0, 0
+  index: -1
+lihe-2
+  rotate: true
+  xy: 181, 26
+  size: 73, 51
+  orig: 74, 51
+  offset: 1, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 8
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

build/jsb-link/assets/resources/native/08/0885da9a-6ef6-466b-8fde-4348308101ee.atlas

@@ -1,34 +1,34 @@
-
-light.png
-size: 1382,1360
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-deng1
-  rotate: true
-  xy: 2, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng2
-  rotate: true
-  xy: 688, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
-deng3
-  rotate: true
-  xy: 692, 2
-  size: 679, 688
-  orig: 683, 692
-  offset: 2, 2
-  index: -1
-deng4
-  rotate: true
-  xy: 2, 683
-  size: 675, 684
-  orig: 683, 692
-  offset: 4, 4
-  index: -1
+
+light.png
+size: 1382,1360
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+deng1
+  rotate: true
+  xy: 2, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng2
+  rotate: true
+  xy: 688, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1
+deng3
+  rotate: true
+  xy: 692, 2
+  size: 679, 688
+  orig: 683, 692
+  offset: 2, 2
+  index: -1
+deng4
+  rotate: true
+  xy: 2, 683
+  size: 675, 684
+  orig: 683, 692
+  offset: 4, 4
+  index: -1

build/jsb-link/assets/resources/native/0e/0ea867d9-68b1-4e17-92cd-067791bfc76b.atlas

@@ -1,244 +1,244 @@
-
-pandan.png
-size: 1848,400
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-baoxiang
-  rotate: true
-  xy: 692, 162
-  size: 236, 191
-  orig: 236, 191
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 468, 147
-  size: 222, 251
-  orig: 222, 251
-  offset: 0, 0
-  index: -1
-ditan
-  rotate: false
-  xy: 1050, 2
-  size: 464, 164
-  orig: 464, 164
-  offset: 0, 0
-  index: -1
-dudou
-  rotate: true
-  xy: 1113, 238
-  size: 160, 129
-  orig: 162, 131
-  offset: 1, 1
-  index: -1
-erduo
-  rotate: true
-  xy: 310, 37
-  size: 361, 156
-  orig: 361, 156
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: true
-  xy: 566, 8
-  size: 137, 145
-  orig: 144, 154
-  offset: 5, 4
-  index: -1
-eye1-2
-  rotate: true
-  xy: 1244, 246
-  size: 152, 151
-  orig: 156, 158
-  offset: 2, 3
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1496, 169
-  size: 97, 110
-  orig: 99, 112
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: false
-  xy: 468, 37
-  size: 96, 108
-  orig: 98, 110
-  offset: 1, 1
-  index: -1
-eye2-3
-  rotate: false
-  xy: 1490, 268
-  size: 122, 130
-  orig: 124, 132
-  offset: 1, 1
-  index: -1
-eye3-1
-  rotate: false
-  xy: 1089, 171
-  size: 118, 59
-  orig: 120, 61
-  offset: 1, 1
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1209, 177
-  size: 101, 59
-  orig: 103, 61
-  offset: 1, 1
-  index: -1
-eye4-4
-  rotate: false
-  xy: 1516, 37
-  size: 122, 130
-  orig: 125, 132
-  offset: 2, 1
-  index: -1
-face
-  rotate: true
-  xy: 2, 21
-  size: 377, 306
-  orig: 377, 306
-  offset: 0, 0
-  index: -1
-jinbi
-  rotate: false
-  xy: 480, 12
-  size: 58, 23
-  orig: 59, 23
-  offset: 0, 0
-  index: -1
-jinbi1
-  rotate: false
-  xy: 1640, 113
-  size: 76, 55
-  orig: 76, 55
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: false
-  xy: 349, 10
-  size: 67, 25
-  orig: 70, 27
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 418, 12
-  size: 60, 23
-  orig: 62, 25
-  offset: 1, 1
-  index: -1
-naiping
-  rotate: false
-  xy: 833, 7
-  size: 215, 153
-  orig: 217, 155
-  offset: 1, 1
-  index: -1
-naizui
-  rotate: true
-  xy: 1608, 170
-  size: 96, 116
-  orig: 99, 118
-  offset: 1, 1
-  index: -1
-shou2
-  rotate: false
-  xy: 1397, 252
-  size: 91, 146
-  orig: 97, 148
-  offset: 1, 1
-  index: -1
-shou3
-  rotate: true
-  xy: 713, 6
-  size: 154, 118
-  orig: 156, 120
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 957, 168
-  size: 130, 60
-  orig: 133, 63
-  offset: 1, 2
-  index: -1
-tui1
-  rotate: false
-  xy: 1733, 65
-  size: 112, 96
-  orig: 114, 98
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: true
-  xy: 1614, 268
-  size: 130, 92
-  orig: 132, 94
-  offset: 1, 1
-  index: -1
-xing
-  rotate: true
-  xy: 310, 3
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
-youshou_1
-  rotate: false
-  xy: 957, 230
-  size: 77, 168
-  orig: 78, 174
-  offset: 0, 6
-  index: -1
-youshouzhang
-  rotate: true
-  xy: 1312, 168
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
-yy
-  rotate: true
-  xy: 885, 182
-  size: 216, 70
-  orig: 216, 70
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: true
-  xy: 1726, 163
-  size: 105, 120
-  orig: 115, 125
-  offset: 3, 4
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1640, 6
-  size: 105, 91
-  orig: 115, 96
-  offset: 3, 4
-  index: -1
-zui2-1
-  rotate: true
-  xy: 1708, 270
-  size: 128, 120
-  orig: 138, 125
-  offset: 5, 4
-  index: -1
-zuoshou_1
-  rotate: false
-  xy: 1036, 232
-  size: 75, 166
-  orig: 78, 174
-  offset: 3, 8
-  index: -1
-zuoshouzhang
-  rotate: true
-  xy: 1404, 174
-  size: 76, 90
-  orig: 76, 90
-  offset: 0, 0
-  index: -1
+
+pandan.png
+size: 1848,400
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+baoxiang
+  rotate: true
+  xy: 692, 162
+  size: 236, 191
+  orig: 236, 191
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 468, 147
+  size: 222, 251
+  orig: 222, 251
+  offset: 0, 0
+  index: -1
+ditan
+  rotate: false
+  xy: 1050, 2
+  size: 464, 164
+  orig: 464, 164
+  offset: 0, 0
+  index: -1
+dudou
+  rotate: true
+  xy: 1113, 238
+  size: 160, 129
+  orig: 162, 131
+  offset: 1, 1
+  index: -1
+erduo
+  rotate: true
+  xy: 310, 37
+  size: 361, 156
+  orig: 361, 156
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: true
+  xy: 566, 8
+  size: 137, 145
+  orig: 144, 154
+  offset: 5, 4
+  index: -1
+eye1-2
+  rotate: true
+  xy: 1244, 246
+  size: 152, 151
+  orig: 156, 158
+  offset: 2, 3
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1496, 169
+  size: 97, 110
+  orig: 99, 112
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: false
+  xy: 468, 37
+  size: 96, 108
+  orig: 98, 110
+  offset: 1, 1
+  index: -1
+eye2-3
+  rotate: false
+  xy: 1490, 268
+  size: 122, 130
+  orig: 124, 132
+  offset: 1, 1
+  index: -1
+eye3-1
+  rotate: false
+  xy: 1089, 171
+  size: 118, 59
+  orig: 120, 61
+  offset: 1, 1
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1209, 177
+  size: 101, 59
+  orig: 103, 61
+  offset: 1, 1
+  index: -1
+eye4-4
+  rotate: false
+  xy: 1516, 37
+  size: 122, 130
+  orig: 125, 132
+  offset: 2, 1
+  index: -1
+face
+  rotate: true
+  xy: 2, 21
+  size: 377, 306
+  orig: 377, 306
+  offset: 0, 0
+  index: -1
+jinbi
+  rotate: false
+  xy: 480, 12
+  size: 58, 23
+  orig: 59, 23
+  offset: 0, 0
+  index: -1
+jinbi1
+  rotate: false
+  xy: 1640, 113
+  size: 76, 55
+  orig: 76, 55
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: false
+  xy: 349, 10
+  size: 67, 25
+  orig: 70, 27
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 418, 12
+  size: 60, 23
+  orig: 62, 25
+  offset: 1, 1
+  index: -1
+naiping
+  rotate: false
+  xy: 833, 7
+  size: 215, 153
+  orig: 217, 155
+  offset: 1, 1
+  index: -1
+naizui
+  rotate: true
+  xy: 1608, 170
+  size: 96, 116
+  orig: 99, 118
+  offset: 1, 1
+  index: -1
+shou2
+  rotate: false
+  xy: 1397, 252
+  size: 91, 146
+  orig: 97, 148
+  offset: 1, 1
+  index: -1
+shou3
+  rotate: true
+  xy: 713, 6
+  size: 154, 118
+  orig: 156, 120
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 957, 168
+  size: 130, 60
+  orig: 133, 63
+  offset: 1, 2
+  index: -1
+tui1
+  rotate: false
+  xy: 1733, 65
+  size: 112, 96
+  orig: 114, 98
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: true
+  xy: 1614, 268
+  size: 130, 92
+  orig: 132, 94
+  offset: 1, 1
+  index: -1
+xing
+  rotate: true
+  xy: 310, 3
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1
+youshou_1
+  rotate: false
+  xy: 957, 230
+  size: 77, 168
+  orig: 78, 174
+  offset: 0, 6
+  index: -1
+youshouzhang
+  rotate: true
+  xy: 1312, 168
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1
+yy
+  rotate: true
+  xy: 885, 182
+  size: 216, 70
+  orig: 216, 70
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: true
+  xy: 1726, 163
+  size: 105, 120
+  orig: 115, 125
+  offset: 3, 4
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1640, 6
+  size: 105, 91
+  orig: 115, 96
+  offset: 3, 4
+  index: -1
+zui2-1
+  rotate: true
+  xy: 1708, 270
+  size: 128, 120
+  orig: 138, 125
+  offset: 5, 4
+  index: -1
+zuoshou_1
+  rotate: false
+  xy: 1036, 232
+  size: 75, 166
+  orig: 78, 174
+  offset: 3, 8
+  index: -1
+zuoshouzhang
+  rotate: true
+  xy: 1404, 174
+  size: 76, 90
+  orig: 76, 90
+  offset: 0, 0
+  index: -1

build/jsb-link/assets/resources/native/55/550608f2-0747-4d47-bbed-4bbe9f2fbd98.atlas

@@ -1,20 +1,20 @@
-
-skeleton.png
-size: 323,60
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-hb
-  rotate: false
-  xy: 250, 5
-  size: 71, 53
-  orig: 71, 53
-  offset: 0, 0
-  index: -1
-tuowei
-  rotate: false
-  xy: 2, 2
-  size: 246, 56
-  orig: 254, 58
-  offset: 2, 1
-  index: -1
+
+skeleton.png
+size: 323,60
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+hb
+  rotate: false
+  xy: 250, 5
+  size: 71, 53
+  orig: 71, 53
+  offset: 0, 0
+  index: -1
+tuowei
+  rotate: false
+  xy: 2, 2
+  size: 246, 56
+  orig: 254, 58
+  offset: 2, 1
+  index: -1

build/jsb-link/assets/resources/native/55/55cdcb24-b372-4ff3-b1a4-da14d081cf00.atlas

@@ -1,419 +1,419 @@
-
-loading.png
-size: 2017,1540
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bei
-  rotate: false
-  xy: 1959, 892
-  size: 49, 67
-  orig: 52, 70
-  offset: 2, 1
-  index: -1
-beijing
-  rotate: true
-  xy: 2, 786
-  size: 752, 1702
-  orig: 752, 1702
-  offset: 0, 0
-  index: -1
-bizi
-  rotate: true
-  xy: 1924, 438
-  size: 41, 39
-  orig: 43, 42
-  offset: 1, 2
-  index: -1
-caihong
-  rotate: false
-  xy: 2, 63
-  size: 712, 721
-  orig: 738, 735
-  offset: 14, 7
-  index: -1
-chengbao
-  rotate: true
-  xy: 1814, 213
-  size: 223, 190
-  orig: 230, 192
-  offset: 3, 1
-  index: -1
-chuan
-  rotate: false
-  xy: 1837, 12
-  size: 75, 63
-  orig: 77, 65
-  offset: 1, 1
-  index: -1
-er1
-  rotate: false
-  xy: 773, 7
-  size: 52, 52
-  orig: 54, 54
-  offset: 1, 1
-  index: -1
-er2
-  rotate: false
-  xy: 827, 10
-  size: 51, 49
-  orig: 53, 51
-  offset: 1, 1
-  index: -1
-eye1
-  rotate: true
-  xy: 1985, 131
-  size: 80, 30
-  orig: 80, 30
-  offset: 0, 0
-  index: -1
-eye2
-  rotate: true
-  xy: 1951, 105
-  size: 106, 32
-  orig: 108, 34
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 598, 33
-  size: 111, 28
-  orig: 113, 31
-  offset: 1, 2
-  index: -1
-head
-  rotate: true
-  xy: 1289, 16
-  size: 152, 110
-  orig: 154, 113
-  offset: 1, 2
-  index: -1
-kuzi
-  rotate: false
-  xy: 1401, 15
-  size: 95, 58
-  orig: 97, 61
-  offset: 1, 2
-  index: -1
-lang1
-  rotate: false
-  xy: 380, 18
-  size: 216, 43
-  orig: 224, 54
-  offset: 3, 4
-  index: -1
-lang2
-  rotate: false
-  xy: 1757, 77
-  size: 164, 24
-  orig: 170, 34
-  offset: 2, 3
-  index: -1
-lang3
-  rotate: true
-  xy: 1946, 1119
-  size: 174, 46
-  orig: 180, 52
-  offset: 4, 3
-  index: -1
-lang4
-  rotate: true
-  xy: 1946, 1295
-  size: 243, 53
-  orig: 251, 59
-  offset: 5, 3
-  index: -1
-mei1
-  rotate: false
-  xy: 1289, 2
-  size: 28, 12
-  orig: 32, 14
-  offset: 2, 1
-  index: -1
-mei2
-  rotate: false
-  xy: 130, 2
-  size: 28, 10
-  orig: 32, 12
-  offset: 2, 1
-  index: -1
-niao1
-  rotate: false
-  xy: 2, 2
-  size: 126, 59
-  orig: 126, 59
-  offset: 0, 0
-  index: -1
-san
-  rotate: false
-  xy: 1531, 438
-  size: 338, 346
-  orig: 338, 346
-  offset: 0, 0
-  index: -1
-sanying
-  rotate: false
-  xy: 716, 61
-  size: 259, 107
-  orig: 270, 121
-  offset: 8, 8
-  index: -1
-shatan
-  rotate: false
-  xy: 130, 14
-  size: 248, 47
-  orig: 248, 47
-  offset: 0, 0
-  index: -1
-shou1
-  rotate: false
-  xy: 919, 2
-  size: 28, 24
-  orig: 32, 27
-  offset: 2, 2
-  index: -1
-shou2-1
-  rotate: true
-  xy: 1959, 961
-  size: 32, 56
-  orig: 35, 59
-  offset: 1, 1
-  index: -1
-shou2-2
-  rotate: true
-  xy: 1965, 448
-  size: 31, 50
-  orig: 33, 54
-  offset: 1, 3
-  index: -1
-shou3
-  rotate: true
-  xy: 1871, 438
-  size: 41, 51
-  orig: 45, 54
-  offset: 2, 2
-  index: -1
-shou4
-  rotate: false
-  xy: 880, 19
-  size: 37, 40
-  orig: 39, 42
-  offset: 1, 1
-  index: -1
-shu1
-  rotate: true
-  xy: 1757, 103
-  size: 108, 192
-  orig: 108, 192
-  offset: 0, 0
-  index: -1
-shu2
-  rotate: false
-  xy: 1871, 607
-  size: 94, 204
-  orig: 94, 204
-  offset: 0, 0
-  index: -1
-shu3
-  rotate: true
-  xy: 977, 2
-  size: 166, 121
-  orig: 166, 121
-  offset: 0, 0
-  index: -1
-shu4
-  rotate: true
-  xy: 1530, 23
-  size: 196, 225
-  orig: 196, 225
-  offset: 0, 0
-  index: -1
-shu5
-  rotate: true
-  xy: 1531, 221
-  size: 215, 281
-  orig: 215, 281
-  offset: 0, 0
-  index: -1
-shu7
-  rotate: true
-  xy: 1923, 19
-  size: 82, 92
-  orig: 82, 92
-  offset: 0, 0
-  index: -1
-shu8
-  rotate: true
-  xy: 1414, 154
-  size: 100, 114
-  orig: 100, 114
-  offset: 0, 0
-  index: -1
-shugan1
-  rotate: false
-  xy: 1706, 1100
-  size: 238, 438
-  orig: 238, 438
-  offset: 0, 0
-  index: -1
-shuying
-  rotate: true
-  xy: 1414, 256
-  size: 528, 115
-  orig: 533, 125
-  offset: 2, 4
-  index: -1
-toufa
-  rotate: false
-  xy: 711, 20
-  size: 60, 39
-  orig: 60, 39
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1959, 836
-  size: 51, 54
-  orig: 51, 54
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: false
-  xy: 1959, 1071
-  size: 56, 46
-  orig: 56, 46
-  offset: 0, 0
-  index: -1
-tuoxie1
-  rotate: false
-  xy: 1498, 36
-  size: 28, 37
-  orig: 30, 40
-  offset: 1, 2
-  index: -1
-tuoxie2
-  rotate: false
-  xy: 919, 28
-  size: 40, 31
-  orig: 42, 34
-  offset: 1, 2
-  index: -1
-xie1
-  rotate: true
-  xy: 1959, 995
-  size: 74, 54
-  orig: 78, 56
-  offset: 2, 1
-  index: -1
-xie10
-  rotate: false
-  xy: 598, 2
-  size: 102, 29
-  orig: 108, 34
-  offset: 3, 3
-  index: -1
-xie2
-  rotate: true
-  xy: 1706, 788
-  size: 23, 32
-  orig: 23, 32
-  offset: 0, 0
-  index: -1
-xie3
-  rotate: true
-  xy: 1740, 788
-  size: 23, 31
-  orig: 23, 31
-  offset: 0, 0
-  index: -1
-xie4
-  rotate: false
-  xy: 1513, 115
-  size: 15, 17
-  orig: 18, 19
-  offset: 2, 1
-  index: -1
-xie5
-  rotate: false
-  xy: 961, 42
-  size: 14, 17
-  orig: 17, 20
-  offset: 1, 1
-  index: -1
-xie6
-  rotate: true
-  xy: 1513, 134
-  size: 18, 15
-  orig: 21, 17
-  offset: 2, 1
-  index: -1
-xie7
-  rotate: true
-  xy: 2001, 1520
-  size: 18, 14
-  orig: 21, 17
-  offset: 1, 1
-  index: -1
-xie8
-  rotate: false
-  xy: 1965, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 2, 1
-  index: -1
-xie9
-  rotate: false
-  xy: 1988, 438
-  size: 21, 8
-  orig: 24, 10
-  offset: 1, 1
-  index: -1
-xigua
-  rotate: false
-  xy: 1757, 17
-  size: 78, 58
-  orig: 80, 60
-  offset: 1, 1
-  index: -1
-yguang
-  rotate: false
-  xy: 716, 170
-  size: 696, 614
-  orig: 750, 627
-  offset: 0, 13
-  index: -1
-yifu
-  rotate: false
-  xy: 1401, 75
-  size: 110, 77
-  orig: 110, 84
-  offset: 0, 7
-  index: -1
-yingzi
-  rotate: false
-  xy: 1100, 6
-  size: 187, 162
-  orig: 191, 166
-  offset: 2, 2
-  index: -1
-yizi
-  rotate: false
-  xy: 1706, 813
-  size: 251, 285
-  orig: 255, 288
-  offset: 1, 2
-  index: -1
-zhuozi
-  rotate: true
-  xy: 1871, 481
-  size: 124, 116
-  orig: 126, 118
-  offset: 1, 1
-  index: -1
-zui
-  rotate: true
-  xy: 1985, 106
-  size: 23, 27
-  orig: 32, 30
-  offset: 5, 2
-  index: -1
+
+loading.png
+size: 2017,1540
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bei
+  rotate: false
+  xy: 1959, 892
+  size: 49, 67
+  orig: 52, 70
+  offset: 2, 1
+  index: -1
+beijing
+  rotate: true
+  xy: 2, 786
+  size: 752, 1702
+  orig: 752, 1702
+  offset: 0, 0
+  index: -1
+bizi
+  rotate: true
+  xy: 1924, 438
+  size: 41, 39
+  orig: 43, 42
+  offset: 1, 2
+  index: -1
+caihong
+  rotate: false
+  xy: 2, 63
+  size: 712, 721
+  orig: 738, 735
+  offset: 14, 7
+  index: -1
+chengbao
+  rotate: true
+  xy: 1814, 213
+  size: 223, 190
+  orig: 230, 192
+  offset: 3, 1
+  index: -1
+chuan
+  rotate: false
+  xy: 1837, 12
+  size: 75, 63
+  orig: 77, 65
+  offset: 1, 1
+  index: -1
+er1
+  rotate: false
+  xy: 773, 7
+  size: 52, 52
+  orig: 54, 54
+  offset: 1, 1
+  index: -1
+er2
+  rotate: false
+  xy: 827, 10
+  size: 51, 49
+  orig: 53, 51
+  offset: 1, 1
+  index: -1
+eye1
+  rotate: true
+  xy: 1985, 131
+  size: 80, 30
+  orig: 80, 30
+  offset: 0, 0
+  index: -1
+eye2
+  rotate: true
+  xy: 1951, 105
+  size: 106, 32
+  orig: 108, 34
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 598, 33
+  size: 111, 28
+  orig: 113, 31
+  offset: 1, 2
+  index: -1
+head
+  rotate: true
+  xy: 1289, 16
+  size: 152, 110
+  orig: 154, 113
+  offset: 1, 2
+  index: -1
+kuzi
+  rotate: false
+  xy: 1401, 15
+  size: 95, 58
+  orig: 97, 61
+  offset: 1, 2
+  index: -1
+lang1
+  rotate: false
+  xy: 380, 18
+  size: 216, 43
+  orig: 224, 54
+  offset: 3, 4
+  index: -1
+lang2
+  rotate: false
+  xy: 1757, 77
+  size: 164, 24
+  orig: 170, 34
+  offset: 2, 3
+  index: -1
+lang3
+  rotate: true
+  xy: 1946, 1119
+  size: 174, 46
+  orig: 180, 52
+  offset: 4, 3
+  index: -1
+lang4
+  rotate: true
+  xy: 1946, 1295
+  size: 243, 53
+  orig: 251, 59
+  offset: 5, 3
+  index: -1
+mei1
+  rotate: false
+  xy: 1289, 2
+  size: 28, 12
+  orig: 32, 14
+  offset: 2, 1
+  index: -1
+mei2
+  rotate: false
+  xy: 130, 2
+  size: 28, 10
+  orig: 32, 12
+  offset: 2, 1
+  index: -1
+niao1
+  rotate: false
+  xy: 2, 2
+  size: 126, 59
+  orig: 126, 59
+  offset: 0, 0
+  index: -1
+san
+  rotate: false
+  xy: 1531, 438
+  size: 338, 346
+  orig: 338, 346
+  offset: 0, 0
+  index: -1
+sanying
+  rotate: false
+  xy: 716, 61
+  size: 259, 107
+  orig: 270, 121
+  offset: 8, 8
+  index: -1
+shatan
+  rotate: false
+  xy: 130, 14
+  size: 248, 47
+  orig: 248, 47
+  offset: 0, 0
+  index: -1
+shou1
+  rotate: false
+  xy: 919, 2
+  size: 28, 24
+  orig: 32, 27
+  offset: 2, 2
+  index: -1
+shou2-1
+  rotate: true
+  xy: 1959, 961
+  size: 32, 56
+  orig: 35, 59
+  offset: 1, 1
+  index: -1
+shou2-2
+  rotate: true
+  xy: 1965, 448
+  size: 31, 50
+  orig: 33, 54
+  offset: 1, 3
+  index: -1
+shou3
+  rotate: true
+  xy: 1871, 438
+  size: 41, 51
+  orig: 45, 54
+  offset: 2, 2
+  index: -1
+shou4
+  rotate: false
+  xy: 880, 19
+  size: 37, 40
+  orig: 39, 42
+  offset: 1, 1
+  index: -1
+shu1
+  rotate: true
+  xy: 1757, 103
+  size: 108, 192
+  orig: 108, 192
+  offset: 0, 0
+  index: -1
+shu2
+  rotate: false
+  xy: 1871, 607
+  size: 94, 204
+  orig: 94, 204
+  offset: 0, 0
+  index: -1
+shu3
+  rotate: true
+  xy: 977, 2
+  size: 166, 121
+  orig: 166, 121
+  offset: 0, 0
+  index: -1
+shu4
+  rotate: true
+  xy: 1530, 23
+  size: 196, 225
+  orig: 196, 225
+  offset: 0, 0
+  index: -1
+shu5
+  rotate: true
+  xy: 1531, 221
+  size: 215, 281
+  orig: 215, 281
+  offset: 0, 0
+  index: -1
+shu7
+  rotate: true
+  xy: 1923, 19
+  size: 82, 92
+  orig: 82, 92
+  offset: 0, 0
+  index: -1
+shu8
+  rotate: true
+  xy: 1414, 154
+  size: 100, 114
+  orig: 100, 114
+  offset: 0, 0
+  index: -1
+shugan1
+  rotate: false
+  xy: 1706, 1100
+  size: 238, 438
+  orig: 238, 438
+  offset: 0, 0
+  index: -1
+shuying
+  rotate: true
+  xy: 1414, 256
+  size: 528, 115
+  orig: 533, 125
+  offset: 2, 4
+  index: -1
+toufa
+  rotate: false
+  xy: 711, 20
+  size: 60, 39
+  orig: 60, 39
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1959, 836
+  size: 51, 54
+  orig: 51, 54
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: false
+  xy: 1959, 1071
+  size: 56, 46
+  orig: 56, 46
+  offset: 0, 0
+  index: -1
+tuoxie1
+  rotate: false
+  xy: 1498, 36
+  size: 28, 37
+  orig: 30, 40
+  offset: 1, 2
+  index: -1
+tuoxie2
+  rotate: false
+  xy: 919, 28
+  size: 40, 31
+  orig: 42, 34
+  offset: 1, 2
+  index: -1
+xie1
+  rotate: true
+  xy: 1959, 995
+  size: 74, 54
+  orig: 78, 56
+  offset: 2, 1
+  index: -1
+xie10
+  rotate: false
+  xy: 598, 2
+  size: 102, 29
+  orig: 108, 34
+  offset: 3, 3
+  index: -1
+xie2
+  rotate: true
+  xy: 1706, 788
+  size: 23, 32
+  orig: 23, 32
+  offset: 0, 0
+  index: -1
+xie3
+  rotate: true
+  xy: 1740, 788
+  size: 23, 31
+  orig: 23, 31
+  offset: 0, 0
+  index: -1
+xie4
+  rotate: false
+  xy: 1513, 115
+  size: 15, 17
+  orig: 18, 19
+  offset: 2, 1
+  index: -1
+xie5
+  rotate: false
+  xy: 961, 42
+  size: 14, 17
+  orig: 17, 20
+  offset: 1, 1
+  index: -1
+xie6
+  rotate: true
+  xy: 1513, 134
+  size: 18, 15
+  orig: 21, 17
+  offset: 2, 1
+  index: -1
+xie7
+  rotate: true
+  xy: 2001, 1520
+  size: 18, 14
+  orig: 21, 17
+  offset: 1, 1
+  index: -1
+xie8
+  rotate: false
+  xy: 1965, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 2, 1
+  index: -1
+xie9
+  rotate: false
+  xy: 1988, 438
+  size: 21, 8
+  orig: 24, 10
+  offset: 1, 1
+  index: -1
+xigua
+  rotate: false
+  xy: 1757, 17
+  size: 78, 58
+  orig: 80, 60
+  offset: 1, 1
+  index: -1
+yguang
+  rotate: false
+  xy: 716, 170
+  size: 696, 614
+  orig: 750, 627
+  offset: 0, 13
+  index: -1
+yifu
+  rotate: false
+  xy: 1401, 75
+  size: 110, 77
+  orig: 110, 84
+  offset: 0, 7
+  index: -1
+yingzi
+  rotate: false
+  xy: 1100, 6
+  size: 187, 162
+  orig: 191, 166
+  offset: 2, 2
+  index: -1
+yizi
+  rotate: false
+  xy: 1706, 813
+  size: 251, 285
+  orig: 255, 288
+  offset: 1, 2
+  index: -1
+zhuozi
+  rotate: true
+  xy: 1871, 481
+  size: 124, 116
+  orig: 126, 118
+  offset: 1, 1
+  index: -1
+zui
+  rotate: true
+  xy: 1985, 106
+  size: 23, 27
+  orig: 32, 30
+  offset: 5, 2
+  index: -1

build/jsb-link/assets/resources/native/58/580216f6-a0b4-45df-89d5-849ddcb562f3.atlas

@@ -1,335 +1,335 @@
-
-chengnian.png
-size: 1609,780
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-01
-  rotate: true
-  xy: 1201, 339
-  size: 165, 273
-  orig: 165, 273
-  offset: 0, 0
-  index: -1
-03
-  rotate: true
-  xy: 1228, 506
-  size: 272, 291
-  orig: 272, 291
-  offset: 0, 0
-  index: -1
-04
-  rotate: false
-  xy: 2, 109
-  size: 356, 356
-  orig: 356, 356
-  offset: 0, 0
-  index: -1
-body
-  rotate: false
-  xy: 401, 269
-  size: 152, 196
-  orig: 152, 196
-  offset: 0, 0
-  index: -1
-erduo
-  rotate: false
-  xy: 814, 366
-  size: 385, 166
-  orig: 385, 166
-  offset: 0, 0
-  index: -1
-erji1
-  rotate: false
-  xy: 814, 534
-  size: 412, 244
-  orig: 414, 248
-  offset: 1, 3
-  index: -1
-erji2
-  rotate: false
-  xy: 434, 2
-  size: 80, 154
-  orig: 82, 157
-  offset: 1, 1
-  index: -1
-eye1-1
-  rotate: true
-  xy: 1232, 17
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: false
-  xy: 1469, 42
-  size: 73, 87
-  orig: 75, 89
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: false
-  xy: 660, 2
-  size: 109, 104
-  orig: 111, 106
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: false
-  xy: 771, 2
-  size: 109, 104
-  orig: 112, 106
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 1406, 37
-  size: 105, 61
-  orig: 107, 63
-  offset: 1, 1
-  index: -1
-eye2-2
-  rotate: true
-  xy: 1544, 39
-  size: 90, 61
-  orig: 92, 63
-  offset: 1, 1
-  index: -1
-eye3
-  rotate: false
-  xy: 1350, 209
-  size: 122, 128
-  orig: 127, 133
-  offset: 3, 2
-  index: -1
-eye3-2
-  rotate: false
-  xy: 1474, 196
-  size: 128, 128
-  orig: 132, 133
-  offset: 2, 2
-  index: -1
-eye4-1
-  rotate: false
-  xy: 2, 20
-  size: 337, 87
-  orig: 344, 98
-  offset: 2, 5
-  index: -1
-eye4-2
-  rotate: true
-  xy: 360, 194
-  size: 271, 39
-  orig: 274, 41
-  offset: 1, 1
-  index: -1
-face
-  rotate: false
-  xy: 447, 473
-  size: 365, 305
-  orig: 367, 307
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 962, 137
-  size: 153, 87
-  orig: 153, 87
-  offset: 0, 0
-  index: -1
-meimao1
-  rotate: true
-  xy: 360, 122
-  size: 70, 22
-  orig: 72, 24
-  offset: 1, 1
-  index: -1
-meimao2
-  rotate: false
-  xy: 1145, 27
-  size: 60, 21
-  orig: 62, 23
-  offset: 1, 1
-  index: -1
-shou-jita
-  rotate: false
-  xy: 1321, 42
-  size: 83, 100
-  orig: 86, 103
-  offset: 2, 2
-  index: -1
-shou-jita2
-  rotate: false
-  xy: 341, 2
-  size: 91, 105
-  orig: 94, 108
-  offset: 1, 1
-  index: -1
-shou-jita3
-  rotate: false
-  xy: 2, 467
-  size: 443, 311
-  orig: 445, 313
-  offset: 1, 1
-  index: -1
-shou-jita4
-  rotate: false
-  xy: 1232, 92
-  size: 87, 105
-  orig: 113, 111
-  offset: 1, 5
-  index: -1
-shou1
-  rotate: true
-  xy: 555, 243
-  size: 90, 171
-  orig: 98, 173
-  offset: 1, 1
-  index: -1
-shou10
-  rotate: true
-  xy: 728, 235
-  size: 98, 75
-  orig: 100, 77
-  offset: 1, 1
-  index: -1
-shou11
-  rotate: true
-  xy: 401, 158
-  size: 109, 152
-  orig: 112, 154
-  offset: 2, 1
-  index: -1
-shou12
-  rotate: false
-  xy: 1145, 50
-  size: 85, 147
-  orig: 85, 147
-  offset: 0, 0
-  index: -1
-shou2
-  rotate: false
-  xy: 1521, 639
-  size: 86, 139
-  orig: 97, 141
-  offset: 10, 1
-  index: -1
-shou3
-  rotate: false
-  xy: 1521, 498
-  size: 86, 139
-  orig: 96, 141
-  offset: 1, 1
-  index: -1
-shou4
-  rotate: false
-  xy: 1474, 131
-  size: 130, 63
-  orig: 132, 65
-  offset: 1, 1
-  index: -1
-shou5
-  rotate: false
-  xy: 555, 118
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou6
-  rotate: false
-  xy: 810, 241
-  size: 155, 123
-  orig: 155, 123
-  offset: 0, 0
-  index: -1
-shou7
-  rotate: true
-  xy: 967, 226
-  size: 138, 151
-  orig: 138, 151
-  offset: 0, 0
-  index: -1
-shou8
-  rotate: true
-  xy: 1198, 199
-  size: 138, 150
-  orig: 138, 150
-  offset: 0, 0
-  index: -1
-shou9
-  rotate: false
-  xy: 1476, 326
-  size: 123, 170
-  orig: 123, 170
-  offset: 0, 0
-  index: -1
-toufa
-  rotate: false
-  xy: 516, 7
-  size: 142, 109
-  orig: 142, 109
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 1120, 243
-  size: 76, 121
-  orig: 76, 121
-  offset: 0, 0
-  index: -1
-tui2
-  rotate: true
-  xy: 1350, 144
-  size: 63, 122
-  orig: 63, 122
-  offset: 0, 0
-  index: -1
-weijin1
-  rotate: false
-  xy: 1098, 10
-  size: 45, 125
-  orig: 45, 125
-  offset: 0, 0
-  index: -1
-weijin2
-  rotate: true
-  xy: 726, 335
-  size: 136, 82
-  orig: 139, 85
-  offset: 2, 2
-  index: -1
-yifu
-  rotate: false
-  xy: 555, 335
-  size: 169, 136
-  orig: 169, 136
-  offset: 0, 0
-  index: -1
-zui1-2
-  rotate: false
-  xy: 712, 108
-  size: 117, 125
-  orig: 133, 131
-  offset: 5, 5
-  index: -1
-zui1-2-2
-  rotate: false
-  xy: 882, 3
-  size: 117, 109
-  orig: 133, 112
-  offset: 5, 2
-  index: -1
-zui1-3
-  rotate: true
-  xy: 1001, 14
-  size: 121, 95
-  orig: 133, 101
-  offset: 5, 5
-  index: -1
-zui2-1
-  rotate: false
-  xy: 831, 114
-  size: 129, 125
-  orig: 158, 131
-  offset: 6, 5
-  index: -1
+
+chengnian.png
+size: 1609,780
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+01
+  rotate: true
+  xy: 1201, 339
+  size: 165, 273
+  orig: 165, 273
+  offset: 0, 0
+  index: -1
+03
+  rotate: true
+  xy: 1228, 506
+  size: 272, 291
+  orig: 272, 291
+  offset: 0, 0
+  index: -1
+04
+  rotate: false
+  xy: 2, 109
+  size: 356, 356
+  orig: 356, 356
+  offset: 0, 0
+  index: -1
+body
+  rotate: false
+  xy: 401, 269
+  size: 152, 196
+  orig: 152, 196
+  offset: 0, 0
+  index: -1
+erduo
+  rotate: false
+  xy: 814, 366
+  size: 385, 166
+  orig: 385, 166
+  offset: 0, 0
+  index: -1
+erji1
+  rotate: false
+  xy: 814, 534
+  size: 412, 244
+  orig: 414, 248
+  offset: 1, 3
+  index: -1
+erji2
+  rotate: false
+  xy: 434, 2
+  size: 80, 154
+  orig: 82, 157
+  offset: 1, 1
+  index: -1
+eye1-1
+  rotate: true
+  xy: 1232, 17
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: false
+  xy: 1469, 42
+  size: 73, 87
+  orig: 75, 89
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: false
+  xy: 660, 2
+  size: 109, 104
+  orig: 111, 106
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: false
+  xy: 771, 2
+  size: 109, 104
+  orig: 112, 106
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 1406, 37
+  size: 105, 61
+  orig: 107, 63
+  offset: 1, 1
+  index: -1
+eye2-2
+  rotate: true
+  xy: 1544, 39
+  size: 90, 61
+  orig: 92, 63
+  offset: 1, 1
+  index: -1
+eye3
+  rotate: false
+  xy: 1350, 209
+  size: 122, 128
+  orig: 127, 133
+  offset: 3, 2
+  index: -1
+eye3-2
+  rotate: false
+  xy: 1474, 196
+  size: 128, 128
+  orig: 132, 133
+  offset: 2, 2
+  index: -1
+eye4-1
+  rotate: false
+  xy: 2, 20
+  size: 337, 87
+  orig: 344, 98
+  offset: 2, 5
+  index: -1
+eye4-2
+  rotate: true
+  xy: 360, 194
+  size: 271, 39
+  orig: 274, 41
+  offset: 1, 1
+  index: -1
+face
+  rotate: false
+  xy: 447, 473
+  size: 365, 305
+  orig: 367, 307
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 962, 137
+  size: 153, 87
+  orig: 153, 87
+  offset: 0, 0
+  index: -1
+meimao1
+  rotate: true
+  xy: 360, 122
+  size: 70, 22
+  orig: 72, 24
+  offset: 1, 1
+  index: -1
+meimao2
+  rotate: false
+  xy: 1145, 27
+  size: 60, 21
+  orig: 62, 23
+  offset: 1, 1
+  index: -1
+shou-jita
+  rotate: false
+  xy: 1321, 42
+  size: 83, 100
+  orig: 86, 103
+  offset: 2, 2
+  index: -1
+shou-jita2
+  rotate: false
+  xy: 341, 2
+  size: 91, 105
+  orig: 94, 108
+  offset: 1, 1
+  index: -1
+shou-jita3
+  rotate: false
+  xy: 2, 467
+  size: 443, 311
+  orig: 445, 313
+  offset: 1, 1
+  index: -1
+shou-jita4
+  rotate: false
+  xy: 1232, 92
+  size: 87, 105
+  orig: 113, 111
+  offset: 1, 5
+  index: -1
+shou1
+  rotate: true
+  xy: 555, 243
+  size: 90, 171
+  orig: 98, 173
+  offset: 1, 1
+  index: -1
+shou10
+  rotate: true
+  xy: 728, 235
+  size: 98, 75
+  orig: 100, 77
+  offset: 1, 1
+  index: -1
+shou11
+  rotate: true
+  xy: 401, 158
+  size: 109, 152
+  orig: 112, 154
+  offset: 2, 1
+  index: -1
+shou12
+  rotate: false
+  xy: 1145, 50
+  size: 85, 147
+  orig: 85, 147
+  offset: 0, 0
+  index: -1
+shou2
+  rotate: false
+  xy: 1521, 639
+  size: 86, 139
+  orig: 97, 141
+  offset: 10, 1
+  index: -1
+shou3
+  rotate: false
+  xy: 1521, 498
+  size: 86, 139
+  orig: 96, 141
+  offset: 1, 1
+  index: -1
+shou4
+  rotate: false
+  xy: 1474, 131
+  size: 130, 63
+  orig: 132, 65
+  offset: 1, 1
+  index: -1
+shou5
+  rotate: false
+  xy: 555, 118
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou6
+  rotate: false
+  xy: 810, 241
+  size: 155, 123
+  orig: 155, 123
+  offset: 0, 0
+  index: -1
+shou7
+  rotate: true
+  xy: 967, 226
+  size: 138, 151
+  orig: 138, 151
+  offset: 0, 0
+  index: -1
+shou8
+  rotate: true
+  xy: 1198, 199
+  size: 138, 150
+  orig: 138, 150
+  offset: 0, 0
+  index: -1
+shou9
+  rotate: false
+  xy: 1476, 326
+  size: 123, 170
+  orig: 123, 170
+  offset: 0, 0
+  index: -1
+toufa
+  rotate: false
+  xy: 516, 7
+  size: 142, 109
+  orig: 142, 109
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 1120, 243
+  size: 76, 121
+  orig: 76, 121
+  offset: 0, 0
+  index: -1
+tui2
+  rotate: true
+  xy: 1350, 144
+  size: 63, 122
+  orig: 63, 122
+  offset: 0, 0
+  index: -1
+weijin1
+  rotate: false
+  xy: 1098, 10
+  size: 45, 125
+  orig: 45, 125
+  offset: 0, 0
+  index: -1
+weijin2
+  rotate: true
+  xy: 726, 335
+  size: 136, 82
+  orig: 139, 85
+  offset: 2, 2
+  index: -1
+yifu
+  rotate: false
+  xy: 555, 335
+  size: 169, 136
+  orig: 169, 136
+  offset: 0, 0
+  index: -1
+zui1-2
+  rotate: false
+  xy: 712, 108
+  size: 117, 125
+  orig: 133, 131
+  offset: 5, 5
+  index: -1
+zui1-2-2
+  rotate: false
+  xy: 882, 3
+  size: 117, 109
+  orig: 133, 112
+  offset: 5, 2
+  index: -1
+zui1-3
+  rotate: true
+  xy: 1001, 14
+  size: 121, 95
+  orig: 133, 101
+  offset: 5, 5
+  index: -1
+zui2-1
+  rotate: false
+  xy: 831, 114
+  size: 129, 125
+  orig: 158, 131
+  offset: 6, 5
+  index: -1

build/jsb-link/assets/resources/native/68/68c76a85-3cbb-4f0e-b98d-bb383ae73331.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

build/jsb-link/assets/resources/native/6c/6c81d684-e6d4-47f3-8c1d-4879a72ddbb7.atlas

@@ -1,251 +1,251 @@
-
-shaonian.png
-size: 1137,528
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-body
-  rotate: true
-  xy: 815, 368
-  size: 158, 173
-  orig: 158, 173
-  offset: 0, 0
-  index: -1
-dengpao
-  rotate: false
-  xy: 2, 3
-  size: 188, 230
-  orig: 201, 236
-  offset: 8, 1
-  index: -1
-erduo
-  rotate: false
-  xy: 387, 362
-  size: 426, 164
-  orig: 426, 164
-  offset: 0, 0
-  index: -1
-eye1-1
-  rotate: false
-  xy: 1057, 264
-  size: 76, 93
-  orig: 78, 95
-  offset: 1, 1
-  index: -1
-eye1-2
-  rotate: true
-  xy: 513, 135
-  size: 77, 92
-  orig: 79, 94
-  offset: 1, 1
-  index: -1
-eye1-3
-  rotate: true
-  xy: 510, 16
-  size: 117, 111
-  orig: 119, 113
-  offset: 1, 1
-  index: -1
-eye1-4
-  rotate: true
-  xy: 738, 178
-  size: 117, 111
-  orig: 120, 113
-  offset: 2, 1
-  index: -1
-eye2-1
-  rotate: true
-  xy: 731, 57
-  size: 114, 65
-  orig: 116, 68
-  offset: 1, 2
-  index: -1
-eye2-2
-  rotate: true
-  xy: 957, 66
-  size: 97, 65
-  orig: 99, 68
-  offset: 1, 2
-  index: -1
-face
-  rotate: false
-  xy: 2, 235
-  size: 383, 291
-  orig: 385, 293
-  offset: 1, 1
-  index: -1
-kuzi
-  rotate: false
-  xy: 355, 147
-  size: 156, 78
-  orig: 156, 78
-  offset: 0, 0
-  index: -1
-lingjin
-  rotate: true
-  xy: 869, 7
-  size: 57, 105
-  orig: 59, 107
-  offset: 1, 1
-  index: -1
-meimao1
-  rotate: false
-  xy: 798, 55
-  size: 69, 24
-  orig: 73, 26
-  offset: 2, 1
-  index: -1
-meimao2
-  rotate: true
-  xy: 780, 298
-  size: 62, 23
-  orig: 64, 25
-  offset: 1, 1
-  index: -1
-shou1-2
-  rotate: false
-  xy: 192, 123
-  size: 161, 110
-  orig: 161, 110
-  offset: 0, 0
-  index: -1
-shou2-2-copy
-  rotate: true
-  xy: 607, 173
-  size: 122, 129
-  orig: 122, 129
-  offset: 0, 0
-  index: -1
-shou3-2
-  rotate: true
-  xy: 387, 227
-  size: 94, 152
-  orig: 101, 154
-  offset: 1, 1
-  index: -1
-shou4-2
-  rotate: true
-  xy: 192, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou4-3
-  rotate: true
-  xy: 316, 2
-  size: 119, 122
-  orig: 119, 122
-  offset: 0, 0
-  index: -1
-shou5-1
-  rotate: false
-  xy: 1044, 179
-  size: 84, 83
-  orig: 86, 85
-  offset: 1, 1
-  index: -1
-shou5-2
-  rotate: false
-  xy: 798, 81
-  size: 85, 82
-  orig: 87, 85
-  offset: 1, 1
-  index: -1
-shou6-1
-  rotate: true
-  xy: 440, 18
-  size: 127, 68
-  orig: 129, 70
-  offset: 1, 1
-  index: -1
-shou6-2
-  rotate: true
-  xy: 885, 67
-  size: 96, 70
-  orig: 98, 72
-  offset: 1, 1
-  index: -1
-shou6-3
-  rotate: false
-  xy: 387, 323
-  size: 218, 37
-  orig: 220, 39
-  offset: 1, 1
-  index: -1
-shou6-4
-  rotate: true
-  xy: 623, 5
-  size: 40, 103
-  orig: 42, 105
-  offset: 1, 1
-  index: -1
-shou6-5
-  rotate: false
-  xy: 976, 3
-  size: 87, 61
-  orig: 89, 63
-  offset: 1, 1
-  index: -1
-shou7-1
-  rotate: true
-  xy: 607, 297
-  size: 63, 171
-  orig: 65, 173
-  offset: 1, 1
-  index: -1
-toufa
-  rotate: false
-  xy: 851, 165
-  size: 112, 93
-  orig: 112, 93
-  offset: 0, 0
-  index: -1
-tui1
-  rotate: false
-  xy: 541, 214
-  size: 64, 107
-  orig: 66, 109
-  offset: 1, 1
-  index: -1
-tui2
-  rotate: false
-  xy: 1024, 66
-  size: 61, 106
-  orig: 63, 108
-  offset: 1, 1
-  index: -1
-yifu
-  rotate: true
-  xy: 990, 359
-  size: 167, 145
-  orig: 168, 146
-  offset: 1, 1
-  index: -1
-zui1-2
-  rotate: false
-  xy: 851, 260
-  size: 101, 106
-  orig: 112, 112
-  offset: 4, 4
-  index: -1
-zui1-3
-  rotate: false
-  xy: 954, 277
-  size: 101, 80
-  orig: 112, 87
-  offset: 4, 5
-  index: -1
-zui1-4
-  rotate: true
-  xy: 965, 174
-  size: 101, 77
-  orig: 112, 84
-  offset: 4, 5
-  index: -1
-zui2-1
-  rotate: true
-  xy: 623, 47
-  size: 124, 106
-  orig: 134, 112
-  offset: 5, 4
-  index: -1
+
+shaonian.png
+size: 1137,528
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+body
+  rotate: true
+  xy: 815, 368
+  size: 158, 173
+  orig: 158, 173
+  offset: 0, 0
+  index: -1
+dengpao
+  rotate: false
+  xy: 2, 3
+  size: 188, 230
+  orig: 201, 236
+  offset: 8, 1
+  index: -1
+erduo
+  rotate: false
+  xy: 387, 362
+  size: 426, 164
+  orig: 426, 164
+  offset: 0, 0
+  index: -1
+eye1-1
+  rotate: false
+  xy: 1057, 264
+  size: 76, 93
+  orig: 78, 95
+  offset: 1, 1
+  index: -1
+eye1-2
+  rotate: true
+  xy: 513, 135
+  size: 77, 92
+  orig: 79, 94
+  offset: 1, 1
+  index: -1
+eye1-3
+  rotate: true
+  xy: 510, 16
+  size: 117, 111
+  orig: 119, 113
+  offset: 1, 1
+  index: -1
+eye1-4
+  rotate: true
+  xy: 738, 178
+  size: 117, 111
+  orig: 120, 113
+  offset: 2, 1
+  index: -1
+eye2-1
+  rotate: true
+  xy: 731, 57
+  size: 114, 65
+  orig: 116, 68
+  offset: 1, 2
+  index: -1
+eye2-2
+  rotate: true
+  xy: 957, 66
+  size: 97, 65
+  orig: 99, 68
+  offset: 1, 2
+  index: -1
+face
+  rotate: false
+  xy: 2, 235
+  size: 383, 291
+  orig: 385, 293
+  offset: 1, 1
+  index: -1
+kuzi
+  rotate: false
+  xy: 355, 147
+  size: 156, 78
+  orig: 156, 78
+  offset: 0, 0
+  index: -1
+lingjin
+  rotate: true
+  xy: 869, 7
+  size: 57, 105
+  orig: 59, 107
+  offset: 1, 1
+  index: -1
+meimao1
+  rotate: false
+  xy: 798, 55
+  size: 69, 24
+  orig: 73, 26
+  offset: 2, 1
+  index: -1
+meimao2
+  rotate: true
+  xy: 780, 298
+  size: 62, 23
+  orig: 64, 25
+  offset: 1, 1
+  index: -1
+shou1-2
+  rotate: false
+  xy: 192, 123
+  size: 161, 110
+  orig: 161, 110
+  offset: 0, 0
+  index: -1
+shou2-2-copy
+  rotate: true
+  xy: 607, 173
+  size: 122, 129
+  orig: 122, 129
+  offset: 0, 0
+  index: -1
+shou3-2
+  rotate: true
+  xy: 387, 227
+  size: 94, 152
+  orig: 101, 154
+  offset: 1, 1
+  index: -1
+shou4-2
+  rotate: true
+  xy: 192, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou4-3
+  rotate: true
+  xy: 316, 2
+  size: 119, 122
+  orig: 119, 122
+  offset: 0, 0
+  index: -1
+shou5-1
+  rotate: false
+  xy: 1044, 179
+  size: 84, 83
+  orig: 86, 85
+  offset: 1, 1
+  index: -1
+shou5-2
+  rotate: false
+  xy: 798, 81
+  size: 85, 82
+  orig: 87, 85
+  offset: 1, 1
+  index: -1
+shou6-1
+  rotate: true
+  xy: 440, 18
+  size: 127, 68
+  orig: 129, 70
+  offset: 1, 1
+  index: -1
+shou6-2
+  rotate: true
+  xy: 885, 67
+  size: 96, 70
+  orig: 98, 72
+  offset: 1, 1
+  index: -1
+shou6-3
+  rotate: false
+  xy: 387, 323
+  size: 218, 37
+  orig: 220, 39
+  offset: 1, 1
+  index: -1
+shou6-4
+  rotate: true
+  xy: 623, 5
+  size: 40, 103
+  orig: 42, 105
+  offset: 1, 1
+  index: -1
+shou6-5
+  rotate: false
+  xy: 976, 3
+  size: 87, 61
+  orig: 89, 63
+  offset: 1, 1
+  index: -1
+shou7-1
+  rotate: true
+  xy: 607, 297
+  size: 63, 171
+  orig: 65, 173
+  offset: 1, 1
+  index: -1
+toufa
+  rotate: false
+  xy: 851, 165
+  size: 112, 93
+  orig: 112, 93
+  offset: 0, 0
+  index: -1
+tui1
+  rotate: false
+  xy: 541, 214
+  size: 64, 107
+  orig: 66, 109
+  offset: 1, 1
+  index: -1
+tui2
+  rotate: false
+  xy: 1024, 66
+  size: 61, 106
+  orig: 63, 108
+  offset: 1, 1
+  index: -1
+yifu
+  rotate: true
+  xy: 990, 359
+  size: 167, 145
+  orig: 168, 146
+  offset: 1, 1
+  index: -1
+zui1-2
+  rotate: false
+  xy: 851, 260
+  size: 101, 106
+  orig: 112, 112
+  offset: 4, 4
+  index: -1
+zui1-3
+  rotate: false
+  xy: 954, 277
+  size: 101, 80
+  orig: 112, 87
+  offset: 4, 5
+  index: -1
+zui1-4
+  rotate: true
+  xy: 965, 174
+  size: 101, 77
+  orig: 112, 84
+  offset: 4, 5
+  index: -1
+zui2-1
+  rotate: true
+  xy: 623, 47
+  size: 124, 106
+  orig: 134, 112
+  offset: 5, 4
+  index: -1

build/jsb-link/assets/resources/native/73/73e6b261-caab-44c1-b678-2d31ea81e9e5.atlas

@@ -1,34 +1,34 @@
-
-yaoqing.png
-size: 162,135
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 36
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-hb1
-  rotate: false
-  xy: 101, 61
-  size: 59, 72
-  orig: 62, 75
-  offset: 0, 3
-  index: -1
-hb2
-  rotate: true
-  xy: 101, 8
-  size: 51, 59
-  orig: 52, 60
-  offset: 0, 1
-  index: -1
-xing
-  rotate: true
-  xy: 2, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+yaoqing.png
+size: 162,135
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 36
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+hb1
+  rotate: false
+  xy: 101, 61
+  size: 59, 72
+  orig: 62, 75
+  offset: 0, 3
+  index: -1
+hb2
+  rotate: true
+  xy: 101, 8
+  size: 51, 59
+  orig: 52, 60
+  offset: 0, 1
+  index: -1
+xing
+  rotate: true
+  xy: 2, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

build/jsb-link/assets/resources/native/79/79ff2dcd-4579-4a1a-9adc-f0c01bc9c945.atlas

@@ -1,27 +1,27 @@
-
-qiandao.png
-size: 182,105
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 6
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-qiandao
-  rotate: true
-  xy: 101, 2
-  size: 19, 42
-  orig: 19, 42
-  offset: 0, 0
-  index: -1
-qiandao1
-  rotate: true
-  xy: 101, 23
-  size: 80, 79
-  orig: 81, 80
-  offset: 1, 1
-  index: -1
+
+qiandao.png
+size: 182,105
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 6
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+qiandao
+  rotate: true
+  xy: 101, 2
+  size: 19, 42
+  orig: 19, 42
+  offset: 0, 0
+  index: -1
+qiandao1
+  rotate: true
+  xy: 101, 23
+  size: 80, 79
+  orig: 81, 80
+  offset: 1, 1
+  index: -1

build/jsb-link/assets/resources/native/8a/8a72d93b-a055-4bf4-86c5-7be5ddd02758.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 172,101
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 2
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai1
-  rotate: false
-  xy: 101, 9
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-zhu
-  rotate: true
-  xy: 101, 28
-  size: 71, 69
-  orig: 71, 69
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 172,101
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 2
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai1
+  rotate: false
+  xy: 101, 9
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+zhu
+  rotate: true
+  xy: 101, 28
+  size: 71, 69
+  orig: 71, 69
+  offset: 0, 0
+  index: -1

build/jsb-link/assets/resources/native/97/97d51e7c-adeb-454b-8c93-1975eaf64dd4.atlas

@@ -1,27 +1,27 @@
-
-pig.png
-size: 427,355
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-icon_hb
-  rotate: false
-  xy: 360, 270
-  size: 65, 83
-  orig: 65, 83
-  offset: 0, 0
-  index: -1
-xing
-  rotate: false
-  xy: 360, 231
-  size: 33, 37
-  orig: 35, 39
-  offset: 1, 1
-  index: -1
-zhu
-  rotate: false
-  xy: 2, 2
-  size: 356, 351
-  orig: 356, 351
-  offset: 0, 0
-  index: -1
+
+pig.png
+size: 427,355
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+icon_hb
+  rotate: false
+  xy: 360, 270
+  size: 65, 83
+  orig: 65, 83
+  offset: 0, 0
+  index: -1
+xing
+  rotate: false
+  xy: 360, 231
+  size: 33, 37
+  orig: 35, 39
+  offset: 1, 1
+  index: -1
+zhu
+  rotate: false
+  xy: 2, 2
+  size: 356, 351
+  orig: 356, 351
+  offset: 0, 0
+  index: -1

build/jsb-link/assets/resources/native/d2/d20d76d5-2805-46f5-97ed-c028f6f6b2cc.atlas

@@ -1,62 +1,62 @@
-
-skeleton.png
-size: 1386,710
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-1
-  rotate: true
-  xy: 1051, 233
-  size: 136, 131
-  orig: 145, 141
-  offset: 7, 4
-  index: -1
-2
-  rotate: true
-  xy: 355, 4
-  size: 350, 349
-  orig: 359, 359
-  offset: 5, 5
-  index: -1
-3
-  rotate: true
-  xy: 1048, 371
-  size: 337, 336
-  orig: 347, 348
-  offset: 6, 5
-  index: -1
-4
-  rotate: true
-  xy: 707, 367
-  size: 341, 339
-  orig: 350, 349
-  offset: 6, 5
-  index: -1
-5
-  rotate: true
-  xy: 2, 2
-  size: 352, 351
-  orig: 361, 362
-  offset: 5, 5
-  index: -1
-6
-  rotate: false
-  xy: 2, 356
-  size: 352, 352
-  orig: 359, 362
-  offset: 3, 5
-  index: -1
-7
-  rotate: false
-  xy: 356, 359
-  size: 349, 349
-  orig: 359, 362
-  offset: 5, 7
-  index: -1
-8
-  rotate: false
-  xy: 706, 11
-  size: 343, 346
-  orig: 351, 357
-  offset: 4, 5
-  index: -1
+
+skeleton.png
+size: 1386,710
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: true
+  xy: 1051, 233
+  size: 136, 131
+  orig: 145, 141
+  offset: 7, 4
+  index: -1
+2
+  rotate: true
+  xy: 355, 4
+  size: 350, 349
+  orig: 359, 359
+  offset: 5, 5
+  index: -1
+3
+  rotate: true
+  xy: 1048, 371
+  size: 337, 336
+  orig: 347, 348
+  offset: 6, 5
+  index: -1
+4
+  rotate: true
+  xy: 707, 367
+  size: 341, 339
+  orig: 350, 349
+  offset: 6, 5
+  index: -1
+5
+  rotate: true
+  xy: 2, 2
+  size: 352, 351
+  orig: 361, 362
+  offset: 5, 5
+  index: -1
+6
+  rotate: false
+  xy: 2, 356
+  size: 352, 352
+  orig: 359, 362
+  offset: 3, 5
+  index: -1
+7
+  rotate: false
+  xy: 356, 359
+  size: 349, 349
+  orig: 359, 362
+  offset: 5, 7
+  index: -1
+8
+  rotate: false
+  xy: 706, 11
+  size: 343, 346
+  orig: 351, 357
+  offset: 4, 5
+  index: -1

build/jsb-link/assets/resources/native/e7/e7f6e717-3b33-4873-8935-75a27a306cb3.atlas

@@ -1,13 +1,13 @@
-
-hb_star.png
-size: 18,20
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-xing
-  rotate: false
-  xy: 2, 2
-  size: 14, 16
-  orig: 16, 18
-  offset: 1, 1
-  index: -1
+
+hb_star.png
+size: 18,20
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+xing
+  rotate: false
+  xy: 2, 2
+  size: 14, 16
+  orig: 16, 18
+  offset: 1, 1
+  index: -1

build/jsb-link/assets/resources/native/f1/f1b77e26-c94e-4177-a84c-58e7e52c9a9b.atlas

@@ -1,34 +1,34 @@
-
-fudai.png
-size: 177,107
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-bg
-  rotate: false
-  xy: 2, 8
-  size: 97, 97
-  orig: 97, 97
-  offset: 0, 0
-  index: -1
-fudai
-  rotate: true
-  xy: 101, 36
-  size: 69, 74
-  orig: 70, 75
-  offset: 0, 1
-  index: -1
-fudai1
-  rotate: true
-  xy: 140, 8
-  size: 26, 17
-  orig: 26, 17
-  offset: 0, 0
-  index: -1
-xing
-  rotate: true
-  xy: 101, 2
-  size: 32, 37
-  orig: 36, 41
-  offset: 2, 2
-  index: -1
+
+fudai.png
+size: 177,107
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+bg
+  rotate: false
+  xy: 2, 8
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+fudai
+  rotate: true
+  xy: 101, 36
+  size: 69, 74
+  orig: 70, 75
+  offset: 0, 1
+  index: -1
+fudai1
+  rotate: true
+  xy: 140, 8
+  size: 26, 17
+  orig: 26, 17
+  offset: 0, 0
+  index: -1
+xing
+  rotate: true
+  xy: 101, 2
+  size: 32, 37
+  orig: 36, 41
+  offset: 2, 2
+  index: -1

build/jsb-link/assets/resources/native/fb/fb79aa84-27ed-4d27-8321-7f1e99585ade.atlas

@@ -1,27 +1,27 @@
-
-guanghuan.png
-size: 445,248
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-button_lq
-  rotate: false
-  xy: 248, 42
-  size: 195, 204
-  orig: 195, 204
-  offset: 0, 0
-  index: -1
-button_tv
-  rotate: false
-  xy: 248, 11
-  size: 27, 29
-  orig: 27, 29
-  offset: 0, 0
-  index: -1
-huan
-  rotate: false
-  xy: 2, 2
-  size: 244, 244
-  orig: 244, 244
-  offset: 0, 0
-  index: -1
+
+guanghuan.png
+size: 445,248
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+button_lq
+  rotate: false
+  xy: 248, 42
+  size: 195, 204
+  orig: 195, 204
+  offset: 0, 0
+  index: -1
+button_tv
+  rotate: false
+  xy: 248, 11
+  size: 27, 29
+  orig: 27, 29
+  offset: 0, 0
+  index: -1
+huan
+  rotate: false
+  xy: 2, 2
+  size: 244, 244
+  orig: 244, 244
+  offset: 0, 0
+  index: -1

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

@@ -12,5 +12,5 @@ MY_APP_NAME=\u5f00\u5fc3\u519c\u4e50\u56ed
 PACKAGE_NAME=com.aries.kxnly.mz
 VERSION_NAME=1.0.0
 VERSION_CODE=1
-TOPON="a6078f65457f6f,66b742dd0e502b64d783d9c66a9d30c4,b6078f6a006916,b6078f6ddebed2,b6078f6fe52b70,b6078f72ec4003,b6078f71eed53e,b6078f711d7007"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏
+TOPON="a6078f65457f6f,66b742dd0e502b64d783d9c66a9d30c4,b6078f6a006916,b6078f6ddebed2,b6078f6fe52b70,b6078f72ec4003,b6078f71eed53e,b6078f711d7007,b613180ff8bfea"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏
 APP_CONFIG_CODE="1.0.0"

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

@@ -16,6 +16,8 @@ import org.cocos2dx.javascript.thirdSdk.thinkingdata.TDSDKMgr;
 import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import com.aries.kxnly.mz.BuildConfig;
 import com.aries.kxnly.mz.wxapi.WXEntryActivity;
@@ -46,6 +48,11 @@ public class ThirdSdkMgr {
         WXEntryActivity.getInstance().startWxAuth(ThirdSdkMgr.appActivity);
     }
 
+    public static void setTAUserID(String id)
+    {
+        TDSDKMgr.getInstance().setTaUserID(id);
+    }
+
     /** 分享图 */
     public static  void sharePic()
     {
@@ -154,6 +161,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/thinkingdata/TDSDKMgr.java

@@ -12,6 +12,7 @@ import java.util.Locale;
 
 import cn.thinkingdata.android.TDConfig;
 import cn.thinkingdata.android.ThinkingAnalyticsSDK;
+import cn.thinkingdata.android.utils.TDConstants;
 
 public class TDSDKMgr {
 
@@ -41,6 +42,22 @@ public class TDSDKMgr {
         this.TDInstance = ThinkingAnalyticsSDK.sharedInstance(config);
     }
 
+    public void sendSuperRole(){
+        try {
+            JSONObject superProperties = new JSONObject();
+            superProperties.put(TDConstants.KEY_DEVICE_ID, TDInstance.getDeviceId());
+
+            TDInstance.setSuperProperties(superProperties);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setTaUserID(String id){
+//        TDInstance.identify(id);
+        TDInstance.login(id);
+    }
+
     public void setTAEvent(String eventID, String des) {
         if (this.TDInstance == null) {
             return;
@@ -56,6 +73,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(){
@@ -142,15 +174,4 @@ public class TDSDKMgr {
             }
         }
     }
-
-    public void sendSuperRole(){
-        try {
-            JSONObject superProperties = new JSONObject();
-            superProperties.put("device_id", TDInstance.getDeviceId());
-
-            TDInstance.setSuperProperties(superProperties);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
 }

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

@@ -258,7 +258,7 @@ return [ 2 ];
 });
 };
 e.prototype.onEnable = function() {
-Math.random() < .5 ? gData.adData.checkShowFullInter(3) : gData.adData.checkShowFullInter(4);
+gData.adData.checkPopInter();
 mk.ad.showBanner();
 };
 e.prototype.onDisable = function() {
@@ -954,19 +954,16 @@ ctor: function() {},
 init: function() {
 ATInterstitialJSSDK.setAdListener(this);
 },
-placementID: function() {
-return this.proxy.placementID();
-},
-hasAdReady: function() {
-if (null != this.proxy) return !!ATInterstitialJSSDK.hasAdReady(this.placementID());
+hasAdReady: function(t) {
+if (null != this.proxy) return !!ATInterstitialJSSDK.hasAdReady(t);
 },
-loadInter: function() {
-var t = {};
-t[ATInterstitialJSSDK.UseRewardedVideoAsInterstitial] = !1;
-ATInterstitialJSSDK.loadInterstitial(this.placementID(), t);
+loadInter: function(t) {
+var e = {};
+e[ATInterstitialJSSDK.UseRewardedVideoAsInterstitial] = !1;
+ATInterstitialJSSDK.loadInterstitial(t, e);
 },
-showInter: function() {
-ATInterstitialJSSDK.showAd(this.placementID());
+showInter: function(t) {
+ATInterstitialJSSDK.showAd(t);
 },
 onInterstitialAdLoaded: function(t) {
 null != this.proxy && this.proxy.onInterstitialAdLoaded(t);
@@ -1036,41 +1033,51 @@ this.ATInterstitialJS.init();
 if (this.interAdState == i.Unload) {
 this.loadInter(0);
 this.loadInter(1);
+this.loadInter(2);
 }
 };
-e.prototype.placementID = function() {
-if (0 == this.interAdType) {
-if (cc.sys.os === cc.sys.OS_IOS) return c.default.topon_inter_placementId;
-if (cc.sys.os === cc.sys.OS_ANDROID) return c.default.topon_inter_placementId;
-} else {
-if (cc.sys.os === cc.sys.OS_IOS) return c.default.topon_fullinter_placementId;
-if (cc.sys.os === cc.sys.OS_ANDROID) return c.default.topon_fullinter_placementId;
+e.prototype.getPlaceIDByType = function(t) {
+var e = "";
+switch (t) {
+case 0:
+e = c.default.topon_inter_placementId;
+break;
+
+case 1:
+e = c.default.topon_fullinter_placementId;
+break;
+
+case 2:
+e = c.default.topon_biginter_placementId;
 }
+return e;
 };
 e.prototype.checkPlacementIDType = function(t) {
 if (cc.sys.os === cc.sys.OS_IOS) {
 if (t == c.default.topon_inter_placementId) return 0;
 if (t == c.default.topon_fullinter_placementId) return 1;
+if (t == c.default.topon_biginter_placementId) return 2;
 } else if (cc.sys.os === cc.sys.OS_ANDROID) {
 if (t == c.default.topon_inter_placementId) return 0;
 if (t == c.default.topon_fullinter_placementId) return 1;
 }
 };
-e.prototype.hasAdReady = function() {
-return this.ATInterstitialJS.hasAdReady();
+e.prototype.hasAdReady = function(t) {
+return this.ATInterstitialJS.hasAdReady(this.getPlaceIDByType(t));
 };
 e.prototype.loadInter = function(t, e) {
 void 0 === e && (e = !1);
 this.ifLoadShow = e;
 this.interAdState = i.Loading;
-this.ATInterstitialJS.loadInter(t);
+var o = this.getPlaceIDByType(t);
+this.ATInterstitialJS.loadInter(o);
 };
 e.prototype.showInter = function(t) {
 if (this.interAdState == i.Show && t == this.interAdType) console.log("当前插屏类型正在展示"); else {
 this.interAdType = t;
-if (this.hasAdReady()) {
+if (this.hasAdReady(t)) {
 this.interAdState = i.Show;
-this.ATInterstitialJS.showInter(t);
+this.ATInterstitialJS.showInter(this.getPlaceIDByType(t));
 } else this.interAdState == i.Loading ? this.ifLoadShow = !0 : this.loadInter(t, !0);
 }
 };
@@ -1607,10 +1614,7 @@ this.ATRewardVideoJS.loadAd(gData.loginData.uin, "userDataKey");
 }
 };
 e.prototype.showAd = function() {
-if (this.reawardAdState == i.LoadSuccess) {
-console.log("anythink === 播放广告 showAd ");
-this.ATRewardVideoJS.showAd();
-} else {
+if (this.reawardAdState == i.LoadSuccess) this.ATRewardVideoJS.showAd(); else {
 this.loadAd();
 this.ifLoadShow = !0;
 }
@@ -1633,6 +1637,10 @@ gData.adData.updateADLog(4, t, o);
 gData.adData.updateData(t, o);
 mk.data.sendDataEvent(r.DataEventId.video_init, mk.ad.videoAdType);
 this.reawardAdState = i.Unload;
+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));
 };
 e.prototype.onRewardedVideoAdPlayEnd = function() {};
 e.prototype.onRewardedVideoAdPlayFailed = function(t, e, o) {
@@ -1653,6 +1661,7 @@ this.loadAd();
 };
 e.prototype.onRewardedVideoAdPlayClicked = function() {};
 e.prototype.onReward = function() {
+console.log("onReward  ");
 this.canGet = !0;
 };
 return e;
@@ -1848,6 +1857,7 @@ o.topon_inter_placementId = e[4];
 o.topon_native_placementId = e[5];
 o.topon_banner_placementId = e[7];
 e[8] && (o.topon_fullinter_placementId = e[8]);
+e[9] && (o.topon_biginter_placementId = e[9]);
 };
 e.prototype.showVideo = function() {
 console.log("===[ShowVideoAd] ", d.ATRewardVideo.getInstance().hasAdReady());
@@ -1896,6 +1906,7 @@ e.topon_inter_placementId = "b5f8fa77aa5262";
 e.topon_native_placementId = "b5f8fa77aa5262";
 e.topon_fullinter_placementId = "b6113813b876a1";
 e.topon_banner_placementId = "b5f8fa77aa5262";
+e.topon_biginter_placementId = "b5f8fa77aa5262";
 return o = i([ f ], e);
 }(s.zgSingleton));
 o.default = y;
@@ -2261,7 +2272,13 @@ this.publisher_revenue = "";
 this.precision = "";
 this.ecpm_level = "";
 this._watchNumToday = 0;
-this.fullInterShowStr = "";
+this.ecpmLevel = 0;
+this.AutoRedMoneyMap = new Map();
+this.TimingRedMoneyArr = [];
+this.ProductionButtonArr = [];
+this.FullScreenAdArr = [];
+this.ABCInsertAdPercentArr = [];
+this.ABCInsertAdArr = [];
 this.timeAd = 0;
 this.popClickTimes = 0;
 this.clickTimesAdd = 0;
@@ -2401,53 +2418,68 @@ ecpm_level: ""
 };
 mk.http.sendData("updateADLog", n);
 };
+t.prototype.initEcpmData = function() {
+gData.adData.setEcpmLevel();
+gData.adData.setPopClickTimes();
+this.TimingRedMoneyArr = gData.gameData.configs.ServerConfig.TimingRedMoney.split(",");
+this.ProductionButtonArr = gData.gameData.configs.ServerConfig.ProductionButton.split(",");
+this.FullScreenAdArr = gData.gameData.configs.ServerConfig.FullScreenAd.split(",");
+for (var t = gData.gameData.configs.ServerConfig.ABCInsertAdPercent.split(","), e = 0, o = 0; o < t.length; o++) {
+e += parseFloat(t[o]);
+this.ABCInsertAdPercentArr[o] = e;
+}
+this.ABCInsertAdArr = gData.gameData.configs.ServerConfig.ABCInsertAd.split(",");
+};
+t.prototype.setEcpmLevel = function() {
+this.ecpmLevel = 1;
+this.AutoRedMoneyMap.set(1, 20);
+};
 t.prototype.checkShowFullInter = function(t) {
 var e = this.getPerByEcpm();
 if (Math.random() < e) switch (t) {
 case 1:
-1 == gData.gameData.ecpmLevel && mk.ad.showInterAd(1);
-break;
-
-case 2:
+if (-1 == this.FullScreenAdArr.indexOf(this.ecpmLevel.toString())) return;
 mk.ad.showInterAd(1);
 break;
 
-case 3:
+case 2:
 var o = gData.gameData.configs.ServerConfig.AdDelay.split(","), n = parseFloat(o[0]), a = 1e3 * (n + (parseFloat(o[1]) - n) * Math.random());
 setTimeout(function() {
-mk.ad.showInterAd(1);
+mk.ad.showInterAd(2);
 }, a);
 break;
 
-case 4:
+case 3:
 var i = gData.gameData.configs.ServerConfig.AdDelay.split(","), r = parseFloat(i[0]), c = parseFloat(i[1]), s = 1e3 * (r + (c - r) * Math.random()), l = 1e3 * (r + (c - r) * Math.random());
 setTimeout(function() {
 mk.ad.showInterAd(0);
 setTimeout(function() {
-mk.ad.showInterAd(1);
+mk.ad.showInterAd(2);
 }, l);
 }, s);
+break;
+
+case 4:
+gData.moreGame.popMoreGamePopNode();
+}
+};
+t.prototype.checkPopInter = function() {
+if (-1 != this.ABCInsertAdArr.indexOf(this.ecpmLevel.toString())) {
+for (var t = Math.random(), e = this.ABCInsertAdPercentArr.length, o = 0, n = 0; n < e; n++) if (t <= this.ABCInsertAdPercentArr[n]) {
+o = n + 2;
+break;
+}
+this.checkShowFullInter(o);
 }
 };
 t.prototype.startPopRed = function(t) {
+if (-1 != this.TimingRedMoneyArr.indexOf(this.ecpmLevel.toString())) {
 this.timeAd += t;
-switch (gData.gameData.ecpmLevel) {
-case 1:
-if (this.timeAd >= 3e4) {
+var e = this.AutoRedMoneyMap.get(this.ecpmLevel);
+if (this.timeAd >= 1e3 * e) {
 this.timeAd = 0;
 mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
-break;
-
-case 2:
-if (this.timeAd >= 6e4) {
-this.timeAd = 0;
-mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
-}
-break;
-
-case 3:
-this.timeAd = 0;
 }
 };
 t.prototype.setPopClickTimes = function() {
@@ -2455,12 +2487,14 @@ var t = gData.gameData.configs.ServerConfig.ClickProduction.split(",");
 this.popClickTimes = r.default.rnd(parseInt(t[0]), parseInt(t[1]));
 };
 t.prototype.checkPopRed = function() {
+if (-1 != this.ProductionButtonArr.indexOf(this.ecpmLevel.toString())) {
 this.clickTimesAdd++;
 if (this.clickTimesAdd >= this.popClickTimes) {
 this.clickTimesAdd = 0;
 this.setPopClickTimes();
 Math.random() <= this.getPerByEcpm() && mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
+}
 };
 t.prototype.getPerByEcpm = function() {
 return .3;
@@ -2558,18 +2592,6 @@ this.ifShowAd && this.adSdk.destoryBanner();
 t.prototype.showInterAd = function(t) {
 this.ifShowAd && this.adSdk.showInter(t);
 };
-t.prototype.checkShowInterByChance = function() {
-var t = this;
-if (this.ifShowAd && gData.gameData.adShowConfig) {
-var e = gData.gameData.configs.ServerConfig.interOpenChance;
-if (Math.random() <= e) {
-var o = Number(gData.gameData.configs.ServerConfig.interOpenDelayMin) + Math.random() * (Number(gData.gameData.configs.ServerConfig.interOpenDelayMax) - Number(gData.gameData.configs.ServerConfig.interOpenDelayMin));
-setTimeout(function() {
-t.showInterAd(0);
-}, 1e3 * o);
-} else gData.moreGame.popMoreGamePopNode();
-}
-};
 return t;
 }();
 o.default = a;
@@ -2771,6 +2793,7 @@ mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, "", null, 2);
 this.moveDogFinished();
 mk.fly.PlayCoinAnim(1, 5, this.dogMove.node, "", null, 2);
 } else "sheep" == e && mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
+gData.adData.checkShowFullInter(1);
 };
 i([ s({
 displayName: "bird_1",
@@ -4519,8 +4542,9 @@ e.prototype.EditBox_End = function() {
 console.log("--\x3eInput：", this.inputBox.string);
 gData.blessingBag.adsource_id_value = this.inputBox.string;
 };
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
+e.prototype.onClickClose = function() {};
+e.prototype.onDisable = function() {
+gData.adData.checkShowFullInter(4);
 };
 i([ y(cc.Label) ], e.prototype, "txtBigNum", void 0);
 i([ y(cc.Label) ], e.prototype, "txtAddEft", void 0);
@@ -6518,12 +6542,19 @@ t.prototype.sendDataEvent = function(t, e) {
 console.log("===[DataSystem", t, e);
 t && e && n.default.sendEvent(t, e);
 };
+t.prototype.sendDataEventValue = function(t, e, o) {
+console.log("===[DataSystem", t, e, o);
+t && e && n.default.sendEventValue(t, e, o);
+};
 t.prototype.setTAEventUser = function(t, e, o) {
 n.default.setTAEventUser(t, e, o);
 };
 t.prototype.setTAEventUserStr = function(t, e, o) {
 n.default.setTAEventUserStr(t, e, o);
 };
+t.prototype.setTAUserID = function(t) {
+n.default.setTAUserID(t);
+};
 t.prototype.sendXYEvent = function(t, e) {
 if (t && e) {
 var o = {
@@ -7533,7 +7564,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.FactoryIcon = void 0;
-var s = t("../../game/data/GameData"), l = t("../view/ProductShow"), p = t("./FarmCountDown"), u = t("./IDHelper"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
+var s = t("../../game/data/GameData"), l = t("../map/MoveToCenter"), p = t("../view/ProductShow"), u = t("./FarmCountDown"), d = t("./IDHelper"), h = cc._decorator, f = h.ccclass, y = h.property, g = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -7555,7 +7586,7 @@ enumerable: !1,
 configurable: !0
 });
 e.prototype.onLoad = function() {
-var t = this.getComponent(u.IDHelper);
+var t = this.getComponent(d.IDHelper);
 this.configID = t.buildID;
 this.sortID = t.sortID;
 this.tab = gData.gameData.getTabByConfigID(this.configID);
@@ -7616,7 +7647,7 @@ case 1:
 t = n.sent();
 e = cc.instantiate(t);
 o = this.data.productID;
-e.getComponent(l.default).id = o;
+e.getComponent(p.default).id = o;
 e.parent = this.showGroup;
 n.label = 2;
 
@@ -7665,6 +7696,7 @@ this.data.state = s.FactroyState.Producting;
 this.data.productID = e.picture;
 this.data.growSpan = o;
 gData.gameData.setFactoryDataMap(this.configID, this.data);
+this.getComponent(l.MoveToCenter).move();
 gData.gameData.leftTimes--;
 gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
 gData.gameData.init_leftTimes = !0;
@@ -7691,26 +7723,27 @@ this.data.state = s.FactroyState.Empty;
 this.data.productID = 0;
 this.data.growSpan = 0;
 gData.gameData.setFactoryDataMap(this.configID, this.data);
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 };
-i([ f({
-type: p.FarmCountDown,
+i([ y({
+type: u.FarmCountDown,
 tooltip: "倒计时组件"
 }) ], e.prototype, "countDown", void 0);
-i([ f({
+i([ y({
 type: cc.Node,
 tooltip: "完成品展示节点"
 }) ], e.prototype, "showGroup", void 0);
-i([ f({
+i([ y({
 type: cc.Node,
 tooltip: "闲置动画"
 }) ], e.prototype, "idleAni", void 0);
-return i([ h ], e);
+return i([ f ], e);
 }(cc.Component);
-o.FactoryIcon = y;
+o.FactoryIcon = g;
 cc._RF.pop();
 }, {
 "../../game/data/GameData": "GameData",
+"../map/MoveToCenter": "MoveToCenter",
 "../view/ProductShow": "ProductShow",
 "./FarmCountDown": "FarmCountDown",
 "./IDHelper": "IDHelper"
@@ -8574,7 +8607,7 @@ this.data.state = s.FarmState.Empty;
 this.data.productID = 0;
 this.data.growSpan = 0;
 gData.gameData.setFarmDataMap(this.configID, this.data);
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 };
 e.prototype.plant = function(t) {
 return r(this, void 0, void 0, function() {
@@ -8582,10 +8615,15 @@ var e;
 return c(this, function(o) {
 switch (o.label) {
 case 0:
-if (this.state != s.FarmState.Empty || gData.farmSystem.plantIsRequesting) return [ 3, 2 ];
+if (this.state != s.FarmState.Empty) return [ 3, 2 ];
 this.plantID = t;
 gData.gameData.isProducting = !0;
+gData.farmSystem.currSelectFarm = this;
 this.plantIcon.node.active = !0;
+gData.gameData.leftTimes--;
+gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
+gData.gameData.init_leftTimes = !0;
+gData.adData.checkPopRed();
 e = this.plantIcon;
 return [ 4, mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame) ];
 
@@ -8593,11 +8631,6 @@ case 1:
 e.spriteFrame = o.sent();
 this.plantIcon.getComponent(cc.Animation).play();
 this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-gData.gameData.leftTimes--;
-gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
-gData.gameData.init_leftTimes = !0;
-gData.adData.checkPopRed();
-gData.gameData.isProducting = !1;
 o.label = 2;
 
 case 2:
@@ -8629,6 +8662,7 @@ this.data.state = s.FarmState.Growing;
 this.data.productID = this.plantID;
 this.data.growSpan = e;
 gData.gameData.setFarmDataMap(this.configID, this.data);
+gData.gameData.isProducting = !1;
 return [ 2 ];
 });
 });
@@ -9285,7 +9319,6 @@ function t() {
 this.farms = [];
 this._currSelectFarm = null;
 this.plantWindowIsOpening = !1;
-this.plantIsRequesting = !1;
 }
 Object.defineProperty(t.prototype, "currSelectFarm", {
 get: function() {
@@ -9305,15 +9338,17 @@ this.farms[t.sortID] = t;
 t.prototype.plant = function(t) {
 this.currSelectFarm && this.currSelectFarm.plant(t);
 };
-t.prototype.selectNextFarm = function() {
-var t = this.getCanPlantFarm();
-t && (this.currSelectFarm = t);
-return t;
+t.prototype.selectNextFarm = function(t) {
+void 0 === t && (t = !0);
+var e = this.getCanPlantFarm();
+e && (t ? this.currSelectFarm = e : this._currSelectFarm = e);
+return e;
 };
 t.prototype.getCanPlantFarm = function() {
 for (var t = 0; t < this.farms.length; t++) if (this.farms[t] != this.currSelectFarm && this.farms[t].data.state == a.FarmState.Empty) {
 gData.gameData.nextCanProduct = gData.gameData.getRandomPlantConfig();
 gData.gameData.nextMake = this.farms[t];
+mk.console.logSingle("getCanPlantFarm  ", this.farms[t].data);
 return this.farms[t];
 }
 return null;
@@ -10468,14 +10503,14 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), _ = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), O = t("./module/GuideData"), k = t("./module/GuideWeakData"), R = t("./ConfigData"), I = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), N = t("../../before/main/FarmSystem"), j = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), _ = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), P = t("./module/SettingData"), O = t("./module/GuideData"), k = t("./module/GuideWeakData"), I = t("./ConfigData"), R = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), N = t("../../before/main/FarmSystem"), j = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = function() {
 function t() {
 this.init();
 }
 t.prototype.init = function() {
 this.appData = new a.AppData();
 this.loginData = new c.LoginData();
-this.configData = new R.ConfigData();
+this.configData = new I.ConfigData();
 this.gameData = new i.GameData();
 this.wechatData = new l.WechatData();
 this.httpData = new r.HttpData();
@@ -10498,7 +10533,7 @@ this.blessingBag = new v.BlessingBagData();
 this.cashPro = new b.default();
 this.redCodeData = new w.default();
 this.redeem = new S.default();
-this.newCashUiData = new I.NewCashUIData();
+this.newCashUiData = new R.NewCashUIData();
 this.adUnlockData = new T.default();
 this.plantData = new C.default();
 this.harvestData = new j.default();
@@ -10843,7 +10878,6 @@ this.nextMake = null;
 this.nextType = 0;
 this.init_makeInfo = !1;
 this.isProducting = !1;
-this.ecpmLevel = 0;
 this.init_task = !1;
 this._farmMapRewardData = [];
 this._farmData = [];
@@ -10894,8 +10928,7 @@ case 3:
 if (0 != (e = o.sent()).errcode) return [ 2 ];
 this.adShowConfig = e.data;
 mk.console.logSingle("user/adShowConfig", e.data);
-this.setEcpmLevel();
-gData.adData.setPopClickTimes();
+gData.adData.initEcpmData();
 t = {};
 return [ 4, mk.http.sendData("welFare/getUserWelFareTaskInfo", t) ];
 
@@ -10937,6 +10970,15 @@ this.gameData.userTuCaoInfo = t.userTuCaoInfo;
 this.gameData.versioncfg = t.versioncfg;
 this.gameData.isFirstRedMoney = t.isFirstRedMoney;
 gData.adData.watchNumToday = null == t.dayVideoTimesForRedMoney ? 0 : t.dayVideoTimesForRedMoney;
+mk.data.setTAUserID(gData.loginData.uin);
+if (gData.loginData.isFirstIn) {
+gData.loginData.isFirstIn = !1;
+mk.data.setTAEventRegister();
+mk.data.sendDataEvent("ABTest", "触发" + this.gameData.groupCode + "方案");
+mk.data.setTAEventUserStr(0, "regtime_app_id", gData.appData.appVersion);
+}
+mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
+mk.data.setTAEventUserStr(0, "channel_id", gData.appData.umengChannel);
 };
 t.prototype.setProp = function(t, e) {
 return n(this, void 0, void 0, function() {
@@ -11087,18 +11129,20 @@ if (o[c].picture == n) break;
 var s = a[r.default.rnd(0, a.length - 1)];
 return this.getProductMap(s);
 };
-t.prototype.setNextProduct = function() {
-this.nextMake = null;
-if (gData.farmSystem.selectNextFarm()) this.nextType = 1; else if (gData.pastureSystem.nextPasture()) this.nextType = 2; else {
-var t = gData.factorySystem.nextFactory();
-this.nextType = t ? 3 : 0;
+t.prototype.setNextProduct = function(t) {
+void 0 === t && (t = !0);
+if (!this.nextMake) {
+if (gData.farmSystem.selectNextFarm(t)) this.nextType = 1; else if (gData.pastureSystem.nextPasture()) this.nextType = 2; else {
+var e = gData.factorySystem.nextFactory();
+this.nextType = e ? 3 : 0;
 }
 this.init_makeInfo = !0;
+}
 };
 t.prototype.firstCheckNext = function() {
 if (!this.hasFirstCheck && gData.pastureSystem.pastureIcons.length >= 3 && gData.factorySystem.factoryIcons.length >= 6) {
 this.hasFirstCheck = !0;
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 }
 };
 t.prototype.makeProduct = function() {
@@ -11109,17 +11153,23 @@ break;
 
 case 1:
 gData.farmSystem.btnMake();
-this.setNextProduct();
+gData.gameData.nextMake = null;
+this.nextMake = null;
+this.setNextProduct(!1);
 break;
 
 case 2:
 gData.pastureSystem.btnMake();
+gData.gameData.nextMake = null;
+this.nextMake = null;
 this.setNextProduct();
 gData.adData.checkPopRed();
 break;
 
 case 3:
 gData.factorySystem.btnMake();
+gData.gameData.nextMake = null;
+this.nextMake = null;
 this.setNextProduct();
 }
 };
@@ -11426,11 +11476,6 @@ this.setNextProduct();
 }
 }
 };
-t.prototype.setEcpmLevel = function() {
-var t = parseInt(gData.gameData.configs.ServerConfig.LowValueEcpm.split(",")[1]), e = parseInt(gData.gameData.configs.ServerConfig.MediumValueEcpm.split(",")[1]);
-parseInt(gData.gameData.configs.ServerConfig.HighValueEcpm.split(",")[1]);
-this.adShowConfig.average_ecpm <= t ? this.ecpmLevel = 1 : this.adShowConfig.average_ecpm <= e ? this.ecpmLevel = 2 : this.ecpmLevel = 3;
-};
 return t;
 }();
 o.GameData = c;
@@ -11472,6 +11517,7 @@ this.versioncfg = 0;
 this.userTuCaoInfo = 0;
 this.isFirstRedMoney = 0;
 this.gradeLevel = 6;
+this.groupCode = 0;
 }
 Object.defineProperty(t.prototype, "isSignInToday", {
 get: function() {
@@ -11598,6 +11644,8 @@ t.level = "level";
 t.commonWithDrawal = "commonWithDrawl";
 t.jarWithDrawal = "jarWithDrawal";
 t.signWithDrawal = "signWithDrawal";
+t.ad_videoEcpm = "ad_video";
+t.ad_openEcpm = "ad_open";
 })(o.DataEventId || (o.DataEventId = {}));
 (function(t) {
 t.Null = "";
@@ -11972,7 +12020,6 @@ e.lbl_leftTimes = null;
 e.lbl_task = null;
 e.node_taskHb = null;
 e.btn_product = null;
-e.leftTimesScheduleOn = !1;
 e.lastTimeSpan = 0;
 e.span = 0;
 return e;
@@ -12824,6 +12871,9 @@ this.calulateExpAndShowUI();
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
+e.prototype.onDisable = function() {
+gData.adData.checkShowFullInter(4);
+};
 i([ l({
 displayName: "进度条",
 type: cc.Sprite
@@ -13094,7 +13144,6 @@ var n = t("../../game/data/GameData"), a = (t("./UISystem"), function() {
 function t() {}
 t.prototype.open = function() {};
 t.prototype.setGuideID = function(t) {
-gData.guideData.getGuidesByID(t);
 if (2 == t) {
 t = 9999;
 mk.data.sendXYEvent("guide_end", "新手引导结束");
@@ -13538,13 +13587,7 @@ r = this.crtGuide.finger.split(":");
 this.node_finger.x = o + parseInt(r[0]);
 this.node_finger.y = n + parseInt(r[1]);
 }
-if (1 == this.crtGuide.tr_form) {
-this.node_head.node.active = !0;
-this.node_person.node.active = !1;
-} else {
-this.node_head.node.active = !1;
-this.node_person.node.active = !0;
-}
+1 == this.crtGuide.tr_form ? this.node_head.node.active = !0 : this.node_head.node.active = !1;
 this.rich_dialog.string = this.crtGuide.dialog;
 }
 };
@@ -14814,7 +14857,7 @@ return n;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var a = function() {
+var a = t("../../game/data/GameData"), i = function() {
 function t() {}
 t.isFileExist = function(t) {
 if (cc.sys.os == cc.sys.OS_WINDOWS) return !0;
@@ -14922,6 +14965,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, o) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "sendEventValue", "(Ljava/lang/String;Ljava/lang/String;F)V", t, e, o) : (cc.sys.os, 
+cc.sys.OS_IOS);
+};
 t.setTAEventUser = function(t, e, o) {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUser", "(ILjava/lang/String;F)V", t, e, o) : (cc.sys.os, 
 cc.sys.OS_IOS);
@@ -14930,6 +14977,10 @@ t.setTAEventUserStr = function(t, e, o) {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUserStr", "(ILjava/lang/String;Ljava/lang/String;)V", t, e, o) : (cc.sys.os, 
 cc.sys.OS_IOS);
 };
+t.setTAUserID = function(t) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAUserID", "(Ljava/lang/String;)V", t) : (cc.sys.os, 
+cc.sys.OS_IOS);
+};
 t.WxAuth = function() {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "WxAuth", "()V") : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WxAuth", "");
 };
@@ -14977,6 +15028,10 @@ return r;
 t.updateSplashAdLog = function(t) {
 var e = t.split("#"), o = JSON.parse(e[1]);
 gData.adData.updateADLog(6, e[0], o);
+var n = mk.storage.getStorage("ad_openEcpm");
+n ? n++ : n = 1;
+mk.storage.setStorage("ad_openEcpm", n);
+n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price) : n % 10 == 0 && mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price));
 };
 t.getAliRiskDeviceToken = function() {
 var t = "";
@@ -14987,10 +15042,12 @@ t._JSB_ANDROID_PATH = "org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr";
 t._JSB_IOS_PATH = "ThirdSdkMgr";
 return t;
 }();
-o.default = a;
-window.JsbMgr = a;
+o.default = i;
+window.JsbMgr = i;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../game/data/GameData": "GameData"
+} ],
 LoadResUtil: [ function(t, e, o) {
 "use strict";
 cc._RF.push(e, "027abfHullEcrlQpxOvHVc5", "LoadResUtil");
@@ -15463,7 +15520,6 @@ mk.storage.setStorage(i.StorageKey.loginTicket, this.loginTicket);
 if (null == mk.storage.getStorage(i.StorageKey.isFirstIn)) {
 this.isFirstIn = !0;
 mk.storage.setStorage(i.StorageKey.isFirstIn, 1);
-mk.data.setTAEventRegister();
 }
 if (this.uin != o.uin) {
 this.uin = o.uin;
@@ -16005,7 +16061,7 @@ this.mat_logo = this.sp.getMaterial(0);
 this.time = this.mat_logo.getProperty("sys_time", 0);
 };
 e.prototype.update = function() {
-this.time += .01;
+this.time += .02;
 this.mat_logo.getProperty("sys_time", 0);
 this.mat_logo.setProperty("sys_time", this.time);
 this.time >= 4 && (this.time = 0);
@@ -16247,13 +16303,13 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "component", {
 get: function() {
-return this._component || (this._component = new R());
+return this._component || (this._component = new I());
 },
 enumerable: !1,
 configurable: !0
 });
 return t;
-}(), R = function() {
+}(), I = function() {
 function t() {}
 Object.defineProperty(t.prototype, "setGray", {
 get: function() {
@@ -17702,9 +17758,7 @@ t.push(i);
 }
 this.node_sv.emit("srollview-init", t);
 };
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
-};
+e.prototype.onClickClose = function() {};
 i([ s(cc.Node) ], e.prototype, "node_sv", void 0);
 i([ s(cc.Prefab) ], e.prototype, "moreGameNormalNode", void 0);
 return i([ c ], e);
@@ -17983,7 +18037,7 @@ this.lbl_reward_value.string = "￥" + (gData.receiptNotice.receip_rmb / 100).to
 this.lbl_time.string = mk.time.getNowDayStringExtend();
 };
 e.prototype.clickCloseBtn = function() {
-gData.adData.checkShowFullInter(2);
+gData.adData.checkShowFullInter(1);
 };
 i([ s({
 displayName: "提现金额",
@@ -18044,7 +18098,7 @@ gData.turnable.adData = null;
 }
 };
 e.prototype.onEnable = function() {
-Math.random() < .5 ? gData.adData.checkShowFullInter(3) : gData.adData.checkShowFullInter(4);
+gData.adData.checkPopInter();
 mk.ad.showBanner();
 };
 e.prototype.onDisable = function() {
@@ -18463,7 +18517,7 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../game/data/GameData"), l = t("../view/Animals"), p = t("../view/ProductShow"), u = t("./FarmCountDown"), d = t("./IDHelper"), h = cc._decorator, f = h.ccclass, y = h.property, g = function(t) {
+var s = t("../../game/data/GameData"), l = t("../map/MoveToCenter"), p = t("../view/Animals"), u = t("../view/ProductShow"), d = t("./FarmCountDown"), h = t("./IDHelper"), f = cc._decorator, y = f.ccclass, g = f.property, _ = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -18494,7 +18548,7 @@ var t, e, o, n, a, i, r, s = this;
 return c(this, function(c) {
 switch (c.label) {
 case 0:
-t = this.getComponent(d.IDHelper);
+t = this.getComponent(h.IDHelper);
 this.configID = t.buildID;
 this.sortID = t.sortID;
 this.data = gData.gameData.getPastureDataMap(this.configID);
@@ -18517,7 +18571,7 @@ return n < 5 ? [ 4, mk.loader.load("game/prefab/paster_" + this.configID, cc.Pre
 case 2:
 a = c.sent();
 i = cc.instantiate(a);
-r = i.getComponent(l.default);
+r = i.getComponent(p.default);
 this.animalsArr.push(r);
 r.pointIndex = this.pastureData.getCanMoveIndex();
 i.setPosition(this.pastureData.getCanMoveIndexPoint(r.pointIndex));
@@ -18598,7 +18652,7 @@ case 1:
 t = n.sent();
 e = cc.instantiate(t);
 o = this.data.productID;
-e.getComponent(p.default).id = o;
+e.getComponent(u.default).id = o;
 e.parent = this.showGroup;
 n.label = 2;
 
@@ -18653,6 +18707,7 @@ this.data.productID = this.data.productID;
 this.data.growSpan = e;
 gData.gameData.setPastureDataMap(this.configID, this.data);
 this.eatNode.active = !1;
+this.getComponent(l.MoveToCenter).move();
 gData.gameData.leftTimes--;
 gData.gameData.setProp(s.GameProp.leftTimes, gData.gameData.leftTimes);
 gData.gameData.init_leftTimes = !0;
@@ -18676,34 +18731,35 @@ this.clean();
 this.data.state = s.PastureState.Empty;
 this.data.growSpan = 0;
 gData.gameData.setPastureDataMap(this.configID, this.data);
-gData.gameData.setNextProduct();
+gData.gameData.setNextProduct(!1);
 };
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "动物显示节点"
 }) ], e.prototype, "points", void 0);
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "动物喂食节点"
 }) ], e.prototype, "eatNode", void 0);
-i([ y({
-type: u.FarmCountDown,
+i([ g({
+type: d.FarmCountDown,
 tooltip: "倒计时组件"
 }) ], e.prototype, "countDown", void 0);
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "完成品展示节点"
 }) ], e.prototype, "showGroup", void 0);
-i([ y({
+i([ g({
 type: cc.Node,
 tooltip: "闲置动画"
 }) ], e.prototype, "idleAni", void 0);
-return i([ f ], e);
+return i([ y ], e);
 }(cc.Component);
-o.default = g;
+o.default = _;
 cc._RF.pop();
 }, {
 "../../game/data/GameData": "GameData",
+"../map/MoveToCenter": "MoveToCenter",
 "../view/Animals": "Animals",
 "../view/ProductShow": "ProductShow",
 "./FarmCountDown": "FarmCountDown",
@@ -19131,9 +19187,7 @@ return [ 2 ];
 });
 });
 };
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
-};
+e.prototype.onClickClose = function() {};
 e.prototype.onDestroy = function() {
 if (1 === gData.gameData.getProp(l.GameProp.isAutoOpenPanel)) {
 !gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay() && mk.ui.openPanel("module/sign/sign");
@@ -19412,10 +19466,7 @@ return [ 2 ];
 });
 };
 e.prototype.clickMake = function() {
-var t = this;
-Math.random() < .5 ? mk.ad.watchAd(function(e) {
-e && (t.data.tab == l.ProductType.nzw ? gData.farmSystem.plant(t.data.picture) : gData.factorySystem.make(t.data.picture));
-}) : this.data.tab == l.ProductType.nzw ? gData.farmSystem.plant(this.data.picture) : gData.factorySystem.make(this.data.picture);
+this.data.tab == l.ProductType.nzw ? gData.farmSystem.plant(this.data.picture) : gData.factorySystem.make(this.data.picture);
 };
 e.prototype.getDesByType = function() {
 var t = "";
@@ -22240,12 +22291,11 @@ this.lbl_reward_num.string = "x0";
 };
 e.prototype.start = function() {
 mk.ad.showBanner();
-mk.ad.checkShowInterByChance();
 this.initLid();
 this.initCashOutStyle(gData.gameData.gameData.redMoney);
 };
 e.prototype.onEnable = function() {
-Math.random() < .5 ? gData.adData.checkShowFullInter(3) : gData.adData.checkShowFullInter(4);
+gData.adData.checkPopInter();
 mk.ad.showBanner();
 };
 e.prototype.onDisable = function() {
@@ -22394,7 +22444,6 @@ this.cur_stage === s.none && mk.audio.playEffect("rewardClose");
 };
 e.prototype.onClickClose = function() {
 mk.ad.destoryBanner();
-mk.ad.checkShowInterByChance();
 };
 i([ h({
 displayName: "红包类型",
@@ -23161,7 +23210,6 @@ e.prototype.onDestroy = function() {};
 e.prototype.onClickClose = function() {
 mk.audio.playEffect("closeButton");
 mk.ad.destroyNativeAd();
-mk.ad.checkShowInterByChance();
 };
 i([ d({
 type: cc.Sprite,
@@ -26500,9 +26548,7 @@ this.playOver();
 }
 };
 e.prototype.onDestroy = function() {};
-e.prototype.onClickClose = function() {
-mk.ad.checkShowInterByChance();
-};
+e.prototype.onClickClose = function() {};
 i([ f(cc.Node) ], e.prototype, "node_turn", void 0);
 i([ f(cc.Node) ], e.prototype, "node_items", void 0);
 i([ f(cc.Node) ], e.prototype, "btn_draw", void 0);
@@ -27566,7 +27612,6 @@ e.curChooseIndex = 0;
 return e;
 }
 e.prototype.start = function() {
-mk.ad.showNative(4);
 for (var t = [ {}, {}, {}, {}, {}, {} ], e = 0; e != this.check_button.length; ++e) e < t.length ? this.check_button[e].setShowUI(t[e]) : this.check_button[e].setShowUI(null);
 };
 e.prototype.clickChooseBtn = function(t, e) {
@@ -27585,10 +27630,7 @@ mk.audio.playEffect("button");
 mk.ad.videoAdType = c.VideoAdType.CashOutNoviceWelfare;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-if (t) {
-gData.adData.watchVideo(r.AdFun.cashOutNoviceWelfare);
-mk.ad.destroyNativeAd();
-}
+t && gData.adData.watchVideo(r.AdFun.cashOutNoviceWelfare);
 });
 };
 e.prototype.clickAddCashBtn = function() {
@@ -27596,10 +27638,7 @@ mk.audio.playEffect("button");
 mk.ad.videoAdType = c.VideoAdType.CashOutNoviceWelfare;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-if (t) {
-gData.adData.watchVideo(r.AdFun.cashOutAddCash);
-mk.ad.destroyNativeAd();
-}
+t && gData.adData.watchVideo(r.AdFun.cashOutAddCash);
 });
 };
 e.prototype.clickEnoughCashOutBtn = function() {
@@ -27608,6 +27647,9 @@ mk.audio.playEffect("button");
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
+e.prototype.onDisable = function() {
+gData.adData.checkShowFullInter(4);
+};
 i([ u({
 displayName: "进度条",
 type: cc.Sprite

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1630581644155,
-    "genTime": 1630581644155,
+    "buildTime": 1630656369925,
+    "genTime": 1630656369925,
     "genVersion": null
 }