合并代码

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

@@ -44,6 +44,7 @@ export default class HarvestData extends Data {
                 {
                     if (gData.gameData.prohibiJBAd[gData.loginData.userChannel - 1] == "1") {
                         this.isTouchBtn = false;
+                        this.isCdOver = true;
                         mk.ui.openPanel('game/prefab/uiPanel/HarvestPanel');
                     } else {
                         this.isCdOver = false;
@@ -93,6 +94,7 @@ export default class HarvestData extends Data {
         let response = await mk.http.sendData('redMoney/addRedMoneyByFarm', data);
 
         if (response && response.errcode != 0) {
+            this.isCdOver = true;
             return;
         }