优化订单，红包币提现

assets/resources/game/prefab/flyHb.prefab

@@ -0,0 +1,252 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "flyHb",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 64,
+      "height": 71
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.5,
+        1.5,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 116.34,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        40.403,
+        3.58,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "+2000",
+    "_N$string": "+2000",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 86,
+      "b": 10,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "e7f7e86c-72d4-48e6-89e1-4e81941022fb"
+    },
+    "fileId": "ceIZJ1HGVLCKKSf43sjksV",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "5abbf7c1-a43e-4a8a-9682-202851c05c7e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "e7f7e86c-72d4-48e6-89e1-4e81941022fb"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/game/prefab/flyHb.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "e7f7e86c-72d4-48e6-89e1-4e81941022fb",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -1113,7 +1113,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "32UJibkopI07b5y1NInp8Y",
+    "fileId": "7bbhkjuH9PxJvvYUAcZ0YS",
     "sync": false
   },
   {
@@ -1322,7 +1322,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "360GNPET5PJK9fyBHTGH4W",
+    "fileId": "cd4sqEPRdH+Lk7X64NPbeX",
     "sync": false
   },
   {
@@ -5437,7 +5437,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -5823,7 +5823,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -5877,7 +5877,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -6084,7 +6084,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -6470,7 +6470,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -6524,7 +6524,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -6731,7 +6731,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -7117,7 +7117,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7171,7 +7171,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -7495,7 +7495,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -7881,7 +7881,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7935,7 +7935,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -8142,7 +8142,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -8528,7 +8528,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -8582,7 +8582,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -8789,7 +8789,7 @@
         0,
         1,
         1.1,
-        1.1,
+        1.2,
         1
       ]
     },
@@ -9175,7 +9175,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71.7,
+      "width": 81.26,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -9229,7 +9229,7 @@
     "_dstBlendFactor": 771,
     "_string": "0.3元",
     "_N$string": "0.3元",
-    "_fontSize": 30,
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,

assets/script/before/main/FarmCountDown.ts

@@ -1,5 +1,5 @@
 import { BitmapFontC } from "../../game/component/BitmapFontC";
-import { ProductType } from "../../game/data/GameData";
+import { GameProp, ProductType } from "../../game/data/GameData";
 import Util from "../util/Util";
 
 const { ccclass, property } = cc._decorator;
