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

assets/script/before/main/FarmCountDown.ts

@@ -105,13 +105,17 @@ export class FarmCountDown extends cc.Component {
         this.normalGroup.active = false;
         let can = false;
         if (gData.gameData.playerProp.completeFarmTaskTimes >= 1 && Math.random() < 0.2) {
-            if (this.productConfig.tab == ProductType.nzw && gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
-                can = true;
-                gData.gameData.RawInsectCurArr[0]++;
+            if (this.productConfig.tab == ProductType.nzw) {
+                if (gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
+                    can = true;
+                    gData.gameData.RawInsectCurArr[0]++;
+                }
             }
-            else if (this.productConfig.tab == ProductType.dw && gData.gameData.RawInsectCurArr[1] < parseInt(gData.gameData.RawInsectArr[1])) {
-                can = true;
-                gData.gameData.RawInsectCurArr[1]++;
+            else if (this.productConfig.tab == ProductType.dw) {
+                if (gData.gameData.RawInsectCurArr[1] < parseInt(gData.gameData.RawInsectArr[1])) {
+                    can = true;
+                    gData.gameData.RawInsectCurArr[1]++;
+                }
             }
             else if (gData.gameData.RawInsectCurArr[2] < parseInt(gData.gameData.RawInsectArr[2])) {
                 can = true;

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

@@ -98,7 +98,7 @@ export default class Reward extends cc.Component {
         const newRedMoney = redMoney > cash_data.redMoney ? cash_data.redMoney : redMoney;
         this.lbl_cash.string = cash_data.money / 100 + '元';
         this.lbl_cash_out.string = newRedMoney + '/' + cash_data.redMoney / 100;
-        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney/100);
+        const fillRange = newRedMoney / cash_data.redMoney >= 1 ? 1 : newRedMoney / (cash_data.redMoney / 100);
         // this.spr_cash_out.fillRange = fillRange;
         cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
         if (redMoney >= cash_data.redMoney) {
@@ -169,7 +169,7 @@ export default class Reward extends cc.Component {
             gData.reward.callback = null;
         }
         else {
-            gData.farmGradeData.addGradeExp(ExpAddType.EAT_others);
+            gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, world_Pos);
         }
         this.onClickClose();
     }