Merge branch 'master' of git.mokasz.com:zouyong/team1_nc

assets/script/before/main/FarmIcon.ts

@@ -86,6 +86,7 @@ export class FarmIcon extends cc.Component {
                     this.process.node.active = true;
                     this.countDown.setState(1);
                     this.process.setData(this.data);
+                    this.plantID = this.data.productID;
 
                     let prefab = await mk.loader.load("game/prefab/ProductShow1", cc.Prefab);
                     let item = cc.instantiate(prefab);

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

@@ -15,11 +15,23 @@ export default class HarvestPanel extends cc.Component {
         mk.ui.closePanel('HarvestPanel');
         gData.adData.checkShowFullInter(1, InterFullAdType.interstitial2_init_2);
 
+        let data = { id: gData.harvestData.config.id };
+        let response = await mk.http.sendData('redMoney/addRedMoneyByFarm', data);
+
+        if (response && response.errcode != 0) {
+            return;
+        }
+
         //奖励弹窗
-        let rewardData = [{ rewardType: 1, rewardNum: 20 }];
-        gData.reward.data = rewardData;
-        gData.reward.callback = gData.harvestData.call;
-        mk.ui.openPanel('module/reward/reward');
+        if (response.data.redMoneyAddition <= 0) {
+            console.log('返回奖励为0')
+        }
+        else {
+            let rewardData = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }];
+            gData.reward.data = rewardData;
+            gData.reward.callback = gData.harvestData.call;
+            mk.ui.openPanel('module/reward/reward');
+        }
     }
 
     public async clickSuperBtn() {

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

@@ -63,7 +63,7 @@ export default class PlantItem extends cc.Component {
         }
         this.plantIcon.spriteFrame = await mk.loader.load(plantPath + list_data.picture, cc.SpriteFrame);
         this.nameIcon.spriteFrame = await mk.loader.load(namePath + list_data.picture, cc.SpriteFrame);
-        this.awardLabel.string = list_data.MenuredBagCoin;
+        this.awardLabel.string = list_data.menuRedBagCoin.toString();
         this.timeLabel.string = list_data.time;
         let unlock = false;
         let times = 0;

assets/script/game/data/AdData.ts

@@ -225,12 +225,12 @@ export class AdData {
 
     /** 设置用户ecpm分级, 自动弹窗字典等 */
     public setEcpmLevel() {
-        //test
-        this.ecpmLevel = 1;
-        this.AutoRedMoneyMap.set(1, 20);
-        return;
+        // //test
+        // this.ecpmLevel = 1;
+        // this.AutoRedMoneyMap.set(1, 20);
+        // return;
 
-        let forceAd = gData.gameData.configs.forceAd;
+        let forceAd = gData.gameData.configs.ForceAd;
         let len = forceAd.length;
         let ecpmlevel = -1;
         for (var i = 0; i < len; i++) {
@@ -382,10 +382,9 @@ export class AdData {
 
 
     getPerByEcpm() {
-        //test
-        return 0.26;
-
-        let forceAd = gData.gameData.configs.forceAd;
+        // //test
+        // return 0.26;
+        let forceAd = gData.gameData.configs.ForceAd;
         let len = forceAd.length;
         let per = 0;
         for (var i = 0; i < len; i++) {

assets/script/game/data/ConfigData.ts

@@ -10,7 +10,7 @@ export class ConfigData {
             this.configMap.set(this.configNames[i], result);
         }
 
-        gData.gameData.setProductMapFromJson();
+        // gData.gameData.setProductMapFromJson();
     }
 
 }

assets/script/game/data/GameData.ts

@@ -145,7 +145,7 @@ export class GameData {
         this.configs = data;
         this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
         //从服务器解析配置
-        // this.setProductMapFromJson();
+        this.setProductMapFromJson();
     }
 
     /**
@@ -492,16 +492,15 @@ export class GameData {
 
     private async updateNewTaskProgress() {
 
-        if(gData.gameData.init_redBagTask)
-        {
+        if (gData.gameData.init_redBagTask) {
             return;
         }
         if (gData.gameData.gameData.userFarmTaskInfo) {
             let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
             let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
 
-            if(com >= count)
-            return;
+            if (com >= count)
+                return;
         }
 
         let data = {};
@@ -587,9 +586,9 @@ export class GameData {
     private _productTypeMap: Map<string, any> = new Map();
     /** 设置puduct配置数据 */
     public setProductMapFromJson() {
-        // let productJson = this.configs.product;
-        //先用本地数据
-        let productJson = gData.configData.configMap.get('product');
+        let productJson = this.configs.Product;
+        // // 先用本地数据
+        // let productJson = gData.configData.configMap.get('product');
         let len = productJson.length;
         let product = null;
         let tab = '';