主界面生产按钮功能修复

广告策略增加

.gitignore

@@ -13,7 +13,4 @@ local
 /assets/scene/TestScene.fire.meta
 /assets/scene/TestScene.ts
 /assets/scene/TestScene.ts.meta
-/assets/scene/TestScene.fire
-
-/build/jsb-link/assets
-/build/jsb-link/src
+/assets/scene/TestScene.fire

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/texture/factory_icons/factoryNams/factory_name_icon_20001.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "8116a4ca-fb2c-4902-a87b-b9ba3144ea28",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "factory_name_icon_20001": {
+      "ver": "1.0.4",
+      "uuid": "02bb5811-db79-4575-a0eb-3e4981932168",
+      "rawTextureUuid": "8116a4ca-fb2c-4902-a87b-b9ba3144ea28",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 70,
+      "height": 23,
+      "rawWidth": 73,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20002.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "0a7338cb-e555-47f8-9373-71f3f77f9d96",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "factory_name_icon_20002": {
+      "ver": "1.0.4",
+      "uuid": "39909b0e-8445-4d29-af0d-e2483e2141d9",
+      "rawTextureUuid": "0a7338cb-e555-47f8-9373-71f3f77f9d96",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 70,
+      "height": 23,
+      "rawWidth": 73,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20003.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "5a09e6c9-cfd1-41b9-ba41-145685d0d9b4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 26,
+  "platformSettings": {},
+  "subMetas": {
+    "factory_name_icon_20003": {
+      "ver": "1.0.4",
+      "uuid": "ea573a78-ab7c-4d4c-80a0-5b51faf4da55",
+      "rawTextureUuid": "5a09e6c9-cfd1-41b9-ba41-145685d0d9b4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -0.5,
+      "trimX": 0,
+      "trimY": 2,
+      "width": 70,
+      "height": 23,
+      "rawWidth": 73,
+      "rawHeight": 26,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20010.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 50,
-  "height": 24,
+  "width": 48,
+  "height": 23,
   "platformSettings": {},
   "subMetas": {
     "factory_name_icon_20010": {
@@ -19,13 +19,13 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0.5,
-      "trimX": 1,
+      "offsetY": 0,
+      "trimX": 0,
       "trimY": 0,
       "width": 48,
       "height": 23,
-      "rawWidth": 50,
-      "rawHeight": 24,
+      "rawWidth": 48,
+      "rawHeight": 23,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20011.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 50,
-  "height": 25,
+  "width": 48,
+  "height": 23,
   "platformSettings": {},
   "subMetas": {
     "factory_name_icon_20011": {
@@ -18,14 +18,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 1,
-      "offsetY": -1,
-      "trimX": 3,
-      "trimY": 2,
-      "width": 46,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 48,
       "height": 23,
-      "rawWidth": 50,
-      "rawHeight": 25,
+      "rawWidth": 48,
+      "rawHeight": 23,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/coregame/texture/factory_icons/factoryNams/factory_name_icon_20012.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 50,
-  "height": 25,
+  "width": 47,
+  "height": 23,
   "platformSettings": {},
   "subMetas": {
     "factory_name_icon_20012": {
@@ -20,12 +20,12 @@
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 1,
-      "trimY": 1,
-      "width": 48,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 47,
       "height": 23,
-      "rawWidth": 50,
-      "rawHeight": 25,
+      "rawWidth": 47,
+      "rawHeight": 23,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/script/before/main/FactoryIcon.ts

@@ -1,4 +1,4 @@
-import { FactroyState, ProductType } from "../../game/data/GameData";
+import { FactroyState, GameProp, ProductType } from "../../game/data/GameData";
 import ProductShow from "../view/ProductShow";
 import { FarmCountDown } from "./FarmCountDown";
 import { IDHelper } from "./IDHelper";
@@ -25,11 +25,12 @@ export class FactoryIcon extends cc.Component {
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
         this.sortID = helper.sortID;
+
         this.tab = gData.gameData.getTabByConfigID(this.configID);
 
         this.countDown.node.active = false;
-
         this.freshState();
+        gData.factorySystem.addFactory(this);
     }
 
     update() {
@@ -118,12 +119,21 @@ export class FactoryIcon extends cc.Component {
 
     public make(id) {
         if (this.data.state == FactroyState.Empty) {
+            gData.gameData.isProducting = true;
             let config = gData.gameData.getProductMap(id);
             let growSpan = Date.now() + config.time * 1000;
             this.data.state = FactroyState.Producting;
             this.data.productID = config.picture;
             this.data.growSpan = growSpan;
             gData.gameData.setFactoryDataMap(this.configID, this.data);
+
+            gData.gameData.leftTimes--;
+            gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
+            gData.gameData.init_leftTimes = true;
+
+            gData.adData.checkPopRed();
+            
+            gData.gameData.isProducting = false;
         }
     }
 
@@ -149,5 +159,6 @@ export class FactoryIcon extends cc.Component {
         this.data.productID = 0;
         this.data.growSpan = 0;
         gData.gameData.setFactoryDataMap(this.configID, this.data);
+        gData.gameData.setNextProduct();
     }
 }

assets/script/before/main/FactorySystem.ts

@@ -8,7 +8,7 @@ const { ccclass } = cc._decorator;
 @ccclass
 export default class FactorySystem {
     private _currSelectFactory: FactoryIcon = null;
-    private factoryIcons: Array<FactoryIcon> = [];
+    public factoryIcons: Array<FactoryIcon> = [];
 
     public set currSelectFactory(factory: FactoryIcon) {
         this._currSelectFactory = factory;
@@ -29,7 +29,7 @@ export default class FactorySystem {
     public nextFactory() {
         let len = this.factoryIcons.length;
         for (var i = 0; i < len; i++) {
-            if (this.factoryIcons[i].state == FactroyState.Empty) {
+            if (this.factoryIcons[i].data.state == FactroyState.Empty) {
                 gData.gameData.nextCanProduct = gData.gameData.getRandomFactoryConfig(this.factoryIcons[i].configID);
                 gData.gameData.nextMake = this.factoryIcons[i];
                 return this.factoryIcons[i];

assets/script/before/main/FarmIcon.ts

@@ -23,7 +23,7 @@ export class FarmIcon extends cc.Component {
     private plantID: number = 0;
     private _state: FarmState = -1;
     public get state(): FarmState { return this._state; }
-    private data = null;
+    public data = null;
     onLoad() {
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
@@ -143,12 +143,13 @@ export class FarmIcon extends cc.Component {
         this.data.productID = 0;
         this.data.growSpan = 0;
         gData.gameData.setFarmDataMap(this.configID, this.data);
+        gData.gameData.setNextProduct();
     }
 
     public async plant(id: number) {
         if (this.state == FarmState.Empty && !gData.farmSystem.plantIsRequesting) {
             this.plantID = id;
-            gData.farmSystem.plantIsRequesting = true;
+            gData.gameData.isProducting = true;
 
             this.plantIcon.node.active = true;
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
@@ -160,7 +161,9 @@ export class FarmIcon extends cc.Component {
             gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
             gData.gameData.init_leftTimes = true;
 
-            gData.farmSystem.plantIsRequesting = false;
+            gData.adData.checkPopRed();
+            
+            gData.gameData.isProducting = false;
         }
     }
 

assets/script/before/main/FarmSystem.ts

@@ -45,7 +45,7 @@ export class FarmSystem {
     /**获取可种植农田 */
     private getCanPlantFarm(): FarmIcon | null {
         for (let i = 0; i < this.farms.length; i++) {
-            if (this.farms[i] != this.currSelectFarm && this.farms[i].state == FarmState.Empty) {
+            if (this.farms[i] != this.currSelectFarm && this.farms[i].data.state == FarmState.Empty) {
                 gData.gameData.nextCanProduct = gData.gameData.getRandomPlantConfig();
                 gData.gameData.nextMake = this.farms[i];
                 return this.farms[i];

assets/script/before/main/PastureIcon.ts

@@ -1,6 +1,6 @@
 /** 养殖类 */
 
-import { AnimalState, PastureState, ProductType } from "../../game/data/GameData";
+import { AnimalState, GameProp, PastureState, ProductType } from "../../game/data/GameData";
 import Animals from "../view/Animals";
 import ProductShow from "../view/ProductShow";
 import { FarmCountDown } from "./FarmCountDown";
@@ -16,7 +16,7 @@ export default class PastureIcon extends cc.Component {
     @property({ type: FarmCountDown, tooltip: "倒计时组件" }) countDown: FarmCountDown = null;
     @property({ type: cc.Node, tooltip: "完成品展示节点" }) showGroup: cc.Node = null;
 
-    @property({type: cc.Node, tooltip: '闲置动画'}) idleAni: cc.Node = null;
+    @property({ type: cc.Node, tooltip: '闲置动画' }) idleAni: cc.Node = null;
 
     private animalsArr: Array<Animals> = new Array<Animals>();
 
@@ -35,6 +35,9 @@ export default class PastureIcon extends cc.Component {
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
         this.sortID = helper.sortID;
+        this.data = gData.gameData.getPastureDataMap(this.configID);
+
+        gData.pastureSystem.addPastureIcon(this);
         this.points.parent.active = false;
         let index = 0;
         let point = null;
@@ -56,7 +59,6 @@ export default class PastureIcon extends cc.Component {
         }
 
         this.freshState();
-        
     }
 
     update() {
@@ -89,8 +91,7 @@ export default class PastureIcon extends cc.Component {
                     for (var i = 0; i < this.animalsArr.length; i++) {
                         this.animalsArr[i].setState(AnimalState.Hanger, this.configID);
                     }
-                    if(this.idleAni && this.idleAni.active == false)
-                    {
+                    if (this.idleAni && this.idleAni.active == false) {
                         this.idleAni.active = true;
                     }
                     break;
@@ -102,8 +103,7 @@ export default class PastureIcon extends cc.Component {
                     for (var i = 0; i < this.animalsArr.length; i++) {
                         this.animalsArr[i].setState(AnimalState.Eat, this.configID);
                     }
-                    if(this.idleAni && this.idleAni.active == true)
-                    {
+                    if (this.idleAni && this.idleAni.active == true) {
                         this.idleAni.active = false;
                     }
                     break;
@@ -180,13 +180,22 @@ export default class PastureIcon extends cc.Component {
     }
 
     onEat() {
-        let config = gData.gameData.getProductMap(this.data.productID);
-        let growSpan = Date.now() + config.time * 1000;
-        this.data.state = PastureState.Growing;
-        this.data.productID = this.data.productID;
-        this.data.growSpan = growSpan;
-        gData.gameData.setPastureDataMap(this.configID, this.data);
-        this.eatNode.active = false;
+        if (this.state == PastureState.Empty) {
+            gData.gameData.isProducting = true;
+            let config = gData.gameData.getProductMap(this.data.productID);
+            let growSpan = Date.now() + config.time * 1000;
+            this.data.state = PastureState.Growing;
+            this.data.productID = this.data.productID;
+            this.data.growSpan = growSpan;
+            gData.gameData.setPastureDataMap(this.configID, this.data);
+            this.eatNode.active = false;
+
+            gData.gameData.leftTimes--;
+            gData.gameData.setProp(GameProp.leftTimes, gData.gameData.leftTimes);
+            gData.gameData.init_leftTimes = true;
+
+            gData.gameData.isProducting = false;
+        }
     }
 
     onRipe() {
@@ -209,5 +218,6 @@ export default class PastureIcon extends cc.Component {
         this.data.state = PastureState.Empty;
         this.data.growSpan = 0;
         gData.gameData.setPastureDataMap(this.configID, this.data);
+        gData.gameData.setNextProduct();
     }
 }

assets/script/before/main/PastureSystem.ts

@@ -8,7 +8,7 @@ const { ccclass } = cc._decorator;
 @ccclass
 export default class PastureSystem {
     private pastureDataMap: Map<number, PastureData> = new Map<number, PastureData>();
-    private pastureIcons: Array<PastureIcon> = [];
+    public pastureIcons: Array<PastureIcon> = [];
 
     setPastureData(configID) {
         if (this.getPastureData(configID)) {
@@ -31,8 +31,8 @@ export default class PastureSystem {
     nextPasture() {
         let len = this.pastureIcons.length;
         for (var i = 0; i < len; i++) {
-            if (this.pastureIcons[i].state == PastureState.Empty) {
-                gData.gameData.nextCanProduct = this.pastureIcons[i].data;
+            if (this.pastureIcons[i].data.state == PastureState.Empty) {
+                gData.gameData.nextCanProduct = gData.gameData.getProductMap(this.pastureIcons[i].data.productID);
                 gData.gameData.nextMake = this.pastureIcons[i];
                 return this.pastureIcons[i];
             }

assets/script/before/map/MapMove.ts

@@ -16,11 +16,6 @@ export class MapMove extends cc.Component {
     start() {
         this.canvas = cc.find('Canvas');
         this.node.on(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
-
-        //地图场景加载结束
-        this.scheduleOnce(() => {
-            gData.gameData.setNextProduct();
-        }, 0.1)
     }
 
     onDestroy() {

assets/script/before/view/data/ADUnlockData.ts

@@ -25,6 +25,7 @@ export default class ADUnlockData extends Data {
         }
         else {
             gData.gameData.setFarmDataMap(this.curConfigID, farm);
+            gData.gameData.setNextProduct();
         }
     }
 }

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

@@ -12,6 +12,8 @@ export default class HarvestPanel extends cc.Component {
         // gData.harvestData.config.picture
         //调用收获红包币接口
         gData.harvestData.setToEmpty();
+
+        gData.adData.checkShowFullInter(1);
     }
 
     public async clickSuperBtn() {

assets/script/game/data/AdData.ts

@@ -1,3 +1,4 @@
+import Util from "../../before/util/Util";
 import { Data } from "../../mk/data/Data";
 import { GameProp } from "./GameData";
 
@@ -183,56 +184,111 @@ export class AdData {
         mk.http.sendData('updateADLog', sData);
     }
 
-    /** 设置关闭红包弹出全屏插屏序列 */
-    setFullInterShowStr() {
-        let fullInterShowStrArr = [];
-        if (gData.gameData.configs.GlobalCfg.fullInterShowStrArr) {
-            fullInterShowStrArr = gData.gameData.configs.GlobalCfg.fullInterShowStrArr.split(';');
+    /** 检查是否显示全屏插屏
+     * @type  1:只对 ecpmLevel == 1 生效;  2:对所有玩家生效  3:延时弹出  4:先弹出插屏，再弹出全屏插屏
+     */
+    checkShowFullInter(type) {
+        let per = this.getPerByEcpm();
+        let pop = Math.random() < per;
+        if (!pop) {
+            return;
         }
-
-        for (var i = 0; i < fullInterShowStrArr.length; i++) {
-            let tempArr = fullInterShowStrArr[i].split(',');
-            if (gData.gameData.adShowConfig.average_ecpm <= tempArr[1]) {
-                this.fullInterShowStr = tempArr[2];
+        switch (type) {
+            case 1:
+                if (gData.gameData.ecpmLevel == 1) {
+                    mk.ad.showInterAd(1);
+                }
+                break;
+            case 2:
+                mk.ad.showInterAd(1);
+                break;
+            case 3:
+                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);
+                }, delay);
+                break;
+            case 4:
+                let delayArr1 = gData.gameData.configs.ServerConfig.AdDelay.split(',');
+                let min1 = parseFloat(delayArr1[0]);
+                let max1 = parseFloat(delayArr1[1]);
+                let delay1 = (min1 + (max1 - min1) * Math.random()) * 1000;
+                let delay2 = (min1 + (max1 - min1) * Math.random()) * 1000;
+                setTimeout(() => {
+                    mk.ad.showInterAd(0);
+                    setTimeout(() => {
+                        mk.ad.showInterAd(1);
+                    }, delay2);
+                }, delay1);
                 break;
-            }
         }
     }
 
-    /** 检查是否显示全屏插屏
-     * @type 不同情况弹出类型 1：提现结束判断ecpm低于一定值弹出  2：关闭红包界面不观看激励视频有概率拉起全屏广告
-     */
-    checkShowFullInter(type) {
-        //全屏广告开关
-        if (gData.gameData.configs.GlobalCfg.popFullInter != "1") {
-            return
+    //定时弹出计时
+    private timeAd = 0;
+    /** 定时弹出红包 */
+    startPopRed(dt) {
+        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;
         }
+    }
 
-        if (type == 1) {
-            if (gData.gameData.adShowConfig.average_ecpm <= gData.gameData.configs.GlobalCfg.popFullEcpmAfterCash) {
-                mk.ad.showInterAd(1);
+    /** 需要弹出红包的点击数 */
+    popClickTimes = 0;
+    /** 累计点击数 */
+    clickTimesAdd = 0;
+
+    setPopClickTimes() {
+        let arr = gData.gameData.configs.ServerConfig.ClickProduction.split(',');
+        this.popClickTimes = Util.rnd(parseInt(arr[0]), parseInt(arr[1]));
+    }
+
+    checkPopRed() {
+        this.clickTimesAdd++;
+        if (this.clickTimesAdd >= this.popClickTimes) {
+            this.clickTimesAdd = 0;
+            this.setPopClickTimes();
+            if (Math.random() <= this.getPerByEcpm()) {
+                mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
             }
         }
-        else if (type == 2) {
-            if (this.fullInterShowStr) {
-                let popFullIndex = mk.storage.getStorage('popFullIndex');
-                if (popFullIndex == null) {
-                    popFullIndex = 0;
-                }
-                else {
-                    popFullIndex++;
-                }
-                mk.storage.setStorage('popFullIndex', popFullIndex);
+    }
 
-                let index = popFullIndex % this.fullInterShowStr.length;
-                mk.console.log('checkShowFullInter  this.fullInterShowStr  ', this.fullInterShowStr);
-                mk.console.log('checkShowFullInter  index', index);
-                if (this.fullInterShowStr[index] == '1') {
-                    mk.console.log('checkShowFullInter showInterAd');
-                    mk.ad.showInterAd(1);
-                }
+
+
+    getPerByEcpm() {
+        //test
+        return 1;
+
+        let forceAd = gData.gameData.configs.forceAd;
+        let len = forceAd.length;
+        let per = 0;
+        for (var i = 0; i < len; i++) {
+            if (gData.gameData.adShowConfig.average_ecpm <= parseInt(forceAd[i].ecpmMax)) {
+                per = parseFloat(forceAd[i].percent);
+                break;
             }
         }
+
+        return per;
     }
 }
 

assets/script/game/data/GameData.ts

@@ -62,8 +62,14 @@ export class GameData {
     public nextMake = null;
     /** 类型标识 */
     private nextType = 0;
-
+    /** 刷新生产按钮信息 */
     public init_makeInfo = false;
+
+    /** 正在生产 */
+    public isProducting = false;
+
+    /** 用户价值等级 1 低 2 中 3 高*/
+    public ecpmLevel = 0;
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -101,6 +107,8 @@ export class GameData {
         }
         this.adShowConfig = response.data;
         mk.console.logSingle("user/adShowConfig", response.data);
+        this.setEcpmLevel();
+        gData.adData.setPopClickTimes();
 
         data = {};
         response = await mk.http.sendData('welFare/getUserWelFareTaskInfo', data);
@@ -115,8 +123,6 @@ export class GameData {
             element.init();
         });
 
-        gData.adData.setFullInterShowStr();
-
         this.dataFinish = true;
     }
 
@@ -236,77 +242,65 @@ export class GameData {
         this.maxTimes = parseInt(this.configs.ServerConfig.ProductionMax);
         this.ProductionRecovery = parseInt(this.configs.ServerConfig.ProductionRecovery);
         //test
+        this.leftTimes = 100;
+        this.maxTimes = 100;
         this.ProductionRecovery = 1;
     }
 
     //图鉴领取数据
     private _farmMapRewardData = [];
 
-    public getFarmMapRewardState(index)
-    {
-        
-        if(index.i < this._farmMapRewardData.length)
-        {
-            if(index.j < this._farmMapRewardData[index.i].length)
-            {
+    public getFarmMapRewardState(index) {
+
+        if (index.i < this._farmMapRewardData.length) {
+            if (index.j < this._farmMapRewardData[index.i].length) {
                 return this._farmMapRewardData[index.i][index.j];
             }
         }
         return 1;
     }
 
-    public setFarmMapRewardState(index, state)
-    {
-        if(index.i < this._farmMapRewardData.length)
-        {
-            if(index.j < this._farmMapRewardData[index.i].length)
-            {
+    public setFarmMapRewardState(index, state) {
+        if (index.i < this._farmMapRewardData.length) {
+            if (index.j < this._farmMapRewardData[index.i].length) {
                 this._farmMapRewardData[index.i][index.j] = state;
                 this.setProp(GameProp.farmMapGetRewardData, this._farmMapRewardData);
             }
         }
     }
-    
-    private initFarmMapGetRewardData()
-    {
+
+    private initFarmMapGetRewardData() {
         this._farmMapRewardData = this.getProp(GameProp.farmMapGetRewardData);
-        if(!this._farmMapRewardData)
-        {
+        if (!this._farmMapRewardData) {
             this._farmMapRewardData = [];
         }
         let needSync = false;
         let index = 0;
-        this._productTypeMap.forEach((value, key)=>{
+        this._productTypeMap.forEach((value, key) => {
 
-            if(this._farmMapRewardData.length <= index)
-            {
+            if (this._farmMapRewardData.length <= index) {
                 let len = value.length;
                 let arr = [];
-                for(let i = 0; i != len; ++i)
-                {
+                for (let i = 0; i != len; ++i) {
                     arr.push(0);
                 }
                 this._farmMapRewardData.push(arr);
                 needSync = true;
                 console.log("-----add 数组数据")
-            }else
-            {
+            } else {
                 let data = this._farmMapRewardData[index];
                 let len = value.length;
-                for(let i = 0; i != len; ++i)
-                {
-                    if(i >= data.length)
-                    {
+                for (let i = 0; i != len; ++i) {
+                    if (i >= data.length) {
                         data.push(0);
                         needSync = true;
                         console.log("-----add 单个数据")
                     }
                 }
-            }       
+            }
             ++index;
         });
-        if(needSync)
-        {
+        if (needSync) {
             this.setProp(GameProp.farmMapGetRewardData, this._farmMapRewardData);
         }
     }
@@ -351,9 +345,9 @@ export class GameData {
         let canArr = [];
         let len = arr.length;
         for (var i = 0; i < len; i++) {
-            if (arr[i] <= max) {
-                canArr.push(arr[i]);
-                if (arr[i] == max) {
+            if (arr[i].picture <= max) {
+                canArr.push(arr[i].picture);
+                if (arr[i].picture == max) {
                     break;
                 }
             }
@@ -364,6 +358,7 @@ export class GameData {
         return this.getProductMap(id);
     }
 
+    /** 自动生产选中下一个 */
     setNextProduct() {
         this.nextMake = null;
         let next = gData.farmSystem.selectNextFarm();
@@ -389,6 +384,14 @@ export class GameData {
         this.init_makeInfo = true;
     }
 
+    hasFirstCheck = false;
+    firstCheckNext() {
+        if (!this.hasFirstCheck && gData.pastureSystem.pastureIcons.length >= 3 && gData.factorySystem.factoryIcons.length >= 6) {
+            this.hasFirstCheck = true;
+            gData.gameData.setNextProduct();
+        }
+    }
+
     makeProduct() {
         switch (this.nextType) {
             case 0:
@@ -401,6 +404,7 @@ export class GameData {
             case 2:
                 gData.pastureSystem.btnMake();
                 this.setNextProduct();
+                gData.adData.checkPopRed();
                 break;
             case 3:
                 gData.factorySystem.btnMake();
@@ -673,12 +677,16 @@ export class GameData {
                 }
                 else {
                     data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
+                    //更新最大可购买商品
+                    this.setMaxProduct(tab, arr[0].picture, false);
                 }
                 this._factoryData.push(data);
                 this._factoryDataMap.set(id, data);
                 id++;
             }
+
             //更新到服务器
+            this.setProp(GameProp.maxProduct, this._maxProduct);
             this.setProp(GameProp.factoryData, this._factoryData);
         }
         else {
@@ -759,7 +767,7 @@ export class GameData {
         return null;
     }
 
-    public setMaxProduct(tab, id) {
+    public setMaxProduct(tab, id, sendToServer = true) {
         if (!this._maxProduct) {
             this._maxProduct = [];
         }
@@ -780,7 +788,9 @@ export class GameData {
             this._maxProduct.push(data);
         }
 
-        this.setProp(GameProp.maxProduct, this._maxProduct);
+        if (sendToServer) {
+            this.setProp(GameProp.maxProduct, this._maxProduct);
+        }
     }
 
     public initSetMaxProduct() {
@@ -806,7 +816,7 @@ export class GameData {
                     needUpdate = false;
                     for (var i = 0; i < len; i++) {
                         data = this.getPastureDataMap(id);
-                        if (data.state == PastureState.Lock && configArr[i].value >= this.gameData.gradeLevel) {
+                        if (data.state == PastureState.Lock && configArr[i].value <= this.gameData.gradeLevel) {
                             data = { id: id, state: PastureState.Empty, productID: configArr[i].picture, growSpan: 0 };
                             this.setPastureDataMap(id, data, false);
                             needUpdate = true;
@@ -816,6 +826,7 @@ export class GameData {
                     //更新到服务器
                     if (needUpdate) {
                         this.setProp(GameProp.pastureData, this._pastureData);
+                        this.setNextProduct();
                     }
                     break;
                 default:
@@ -823,7 +834,7 @@ export class GameData {
                     needUpdate = false;
                     let configID = this.getConfigIDByTab(tab);
                     data = this.getFactoryDataMap(configID);
-                    if (data.state == FactroyState.Lock && gData.gameData.gameData.gradeLevel >= configArr[0].value) {
+                    if (data.state == FactroyState.Lock && configArr[0].value <= this.gameData.gradeLevel) {
                         data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
                         this.setFactoryDataMap(configID, data, false);
                         needUpdate = true;
@@ -833,11 +844,28 @@ export class GameData {
 
                     if (needUpdate) {
                         this.setProp(GameProp.factoryData, this._factoryData);
+                        this.setNextProduct();
                     }
                     break;
             }
         }
     }
+
+    /** 设置用户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;
+        }
+    }
 }
 
 /**
@@ -877,7 +905,7 @@ export enum GameProp {
 
     /**
      图鉴领取数据*/
-     farmMapGetRewardData = 17,
+    farmMapGetRewardData = 17,
 
 
 

assets/script/game/game/Game.ts

@@ -1,5 +1,5 @@
 import JsbSystem from "../../mk/system/JsbSystem";
-import { DataEventId, FarmState, GameProp, VideoAdType } from "../data/GameData";
+import { DataEventId, FarmState, GameProp, ProductType, VideoAdType } from "../data/GameData";
 import FunBtns from "./FunBtns";
 
 const { ccclass, property } = cc._decorator;
@@ -112,7 +112,7 @@ export default class Game extends cc.Component {
         mainNode.addChild(cc.instantiate(coreGame));
     }
 
-    update() {
+    update(dt) {
         if (gData.gameData.init_coin) {
             this.changeInfo();
         }
@@ -133,6 +133,10 @@ export default class Game extends cc.Component {
             this.initLeftTimes();
         }
 
+        gData.adData.startPopRed(dt);
+
+        gData.gameData.firstCheckNext();
+
         if (gData.gameData.leftTimes < gData.gameData.maxTimes && this.lastTimeSpan != 0) {
             let pass = Date.now() - this.lastTimeSpan;
             if (pass >= this.span) {
@@ -228,10 +232,24 @@ export default class Game extends cc.Component {
     }
 
     private async initCanPlantInfo() {
+        gData.gameData.init_makeInfo = false;
         if (gData.gameData.nextCanProduct) {
-            gData.gameData.init_makeInfo = false;
-            this.icon_plant.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
-            this.icon_plantName.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/nameIcon/plant_name_" + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
+            let iconPath = '';
+            let namePath = '';
+            if (gData.gameData.nextCanProduct.tab == ProductType.nzw) {
+                iconPath = "game/coregame/texture/plant_icons/plantIcon_";
+                namePath = "game/coregame/texture/plant_icons/nameIcon/plant_name_";
+            }
+            else if (gData.gameData.nextCanProduct.tab == ProductType.dw) {
+                iconPath = 'game/coregame/texture/factory_icons/factory_';
+                namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
+            }
+            else {
+                iconPath = 'game/coregame/texture/factory_icons/factory_';
+                namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
+            }
+            this.icon_plant.spriteFrame = await mk.loader.load(iconPath + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
+            this.icon_plantName.spriteFrame = await mk.loader.load(namePath + gData.gameData.nextCanProduct.picture, cc.SpriteFrame);
         }
     }
 
@@ -338,6 +356,11 @@ export default class Game extends cc.Component {
             return;
         }
 
+        if (gData.gameData.isProducting) {
+            mk.tip.pop('点击太快了');
+            return;
+        }
+
         gData.gameData.makeProduct();
     }
 }

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

@@ -4,28 +4,27 @@ import { VideoAdType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 @ccclass
-export default class NewOpenRedBag extends cc.Component{
+export default class NewOpenRedBag extends cc.Component {
 
 
-    @property({displayName: '数字组', type: cc.Label})
+    @property({ displayName: '数字组', type: cc.Label })
     private lbl_value: cc.Label[] = [];
 
     @property(cc.Label)
     private lbl_reward_value: cc.Label = null;
     @property(cc.Sprite)
-    private spr_cash_out:  cc.Sprite = null;
+    private spr_cash_out: cc.Sprite = null;
     @property(cc.Label)
     private lbl_progress: cc.Label = null;
     @property(cc.Animation)
     private node_cash: cc.Animation = null;
 
-    start(){
+    start() {
         this.showChangePart();
 
     }
 
-    update(dt)
-    {
+    update(dt) {
         if (gData.reward.adData) {
             this.showWatchAdReward();
             gData.turnable.adData = null;
@@ -35,7 +34,7 @@ export default class NewOpenRedBag extends cc.Component{
     /**
      * 底部提现相关样式
      */
-     private initCashOutStyle(redMoney: number = 0) {
+    private initCashOutStyle(redMoney: number = 0) {
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;
@@ -52,20 +51,15 @@ export default class NewOpenRedBag extends cc.Component{
         }
     }
 
-    private showWatchAdReward()
-    {
-        if(gData.reward.adData)
-        {
-            let v= '0.30';
-            v.replace('.','');
+    private showWatchAdReward() {
+        if (gData.reward.adData) {
+            let v = '0.30';
+            v.replace('.', '');
             let c = v.split('');
-            for(let i = 0; i != this.lbl_value.length; ++i)
-            {
-                if(i < c.length)
-                {
+            for (let i = 0; i != this.lbl_value.length; ++i) {
+                if (i < c.length) {
                     this.lbl_value[i].string = c[i];
-                }else
-                {
+                } else {
                     this.lbl_value[i].string = '0';
                 }
             }
@@ -83,7 +77,7 @@ export default class NewOpenRedBag extends cc.Component{
         }, 0.1)
     }
 
-    private clickOpenBtn(){
+    private clickOpenBtn() {
         mk.audio.playEffect("button");
         mk.ui.closePanel(this.name);
         mk.ad.videoAdType = VideoAdType.StartQiPaoRedBag;
@@ -96,8 +90,8 @@ export default class NewOpenRedBag extends cc.Component{
 
     }
 
-    private clickCloseBtn(){
-
-        mk.audio.playEffect("closeButton");
+    private clickCloseBtn() {
+        // mk.audio.playEffect("closeButton");
+        gData.adData.checkShowFullInter(1);
     }
 }

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

@@ -17,14 +17,14 @@ export class ATRewardVideo extends zgSingleton {
     /** 是否加载完显示 */
     public ifLoadShow: boolean = false;
     /**是否观看完毕 */
-    public ifWatchEnd: boolean = false;
+    public canGet: boolean = false;
 
     init() {
         this.ATRewardVideoJS = cc["ATRewardVideoJS"];
         this.ATRewardVideoJS.proxy = this;
         this.ATRewardVideoJS.init();
 
-        this.ifWatchEnd = false;
+        this.canGet = false;
         if (this.reawardAdState == RewardAdState.Unload) {
             this.loadAd();
         }
@@ -123,7 +123,6 @@ export class ATRewardVideo extends zgSingleton {
      */
     onRewardedVideoAdPlayEnd(placementId, callbackInfo) {
         //ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-        this.ifWatchEnd = true;
     }
 
     /**
@@ -150,7 +149,7 @@ export class ATRewardVideo extends zgSingleton {
 
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
 
-        if (this.ifWatchEnd) {
+        if (this.canGet) {
             ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.WatchEnd);
             mk.data.sendDataEvent(DataEventId.video_end, mk.ad.videoAdType);
         }
@@ -158,7 +157,7 @@ export class ATRewardVideo extends zgSingleton {
             ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.Cancel);
         }
 
-        this.ifWatchEnd = false;
+        this.canGet = false;
 
         this.loadAd();
     }
@@ -180,7 +179,7 @@ export class ATRewardVideo extends zgSingleton {
      */
     onReward(placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
-        this.ifWatchEnd = true;
+        this.canGet = true;
     }
 }
 

build/jsb-link/assets/internal/config.json

@@ -0,0 +1 @@
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/assets/main/config.json

@@ -0,0 +1 @@
+{"paths":{},"types":[],"uuids":["6fUipUPg5ATaBsvsi0MHyV","baLjOyWmRCS4sIJH/tS+Dw"],"scenes":{"db://assets/scene/MainScene.fire":0},"redirect":[1,0],"deps":["resources"],"packs":{},"name":"main","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/assets/main/import/6f/6f522a54-3e0e-404d-a06c-bec8b4307c95.json

@@ -0,0 +1 @@
+[1,["baLjOyWmRCS4sIJH/tS+Dw"],["node","_parent","asset","node_guide","root","scene"],[["cc.Node",["_name","_id","_parent","_components","_contentSize","_children","_trs","_prefab"],1,1,9,5,12,7,4],["cc.SceneAsset",["_name","asyncLoadAssets"],1],["cc.Scene",["_name","_active","_children","_anchorPoint","_trs"],1,2,5,7],["cc.Node",["_name","_parent","_children","_components","_contentSize"],2,1,2,9,5],["cc.Camera",["_clearFlags","_depth","node"],1,1],["d0ea1+IO0BKJoZMInS6d9dy",["node"],3,1],["cc.Widget",["_alignFlags","node"],2,1],["5b808c7i9JMAJCR/OQTRrlG",["node"],3,1],["6ac05b5UF5BP4yjhbw+c0f0",["node"],3,1],["cc.PrefabInfo",["sync","root","asset"],2,1,6],["cc.Canvas",["_fitWidth","_fitHeight","node","_designResolution"],1,1,5],["ca47c5VYotGv4F867baLZGr",["node","node_guide"],3,1,1],["a0fd9gYXhZMJ46ArqYj2wBy",["ifShowAd","node"],2,1]],[[6,0,1,2],[0,0,2,3,4,2],[0,0,2,3,2],[1,0,1,3],[2,0,1,2,3,4,3],[0,0,1,5,3,4,6,3],[0,0,2,2],[0,0,2,7,2],[3,0,1,2,3,4,2],[4,0,1,2,3],[5,0,1],[7,0,1],[8,0,1],[9,0,1,2,2],[10,0,1,2,3,3],[11,0,1,1],[12,0,1,2]],[[3,"MainScene",null],[5,"Canvas","a5esZu+45LA5mBpvttspPD",[[-6,[6,"主容器",-7],-8,-9,-10,-11],1,4,1,1,1,1],[[14,true,false,-1,[5,750,1334]],[0,45,-2],[15,-4,-3],[16,true,-5]],[5,750,1334],[375,667,0,0,0,0,1,1,1,1]],[8,"引导层",1,[-13],[[0,45,-12]],[5,750,1334]],[1,"界面层",1,[[10,-14],[0,45,-15]],[5,750,1334]],[4,"New Node",false,[1],[0,0,0],[0,0,0,0,0,0,1,1,1,1]],[1,"Main Camera",1,[[9,7,-1,-16]],[5,750,1334]],[2,"提示层",1,[[11,-17]]],[2,"特效层",1,[[12,-18]]],[7,"GuideWeak",2,[13,true,-19,0]]],0,[0,0,1,0,0,1,0,3,2,0,0,1,0,0,1,0,-1,5,0,1,1,0,-3,3,0,-4,6,0,-5,7,0,-6,2,0,0,2,0,-1,8,0,0,3,0,0,3,0,0,5,0,0,6,0,0,7,0,4,8,0,5,4,1,1,4,19],[0],[2],[0]]

build/jsb-link/assets/resources/import/00/00220b88-1f47-4efe-b465-ebd263bb4e31.json

@@ -0,0 +1 @@
+[1,["dbREqIA8xIwrla9lMfxWAI"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,630,669],"offset":[0,0],"originalSize":[630,669],"capInsets":[0,140,0,16]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/00/002bf5f3-495e-48f3-8fa8-b1edf01489ea.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/003d8a2f-3565-4eb8-8ac3-39efcf689fa4.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/003d8a2f-3565-4eb8-8ac3-39efcf689fa4@6c48a.json

@@ -0,0 +1 @@
+[1,["00PYovNWVOuIrDOe/PaJ+k"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_5","rect":[65,32,126,208],"offset":[29,8],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/00/0098e181-e641-4463-9e22-b3eae2c4ec00.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/00b220af-8a30-411e-a455-2b710fbdcb82.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/00d3e399-535c-4a0f-9b8f-8704b672b049.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/00/00e83988-d506-4dc8-83c9-a355fc698a6b.json

@@ -0,0 +1 @@
+[1,["b691rGpQxO4Ii4VJ68W6YC"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2","rect":[0,0,33,42],"offset":[0,0],"originalSize":[33,42],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/00/00ec2723-1153-4b4a-9bfb-22cc5c7784d0.json

@@ -0,0 +1 @@
+[1,["32uB5n6bZGs5W6CEIX7U+6"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"bg","rect":[0,0,750,338],"offset":[0,0],"originalSize":[750,338],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/0105edf5-75a1-46f2-a008-148e4f338eab.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/0105edf5-75a1-46f2-a008-148e4f338eab@6c48a.json

@@ -0,0 +1 @@
+[1,["01Be31daFG8qAIFI5PM46r"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"30002_0_5","rect":[24,85,151,146],"offset":[0.5,-14],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/010a66eb-3b83-4995-9dd1-e3589bda3c6a.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/010c7f93-d02f-4812-a23d-331822ac6426.json

@@ -0,0 +1 @@
+[1,["231ByFqZZFGbtXI+YTCuIK"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"button","rect":[0,0,123,45],"offset":[0,0],"originalSize":[123,45],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/012eeb3f-6c75-4c52-b31a-82e14a4ac60f.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"lvlreward",[{"id":1,"lvl":10,"des":"农场萌新","value":3000},{"id":2,"lvl":20,"des":"农场小主","value":5000},{"id":3,"lvl":25,"des":"农场明星","value":10000},{"id":4,"lvl":55,"des":"农场大亨","value":580000},{"id":5,"lvl":65,"des":"农场财阀","value":1300000}]]],0,0,[],[],[]]

build/jsb-link/assets/resources/import/01/015f4345-4a22-44e8-909d-72df6944df66.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/01636377-fc06-4822-8444-7183e0cb3b42.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/01636377-fc06-4822-8444-7183e0cb3b42@6c48a.json

@@ -0,0 +1 @@
+[1,["01Y2N3/AZIIoREcYPgyztC"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_b_7","rect":[14,40,159,204],"offset":[-5.5,2],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/019e5965-fcb5-4de3-b40b-eaea24e49da0.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/01/019e5965-fcb5-4de3-b40b-eaea24e49da0@6c48a.json

@@ -0,0 +1 @@
+[1,["01nlll/LVN47QL6uok5J2g"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"seedIcon_10003","rect":[0,0,92,54],"offset":[0,0],"originalSize":[92,54],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/01a476e4-b529-490d-a5ae-7a00c6fc7329.json

@@ -0,0 +1 @@
+[1,["d7KomqaItPwqRSG6VKDJ+E"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"libao","rect":[2,2,230,97],"offset":[0,0],"originalSize":[234,101],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/01e24959-8f77-4a3e-b573-e9f09afedd4f.json

@@ -0,0 +1 @@
+[1,["f8pKJ1Px5EFIoTTRQjMZ7I"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_08","rect":[0,0,71,62],"offset":[0,0],"originalSize":[71,62],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/01/01ff5f11-65d1-4c6e-a330-48083a8114f9.json

@@ -0,0 +1 @@
+[1,["52nzrDMIFFoq86bDTq0KFI"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"moreGame_btn_green","rect":[0,0,120,60],"offset":[0,0],"originalSize":[120,60],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/0210e398-c0b6-4a7a-8295-c6217bf2cc02.json

@@ -0,0 +1 @@
+[1,["0deXeX+bZNTLJlHxS0roty"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_05","rect":[0,0,57,74],"offset":[0,0],"originalSize":[57,74],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/0214e697-1850-41f0-b28e-3f527952de01.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/0214e697-1850-41f0-b28e-3f527952de01@6c48a.json

@@ -0,0 +1 @@
+[1,["02FOaXGFBB8LKOP1J5Ut4B"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"5","rect":[0,0,31,41],"offset":[0,0],"originalSize":[31,41],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/023b2442-b37d-40b5-8879-d43f9ae13782.json

@@ -0,0 +1 @@
+[1,["1eG8mXwhxDeJlF2I0TFrV5"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"8","rect":[0,0,19,27],"offset":[0,0],"originalSize":[19,27],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/024cd5fe-88ea-4a60-bfcd-645d8a6045cd.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"taskWindow",".mp3",7.053061],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/02/027f8066-20cb-4359-9666-a610c31b0137.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/027f8066-20cb-4359-9666-a610c31b0137@6c48a.json

@@ -0,0 +1 @@
+[1,["02f4BmIMtDWZZmphDDGwE3"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"f_w_8","rect":[62,26,122,204],"offset":[24,16],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02ac97a8-302b-4710-b295-b1af6f94421e.json

@@ -0,0 +1 @@
+[1,["23DWrWK2ROE5yGrtwdrvvE"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"on","rect":[4,2,150,52],"offset":[1.5,2],"originalSize":[155,60],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02bee8f5-776d-40c9-8d40-1a5f51757fd6.json

@@ -0,0 +1 @@
+[1,["21B5arcnRMQaDkrNvdXdtW"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"title_ts","rect":[0,0,102,45],"offset":[0,0],"originalSize":[102,45],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02f50643-fa7d-4da2-bde3-28df89271fab.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/02f50643-fa7d-4da2-bde3-28df89271fab@6c48a.json

@@ -0,0 +1 @@
+[1,["029QZD+n1Nor3jKN+JJx+r"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"mapIcon_5","rect":[0,0,160,137],"offset":[0,0],"originalSize":[160,137],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/02/02f6d756-a1df-4158-9353-cfd97d9ce6d0.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/02/02f6d756-a1df-4158-9353-cfd97d9ce6d0@6c48a.json

@@ -0,0 +1 @@
+[1,["029tdWod9BWJNTz9l9nObQ"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"factory_20014","rect":[0,0,191,135],"offset":[0,0],"originalSize":[191,135],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/03048271-cbdd-459b-9676-00b3c53febb8.json

@@ -0,0 +1 @@
+[1,["395U6DcmtFoZZF2k48PSeA"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hb4","rect":[0,0,520,679],"offset":[0,0],"originalSize":[520,679],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/03225c46-195c-49ac-b8a1-4b68fee5b4a9.json

@@ -0,0 +1 @@
+[1,["a75JAPAr1DKrz7ni20MGse"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"laba","rect":[0,0,33,27],"offset":[0,0],"originalSize":[33,27],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/033e3b55-02f9-4ded-bc98-2869c7e7e7a3.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/03/033f2d36-c8fc-4efe-82ad-0efcd1e17d4c.json

@@ -0,0 +1 @@
+[1,["aeQRUrlFhLsKhWIvVMnLQC"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"fudai","rect":[2,2,173,103],"offset":[0,0],"originalSize":[177,107],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/035bb797-3ebc-420b-8449-4c763c1cc7ba.json

@@ -0,0 +1 @@
+[1,["61zKaoB9BCebGJSUiZLiWK","994/zIPvNPO6OMLRdAPntd","70RqvPPqxBaZaOnDXAGQ2N","b2aSShqiVIEaqSuMjHiovW","aaYewDV1ROMKueRqKqrRNd","ffV4EF2jBICqLFrdQ3dSpO","39JGmsroxHyJPmrKSkTmXy","72lDJDRGpA2qDBQlPMcPQc"],["value"],[["cc.AnimationClip",["_name","_duration","sample","wrapMode","curveData"],-1,11]],[[0,0,1,2,3,4,5]],[[0,"sheepMove_2",1.6,5,2,[{},"comps",11,[{},"cc.Sprite",11,[{},"spriteFrame",12,[[[{"frame":0},"value",6,0],[{"frame":0.2},"value",6,1],[{"frame":0.4},"value",6,2],[{"frame":0.6},"value",6,3],[{"frame":0.8},"value",6,4],[{"frame":1},"value",6,5],[{"frame":1.2},"value",6,6],[{"frame":1.4},"value",6,7]],11,11,11,11,11,11,11,11]]]]]],0,0,[0,0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0],[0,1,2,3,4,5,6,7]]

build/jsb-link/assets/resources/import/03/03698f52-e14b-4aef-a49a-27762e7b74eb.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.AudioClip",["_name","_native","duration"],0]],[[0,0,1,2,4]],[[0,"dayLoginWindow",".mp3",3.94449],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/03/0391ef3f-8d62-49f3-85a9-556bd80c53d6.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/03/0391ef3f-8d62-49f3-85a9-556bd80c53d6@6c48a.json

@@ -0,0 +1 @@
+[1,["03ke8/jWJJ84WpVWvYDFPW"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"cz_10012","rect":[0,0,33,30],"offset":[0,0],"originalSize":[33,30],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/03/03b2bcf3-03fe-4fa2-9936-0bdcd1abe621.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/03/03bba11e-0c27-45bb-86ae-71a6c5e12a45.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/03/03bba11e-0c27-45bb-86ae-71a6c5e12a45@6c48a.json

@@ -0,0 +1 @@
+[1,["03u6EeDCdFu4aucabF4SpF"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"fountain_5","rect":[110,87,234,200],"offset":[35,-26],"originalSize":[384,322],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

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

@@ -0,0 +1 @@
+[1,0,0,[["cc.Asset",["_name","_native"],1]],[[0,0,1,3]],[[0,"zhuanpan",".atlas"],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/03/03cbaa38-c830-4190-a0b1-977deefb038e.json

@@ -0,0 +1 @@
+[1,["3a/2sMg/dMXbPv3TlSIfco"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2005_3s_01","rect":[0,0,105,109],"offset":[0,0],"originalSize":[105,109],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

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

@@ -0,0 +1 @@
+[1,0,0,[["cc.Asset",["_name","_native"],1]],[[0,0,1,3]],[[0,"libao",".atlas"],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/04/040714fd-86ce-4e51-9440-b46698292cbf.json

@@ -0,0 +1 @@
+[1,["85U+6heRRJ6aUubgEY4aqY"],["_effectAsset"],[["cc.Material",["_name","_techniqueData"],1]],[[0,0,1,3]],[[0,"sprite-water_wave",{"0":{"defines":{"USE_TEXTURE":true},"props":{"offset":0.6,"frequency":6,"angularVelocity":6}}}]],0,0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/041ce03e-8666-4d0f-af63-3fb40ef021c9.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/043b085e-aa0a-4f3e-9902-7c92ab5784f4.json

@@ -0,0 +1 @@
+[1,0,["node","root","data"],[["cc.Prefab",["_name"],2],["cc.Node",["_name","_components","_prefab","_contentSize"],2,9,4,5],["cc.Layout",["_resize","_N$layoutType","node","_layoutSize"],1,1,5],["b818cn3ZlhCA589MCaalmqs",["artNum","node"],2,1],["cc.PrefabInfo",["fileId","root"],2,1]],[[0,0,2],[1,0,1,2,3,2],[2,0,1,2,3,3],[3,0,1,2],[4,0,1,2]],[[0,"TargetScoreArtNum"],[1,"ArtNum",[[2,1,1,-2,[5,44,80]],[3,1,-3]],[4,"0bRgHyHaREPrM9sZzwGsSW",-1],[5,44,80]]],0,[0,1,1,0,0,1,0,0,1,0,2,1,3],[],[],[]]

build/jsb-link/assets/resources/import/04/044cca51-5604-4be5-8d8e-5c57e1ed09c7.json

@@ -0,0 +1 @@
+[1,["acTkQnAqlKVacq1ViYQdcS"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"8","rect":[0,0,23,32],"offset":[0,0],"originalSize":[23,32],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/0450350f-cf40-448e-9c92-9a6dff727b46.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/045ef3f6-5ec1-4d15-8950-1167699aab98.json

@@ -0,0 +1 @@
+[1,["157CMWCyhA7rCmrplqEnCd"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"adrb_img_hongbao","rect":[1,0,600,790],"offset":[0,0],"originalSize":[602,790],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/049152d7-3183-4ccd-8f64-fca569457a83.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"common",{"maxClockInDay":1,"?maxClockInDay":"最大打卡天数","energyNumPerAdd":5,"?energyNumPerAdd":"每次增加的体力值","maxEnergyNum":10,"?maxEnergyNum":"最大能量数","recoverTimePerEnergy":30,"?recoverTimePerEnergy":"体力恢复时间","passRedPacketCashNum":0.2,"?passRedPacketCashNum":"通过红包数额","levelRedPacketChance":0.2,"?levelRedPacketChance":"随机红包几率"}]],0,0,[],[],[]]

build/jsb-link/assets/resources/import/04/049eb58e-d7f7-40f4-85df-1234d2ceb026.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/049eb58e-d7f7-40f4-85df-1234d2ceb026@6c48a.json

@@ -0,0 +1 @@
+[1,["04nrWO1/dA9IXfEjTSzrAm"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"ripe_10015","rect":[0,0,40,31],"offset":[0,0],"originalSize":[40,31],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/04a89c66-ba3e-498b-b326-6964f1fe2d02.json

@@ -0,0 +1 @@
+[1,["68xcYGaBxGqbzFH7QQa9ej"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_06","rect":[0,0,53,67],"offset":[0,0],"originalSize":[53,67],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/04c3a24a-66b6-488c-b5b9-771433b5dc38.json

@@ -0,0 +1 @@
+[1,["cb5HdZYWhEN48htiRz/Y+j"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"2008_1r_01","rect":[0,0,79,71],"offset":[0,0],"originalSize":[79,71],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/04/04d53e45-1269-4c52-8b8f-f870143219af.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/04/04d53e45-1269-4c52-8b8f-f870143219af@6c48a.json

@@ -0,0 +1 @@
+[1,["041T5FEmlMUouP+HAUMhmv"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"30003_1_4","rect":[18,72,162,150],"offset":[0,-3],"originalSize":[198,288],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]