@@ -104,7 +104,8 @@ export class FarmCountDown extends cc.Component {
         this.counting = false;
         this.normalGroup.active = false;
         let sick = false;
-        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) {
+        let cashTimes = gData.gameData.getProp(GameProp.cashTimes);
+        if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && cashTimes >= gData.gameData.insectAutoShowLimit && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) {
             if (this.productConfig.tab == ProductType.nzw) {
                 if (gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
                     sick = true;

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

@@ -73,6 +73,7 @@ export default class HarvestData extends Data {
     }
 
     async getNormalReward() {
+        await mk.time.WaitForSeconds(0.2);
         let data = { id: this.config.id };
         let response = await mk.http.sendData('redMoney/addRedMoneyByFarm', data);
 
@@ -117,6 +118,17 @@ export default class HarvestData extends Data {
     
                 let world_Pos = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
                 gData.reward.getReward(world_Pos);
+
+                let str = "+"+ response.data.redMoneyAddition/100 + "";
+                let pos =  mk.fly.node.convertToNodeSpaceAR(world_Pos);
+                let prefab = await mk.loader.load("game/prefab/flyHb", cc.Prefab);
+                let hand = cc.instantiate(prefab);
+                hand.zIndex = 1000;
+                hand.parent = mk.fly.node;
+                hand.setPosition(pos);
+                let lab_value = hand.getComponentInChildren(cc.Label);
+                lab_value.string = str;
+                cc.tween(hand).by(0.8, { y: 100 }).to(0.4, { opacity: 0 }).removeSelf().start();
                 //mk.ui.openPanel('module/reward/reward');
             }
             

assets/script/game/data/AdData.ts

@@ -1,6 +1,6 @@
 import Util from "../../before/util/Util";
 import { Data } from "../../mk/data/Data";
-import { GameProp, InterAdType, VideoAdType } from "./GameData";
+import { GameProp, InterAdType, InterFullAdType, VideoAdType } from "./GameData";
 
 /**
  * @description 广告数据
@@ -429,13 +429,7 @@ export class AdData {
 
             //this.checkPopInter(InterAdType.interstitial1_click_19);
             if (gData.gameData.insertAdSwitch[13] == "1") {
-                mk.ad.videoAdType = VideoAdType.video_init_22;
-                mk.ad.watchAd((success: boolean) => {
-                    mk.console.log("watchAD:" + success);
-                    if (success) {
-                        gData.adData.watchVideo(null);
-                    }
-                });
+                gData.adData.checkShowFullInter(1, InterFullAdType.interstitial2_init_4);
             }
         }
     }

assets/script/game/data/GameData.ts

@@ -121,6 +121,13 @@ export class GameData {
 
     public welfareOpenLimit = 0;
 
+    //订单奖励类型
+    orderRewardType = 1;
+    //提现X次后显示任务红包
+    taskRedBagAutoShowLimit = 0;
+    //提现x次后显示生虫
+    insectAutoShowLimit = 2;
+
     //插屏每日限制
     public insertAdLimit = 0;
     //插屏展示开关
@@ -216,6 +223,10 @@ export class GameData {
 
         gData.gameData.welfareOpenLimit = parseInt(this.configs.ServerConfig.welfareOpen);
 
+        gData.gameData.orderRewardType = parseInt(this.configs.ServerConfig.OrderReward);
+        //gData.gameData.taskRedBagAutoShowLimit = parseInt(this.configs.ServerConfig.harvestSwitch);
+        gData.gameData.insectAutoShowLimit = parseInt(this.configs.ServerConfig.StopProductionSwitch);
+
         gData.gameData.insertAdLimit = parseInt(this.configs.ServerConfig.InsertAdCash);
         gData.gameData.insertAdSwitch = this.configs.ServerConfig.InsertAdScene.split(",");
         gData.gameData.fullScreenAdSwitch = this.configs.ServerConfig.FullScreenAdScene.split(",");
@@ -2337,32 +2348,33 @@ export enum VideoAdType {
     video_init_19 = '定时弹出红包',
     video_init_20 = '插队',
     video_init_21 = '恢复生产次数',
-    video_init_22 = '长时间未操作弹出视频',
+    //video_init_22 = '长时间未操作弹出视频',
 }
 
 export enum InterFullAdType {
     interstitial2_init_1 = '点击红包的关闭按钮',
     interstitial2_init_2 = '普通收获',
     interstitial2_init_3 = '点击鸟和狗',
-    interstitial2_init_4 = '关闭个人资料页',
-    interstitial2_init_5 = '关闭农场等级奖励界面',
-    interstitial2_init_6 = '关闭红包币提现界面',
-    interstitial2_init_7 = '关闭抽奖界面',
-    interstitial2_init_8 = '关闭任务红包界面',
-    interstitial2_init_9 = '关闭更多游戏界面',
-    interstitial2_init_10 = '关闭图鉴界面',
-    interstitial2_init_11 = '关闭生虫、生病、停电弹窗',
-    interstitial2_init_12 = '关闭全体加速界面',
-    interstitial2_init_13 = '关闭收获弹窗',
-    interstitial2_init_14 = '关闭富翁银行',
-    interstitial2_init_15 = '关闭福利界面',
-    interstitial2_init_16 = '一键生产-关闭领取生产次数弹窗',
-    interstitial2_init_17 = '红包币提现界面，点击提现按钮',
-    interstitial2_init_18 = '福利-点击提现按钮',
-    interstitial2_init_19 = '订单-点击订单提现按钮',
-    interstitial2_init_20 = '任务红包-点击领取按钮',
-    interstitial2_init_21 = '富翁银行-点击开始任务按钮',
-    interstitial2_init_22 = '富翁银行-点击提现按钮',
+    interstitial2_init_4 = '长时间未操作弹出',
+    // interstitial2_init_4 = '关闭个人资料页',
+    // interstitial2_init_5 = '关闭农场等级奖励界面',
+    // interstitial2_init_6 = '关闭红包币提现界面',
+    // interstitial2_init_7 = '关闭抽奖界面',
+    // interstitial2_init_8 = '关闭任务红包界面',
+    // interstitial2_init_9 = '关闭更多游戏界面',
+    // interstitial2_init_10 = '关闭图鉴界面',
+    // interstitial2_init_11 = '关闭生虫、生病、停电弹窗',
+    // interstitial2_init_12 = '关闭全体加速界面',
+    // interstitial2_init_13 = '关闭收获弹窗',
+    // interstitial2_init_14 = '关闭富翁银行',
+    // interstitial2_init_15 = '关闭福利界面',
+    // interstitial2_init_16 = '一键生产-关闭领取生产次数弹窗',
+    // interstitial2_init_17 = '红包币提现界面，点击提现按钮',
+    // interstitial2_init_18 = '福利-点击提现按钮',
+    // interstitial2_init_19 = '订单-点击订单提现按钮',
+    // interstitial2_init_20 = '任务红包-点击领取按钮',
+    // interstitial2_init_21 = '富翁银行-点击开始任务按钮',
+    // interstitial2_init_22 = '富翁银行-点击提现按钮',
 }
 
 export enum InterAdType {

assets/script/game/data/module/RewardData.ts

@@ -28,6 +28,9 @@ export class RewardData extends Data {
      */
     subType: number = 1;
 
+    //reward界面关闭回调
+    closeUICallBack: Function = null;
+
     /**
     * 奖励添加
     */

assets/script/game/game/FunBtns.ts

@@ -1,3 +1,5 @@
+import { GameProp } from "../data/GameData";
+
 const { ccclass, property } = cc._decorator;
 
 @ccclass
@@ -49,9 +51,18 @@ export default class FunBtns extends cc.Component {
                 {
                     this.btn4.y = this.btn4.y + 170;
                 }
-                else if (i == 4 && data[i] == "0")
+                else if (i == 4)
                 {
-                    this.addCount += 1;
+                    if(data[i] == "1"){
+                        let times = gData.gameData.getProp(GameProp.cashTimes);
+                        if(!times){times = 0;}
+                        if(times < gData.gameData.taskRedBagAutoShowLimit){
+                            node_btn.active = false;
+                            mk.event.register("showTaskRedBagAction", this.doShowTaskRedBagActionLogic.bind(this), this);
+                        }
+                    }else{
+                        this.addCount += 1;
+                    }   
                 }
             }
         }
@@ -74,5 +85,24 @@ export default class FunBtns extends cc.Component {
     {
         this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
     }
+
+    doShowTaskRedBagActionLogic(){
+        if(gData.gameData.funOpenData[8] == "1"){
+            let posY = this.btn9.y + 130;
+            cc.tween(this.btn9).to(0.2, {y: posY}).call(()=>{
+                this.doAction();
+            }).start();
+        }else{
+            this.doAction();
+        }
+    }
+
+    doAction(){
+        let posX = this.btn5.x;
+        this.btn5.x = posX + 430;
+        cc.tween(this.btn5).to(0.4, {x: posX}).call(()=>{
+
+        }).start();
+    }
 }
 

assets/script/game/game/Game.ts

@@ -114,8 +114,8 @@ export default class Game extends cc.Component {
 
     @property({ type: cc.Node, displayName: '增加效果文本2' })
     ani_add4: cc.Node = null;
-    @property({ displayName: '红包币', type: cc.Label })
-    lbl_addRedMoney: cc.Label = null;
+    @property({ displayName: '现金', type: cc.Label })
+    lbl_addCash: cc.Label = null;
     @property({ displayName: '红包币图标', type: cc.Node })
     node_orderHb: cc.Node = null;
 
@@ -129,6 +129,13 @@ export default class Game extends cc.Component {
     @property({ displayName: '订单红包', type: cc.Node })
     node_orderHbIcon: cc.Node = null;
 
+    @property({ displayName: '显示现金', type: cc.Node })
+    node_showCash: cc.Node = null;
+    @property({ displayName: '显示红包币', type: cc.Node })
+    node_showRedMoney: cc.Node = null;
+    @property({ displayName: '订单红包币', type: cc.Label })
+    lbl_orderRedMoney: cc.Label = null;
+
     posY = 0;
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -990,7 +997,14 @@ export default class Game extends cc.Component {
         let productJson = gData.gameData.configs.Product;
         let data = gData.gameData.playerProp.orderData;
         if (data) {
-            this.lbl_addRedMoney.string = (data.cashMoney / 100).toFixed(2);
+            //红包币
+            if(gData.gameData.orderRewardType == 1){
+                this.node_showCash.active = false;
+                this.node_showRedMoney.active = true;
+                this.lbl_orderRedMoney.string = data.redMoneyAddition/100 + ""; 
+            }else{
+                this.lbl_addCash.string = (data.cashMoney / 100).toFixed(2);
+            }
             let len = data.orderTaskList.length;
             if (len == 3) {
                 let completeCount = 0;
@@ -1062,6 +1076,8 @@ export default class Game extends cc.Component {
     }
 
     public async getOrderReward() {
+     //现金提现
+     if (gData.gameData.orderRewardType == 2) {
         if (cc.sys.isNative) {
             if (!gData.loginData.isAuth) {
                 // JsbSystem.WxAuth();
@@ -1071,8 +1087,7 @@ export default class Game extends cc.Component {
             }
         }
 
-        let data = {};
-        let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
+        let response = await mk.http.sendData('orderTask/receiveRewardCash', {});
         if (response.errcode != 0) {
             if (response.errcode == 405) {
                 mk.tip.pop("今日提现额度已到上限，请明天再提现");
@@ -1082,12 +1097,6 @@ export default class Game extends cc.Component {
         }
         let addMoney = gData.gameData.playerProp.orderData.cashMoney;
         gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
-        //gData.gameData.cloneOrderData(true);
-
-        //处理红包币逻辑
-        // gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
-        // gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney }]
-        // mk.ui.openPanel('module/reward/reward');
 
         //处理提现逻辑
         gData.cashPro.callBack = this.getRewardCallBack.bind(this);
@@ -1099,6 +1108,26 @@ export default class Game extends cc.Component {
         })
         this.node_orderHbIcon.active = false;
         this.node_getOrderReward.node.active = false;
+    } else {
+        let data = {};
+        let response = await mk.http.sendData('orderTask/receiveReward', data);
+        if (response.errcode != 0) {
+            return null;
+        }
+        let addMoney = gData.gameData.playerProp.orderData.redMoneyAddition;
+        gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
+        //处理红包币逻辑
+        gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
+        gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
+        gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney}]
+        mk.ui.openPanel('module/reward/reward');
+
+        this.node_crop.forEach((v) => {
+            v.active = false;
+        })
+        this.node_orderHbIcon.active = false;
+        this.node_getOrderReward.node.active = false;
+    }
     }
 
     //停止农民产红包币

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

@@ -238,9 +238,10 @@ export default class WalletCashOut extends cc.Component {
         mk.audio.playEffect("button");
         if (this.isCanCash) {
 
-            if (this.checkShowTip()) {
-                mk.tip.pop('请先提现完前一档次数');
-            } else {
+            // if (this.checkShowTip()) {
+            //     mk.tip.pop('请先提现完前一档次数');
+            // } else 
+            {
 
                 if (cc.sys.isNative) {
                     if (!gData.loginData.isAuth) {
@@ -251,13 +252,13 @@ export default class WalletCashOut extends cc.Component {
                     }
                 }
                 
-                gData.adData.checkPopCashFull();
+                gData.adData.checkShowFullInter(1);
                 //this.check_button[this.curChooseIndex].setIsCanNotChoose();
                 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
             }
 
         }else{
-            mk.tip.pop('红包币不足');
+            mk.tip.pop('收获农作物可获得红包币');
         }
     }
 

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

@@ -22,6 +22,10 @@ export default class NewNotice extends cc.Component {
             times = 0;
         }
         gData.gameData.setProp(GameProp.cashTimes, ++times);
+
+        if(gData.gameData.taskRedBagAutoShowLimit == times && gData.gameData.funOpenData[4] == "1"){
+            mk.event.emit("showTaskRedBagAction");
+        }
     }
 
     onEnable()

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

@@ -146,6 +146,11 @@ export default class Reward extends cc.Component {
         if (this.cur_stage === LidType.none) {
             mk.audio.playEffect("button");
         }
+
+        if(gData.reward.closeUICallBack){
+            gData.reward.closeUICallBack();
+            gData.reward.closeUICallBack = null;
+        }
     }
 
     onClickClose() {

assets/script/mk/system/FlySystem2.ts

@@ -130,6 +130,7 @@ export default class FlySystem2 extends cc.Component {
     {
         if(gData.gameData.gameStyle.lbl_redMoney)
         {         
+            gData.gameData.addHb = value;
             gData.gameData.playerProp.redMoney += value;
             //gData.gameData.gameStyle.lbl_redMoney.string = gData.gameData.playerProp.redMoney.toString();
             //cc.tween(gData.gameData.gameStyle.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();