收获流程优化

assets/resources/game/prefab/uiPanel/HarvestPanel.prefab

@@ -2245,7 +2245,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 71,
+      "width": 69,
       "height": 68
     },
     "_anchorPoint": {
@@ -2550,7 +2550,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "d7pFdyKU1IwYMIZ4jRBWQC",
+    "fileId": "39pwtVHjxI1IdKUyI4U2I5",
     "sync": false
   },
   {
@@ -2661,7 +2661,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "c5CnyDfepPxblwnvLtjCej",
+    "fileId": "7dMva2PLVKp6xKFv4jqFGA",
     "sync": false
   },
   {
@@ -2772,7 +2772,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "da0uOAVexDjrPWrQ8JJBhi",
+    "fileId": "08IGWoaK5AN77hpmMUxAbd",
     "sync": false
   },
   {
@@ -3079,6 +3079,9 @@
     "lbl_max": {
       "__id__": 70
     },
+    "node_hb": {
+      "__id__": 14
+    },
     "_id": ""
   },
   {

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -185,7 +185,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 717,
-      "height": 1295
+      "height": 1195
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -267,7 +267,7 @@
       "ctor": "Float64Array",
       "array": [
         -314.062,
-        614.38,
+        586.38,
         0,
         0,
         0,
@@ -373,7 +373,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": -314.062,
-      "y": 614.38
+      "y": 586.38
     },
     "angle": 0,
     "scale": 1,
@@ -396,7 +396,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": -314.062,
-      "y": 614.38
+      "y": 586.38
     },
     "angle": 0,
     "scale": 1,
@@ -841,7 +841,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        441.574,
+        440.574,
         0,
         0,
         0,
@@ -1113,7 +1113,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "084vuOQeBIQo2zGxUm3CBg",
+    "fileId": "c5cgWhL4JIjLkpCciSXm9Y",
     "sync": false
   },
   {
@@ -1322,7 +1322,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "c0qxc2aYNC+L0dI3Cuhg9u",
+    "fileId": "83QVHEkXhAbJaaOHy8NtDV",
     "sync": false
   },
   {
@@ -1396,6 +1396,7 @@
     "rich_text_2": {
       "__id__": 37
     },
+    "isSetShowContent": true,
     "_id": ""
   },
   {
@@ -1476,7 +1477,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 500,
-      "y": 441.574
+      "y": 440.574
     },
     "angle": 0,
     "scale": 1,
@@ -1499,7 +1500,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 441.574
+      "y": 440.574
     },
     "angle": 0,
     "scale": 1,
@@ -1545,7 +1546,7 @@
         "__id__": 96
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 112
@@ -3985,7 +3986,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 610,
-      "height": 550
+      "height": 650
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3997,7 +3998,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -114.149,
+        49.851,
         0,
         0,
         0,
@@ -4068,7 +4069,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        179.682,
+        220.68200000000002,
         0,
         0,
         0,
@@ -5275,7 +5276,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -49.58,
+        -42.58,
         0,
         0,
         0,
@@ -6482,7 +6483,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -3,
+        -2,
         0,
         0,
         0,
@@ -9450,7 +9451,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 500,
-      "y": -49.58
+      "y": -42.58
     },
     "angle": 0,
     "scale": 1,
@@ -9462,7 +9463,7 @@
       "__id__": 272
     },
     "duration": 0.2,
-    "delay": 0.7,
+    "delay": 0.6,
     "isOffset": false,
     "onComplete": [],
     "onStart": [],
@@ -9473,7 +9474,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -49.58
+      "y": -42.58
     },
     "angle": 0,
     "scale": 1,
@@ -9551,7 +9552,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -191,
+        -224,
         0,
         0,
         0,
@@ -10394,7 +10395,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 500,
-      "y": -191
+      "y": -224
     },
     "angle": 0,
     "scale": 1,
@@ -10406,7 +10407,7 @@
       "__id__": 301
     },
     "duration": 0.2,
-    "delay": 0.8,
+    "delay": 0.7,
     "isOffset": false,
     "onComplete": [],
     "onStart": [],
@@ -10417,7 +10418,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -191
+      "y": -224
     },
     "angle": 0,
     "scale": 1,
@@ -10509,7 +10510,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 500,
-      "y": -114.149
+      "y": 49.851
     },
     "angle": 0,
     "scale": 1,
@@ -10521,7 +10522,7 @@
       "__id__": 308
     },
     "duration": 0.2,
-    "delay": 0.5,
+    "delay": 0.4,
     "isOffset": false,
     "onComplete": [],
     "onStart": [],
@@ -10532,7 +10533,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -114.149
+      "y": 49.851
     },
     "angle": 0,
     "scale": 1,
@@ -10610,7 +10611,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -480.807,
+        -397.807,
         0,
         0,
         0,
@@ -10916,7 +10917,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 500,
-      "y": -480.807
+      "y": -397.807
     },
     "angle": 0,
     "scale": 1,
@@ -10928,7 +10929,7 @@
       "__id__": 322
     },
     "duration": 0.2,
-    "delay": 0.9,
+    "delay": 0.8,
     "isOffset": false,
     "onComplete": [],
     "onStart": [],
@@ -10939,7 +10940,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -480.807
+      "y": -397.807
     },
     "angle": 0,
     "scale": 1,
@@ -11167,6 +11168,9 @@
     "lbl_tipUp": {
       "__id__": 92
     },
+    "node_addCash": {
+      "__id__": 283
+    },
     "btn_cashOut": {
       "__id__": 324
     },

assets/resources/module/speedUpUI/productReward.prefab

@@ -1064,7 +1064,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 288.49,
+      "width": 380.28,
       "height": 50
     },
     "_anchorPoint": {
@@ -1140,7 +1140,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -105.245,
+        -151.14,
         0,
         0,
         0,
@@ -1248,7 +1248,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -39,
+        -84.89499999999998,
         -5,
         0,
         0,
@@ -1344,7 +1344,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 156,
+      "width": 247.79,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1356,7 +1356,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        66.245,
+        66.24500000000002,
         0,
         0,
         0,
@@ -1396,8 +1396,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "次，立即提现",
-    "_N$string": "次，立即提现",
+    "_string": "次，立即提现0.3~3元",
+    "_N$string": "次，立即提现0.3~3元",
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1435,7 +1435,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 288.49,
+      "width": 380.28,
       "height": 50
     },
     "_resize": 1,

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

@@ -13,6 +13,7 @@ export default class HarvestData extends Data {
     //领取类型  0 普通领取 1 超级加倍
     getType = 0;
     init_reward = false;
+    worldPos:cc.Vec2 = null;
     openPanel(configID, plantID, call) {
         this.configID = configID;
         this.plantID = plantID;
@@ -27,9 +28,12 @@ export default class HarvestData extends Data {
         super.setAdData(data);
 
         //奖励弹窗
-        gData.reward.adData = gData.harvestData.adData;
+        //gData.reward.adData = gData.harvestData.adData;
+        gData.reward.data = gData.harvestData.adData.videoRedMoney.videoRewardList;
         gData.reward.callback = gData.harvestData.call;
-        mk.ui.openPanel('module/reward/reward');
+
+        gData.reward.getReward(this.worldPos);
+        //mk.ui.openPanel('module/reward/reward');
         gData.harvestData.call = null;
     }
 }

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

@@ -11,6 +11,7 @@ const { ccclass, property } = cc._decorator;
 export default class HarvestPanel extends cc.Component {
     @property({ type: cc.Label }) lbl_des: cc.Label = null;
     @property({ type: cc.RichText }) lbl_max: cc.RichText = null;
+    @property({type: cc.Node}) node_hb: cc.Node = null;
 
     start() {
         let data = gData.gameData.configs.CashCfg[0];
@@ -24,7 +25,7 @@ export default class HarvestPanel extends cc.Component {
         // gData.harvestData.config.picture
         //调用收获红包币接口
         mk.audio.playEffect("button");
-        mk.ui.closePanel('HarvestPanel');
+        
         gData.adData.checkShowFullInter(1, InterFullAdType.interstitial2_init_2);
 
         let data = { id: gData.harvestData.config.id };
@@ -43,12 +44,17 @@ export default class HarvestPanel extends cc.Component {
             let rewardData = [{ rewardType: 1, rewardNum: response.data.redMoneyAddition }];
             gData.reward.data = rewardData;
             gData.reward.callback = gData.harvestData.call;
-            mk.ui.openPanel('module/reward/reward');
+
+            let world_Pos = this.node_hb.parent.convertToWorldSpaceAR(this.node_hb.getPosition());
+            gData.reward.getReward(world_Pos);
+            //mk.ui.openPanel('module/reward/reward');
         }
+        mk.ui.closePanel('HarvestPanel');
     }
 
     public async clickSuperBtn() {
         mk.audio.playEffect("button");
+        gData.harvestData.worldPos = this.node_hb.parent.convertToWorldSpaceAR(this.node_hb.getPosition());
         mk.ui.closePanel('HarvestPanel');
         mk.ad.videoAdType = VideoAdType.video_init_12;
         gData.harvestData.getType = 1;

assets/script/game/component/tween/TweenCast.ts

@@ -30,6 +30,8 @@ export default class TweenCast extends cc.Component {
     private isShowFirstNotice: boolean = true;
     @property({ displayName: '一开始显示的公告', type: cc.RichText, visible() { return this.isShowFirstNotice } })
     private rich_text_2: cc.RichText = null;
+    @property({displayName: '是否需要设置展示内容'})
+    private isSetShowContent: boolean = false;
 
 
     private names: string[] = ["拒绝寂寞", "孽緣", "祗為与妳相爱", "羙男", "浅蓝", "腊笔小东", "卡布奇诺", "苊狠幸福", "埋葬回忆", "早已该放手", "白兎",
@@ -71,7 +73,10 @@ export default class TweenCast extends cc.Component {
             if(this.rich_text_2)
                 this.rich_text_2.node.active = false;
         }
-        this.play();
+        if(!this.isSetShowContent)
+        {
+            this.play();
+        }
     }
 
     private play() {
@@ -173,5 +178,10 @@ export default class TweenCast extends cc.Component {
             }
             this.rich_text_2.string = this.getContent();
         }
+
+        if(this.isSetShowContent)
+        {
+            this.play();
+        }
     }
 }

assets/script/game/data/GameData.ts

@@ -29,7 +29,7 @@ export class GameData {
     public playerProp: PlayerProp = null;
     /** 标志位：刷新主界面货币 */
     public init_coin: boolean = false;
-
+    public addHb: number = 0;
     public updatePiggyBankValue: boolean = false;
 
     /** 标志位：刷新主界面头像 */
@@ -304,6 +304,7 @@ export class GameData {
         this.initProductTimes();
         this.initLeftTimes();
         this.initFarmMapGetRewardData();
+        this.initCashOutTimes();
 
         // let isNewTask = this.getProp(GameProp.redBagTaskRefresh);
         // if (isNewTask != undefined) {
@@ -405,6 +406,27 @@ export class GameData {
         }
     }
 
+    //提现次数
+    public _cashOutTimes = 0;
+    public initCashOutTimes()
+    {
+        let v= this.getProp(GameProp.cashOutTimes);
+        if(v)
+        {
+            this._cashOutTimes = v;
+        }else{
+            this._cashOutTimes = 0;
+        }
+        console.log(`initCashOutTimes====>${this._cashOutTimes }`);
+    }
+
+    public addCashOutTimes()
+    {
+        this._cashOutTimes += 1;
+        this.setProp(GameProp.cashOutTimes, this._cashOutTimes);
+        console.log(`addCashOutTimes====>${this._cashOutTimes }`);
+    }
+
     /** 是否是新用户 */
     public isNewPlayer(): boolean {
         let v = this.getProp(GameProp.newPlayer);
@@ -1177,6 +1199,10 @@ export enum GameProp {
 
     /** ------------------ 转盘数据 ------------------------------ */
     turnable_leftTimes = 20,
+
+    //提现次数
+    cashOutTimes = 21,
+    
 }
 
 /**

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

@@ -120,7 +120,8 @@ export class BlessingBagData extends Data {
         mk.data.sendDataEvent(DataEventId.fudaiFunction, `视频红包第${this.taskRbId}档提现成功`);
         mk.data.sendDataEvent(DataEventId.Sundry, '福利提现成功');
         gData.gameData.doPointToXYLogic();
-
+        gData.gameData.addCashOutTimes();
+        
         gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
         mk.ui.openPanel('module/newNotice/newNotice');
 

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

@@ -32,6 +32,9 @@ export class GradeRewardData extends Data {
 
         mk.data.sendDataEvent(DataEventId.Sundry, '农场等级奖励提现成功');
         gData.gameData.doPointToXYLogic();
+
+        gData.gameData.addCashOutTimes();
+
         this.changeExp = true;
         gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo
 

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

@@ -1,5 +1,5 @@
 import { Data } from "../../../mk/data/Data";
-import { RewardType } from "../GameData";
+import { ExpAddType, RewardType } from "../GameData";
 
 /**
  * @description 奖励数据
@@ -36,6 +36,7 @@ export class RewardData extends Data {
         for (let i = 0; i < i_count; i++) {
             if (gData.reward.data[i].rewardType == RewardType.redBag) {
                 if (gData.reward.data[i].rewardNum) {
+                    gData.gameData.addHb = gData.reward.data[i].rewardNum;
                     gData.gameData.playerProp.redMoney += gData.reward.data[i].rewardNum;
                 }
             } else if (gData.reward.data[i].rewardType == RewardType.rmb) {
@@ -71,4 +72,17 @@ export class RewardData extends Data {
             }, scale)
         }
     }
+
+    public getReward(world_Pos: cc.Vec2)
+    {
+        //let world_Pos = this.node_hb.node.parent.convertToWorldSpaceAR(this.node_hb.node.getPosition());
+        this.flyCoinAnim(world_Pos);
+        if (this.callback) {
+            this.callback();
+            this.callback = null;
+        }
+        else {
+            gData.farmGradeData.addGradeExp(ExpAddType.EAT_others, world_Pos);
+        }
+    }
 }

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

@@ -151,6 +151,8 @@ export class SignData extends Data {
             } else if (response.CashMode == 1) {//公众号打款
             }
 
+            gData.gameData.addCashOutTimes();
+            
             const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
             gData.receiptNotice.receip_rmb = rewardNum;
 

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

@@ -31,6 +31,7 @@ export class WalletCashOutData extends Data {
         mk.ui.openPanel('module/newNotice/newNotice');
 
         gData.gameData.doPointToXYLogic();
+        gData.gameData.addCashOutTimes();
     }
 
     async addProgress() {
@@ -81,6 +82,7 @@ export class WalletCashOutData extends Data {
 
         mk.data.sendDataEvent(DataEventId.Sundry, '红包币提现成功');
         gData.gameData.doPointToXYLogic();
+        gData.gameData.addCashOutTimes();
     }
 
 }

assets/script/game/game/AniControl.ts

@@ -51,7 +51,12 @@ export default class AniControl extends cc.Component {
         //this.doStarLogic();
         this.doDogMoveLogic();
         //this.doDuckMoveLogic(); 
-        this.doSheepMoveLogic();
+        
+        let data = gData.gameData.funOpenData;
+        if(data[9] == '1')
+        {
+            this.doSheepMoveLogic();
+        }      
     }
 
     private doFlyBirdLogic() {

assets/script/game/game/Farmer.ts

@@ -22,7 +22,7 @@ export class Farmer extends cc.Component {
 
         this.clips = this.animation.getClips();
 
-        this.refreshTime = gData.gameData.configs.ServerConfig.AutoTime + 5;
+        this.refreshTime = parseInt(gData.gameData.configs.ServerConfig.AutoTime)  + 5;
     }
     update(dt) {
         if (this.walk.curTargetPoint && this.walk.curTargetPoint.x > this.node.position.x) {
@@ -44,7 +44,7 @@ export class Farmer extends cc.Component {
             if (this.refreshTime >= 0) {
                 this.refreshTime -= dt;
             } else {
-                this.refreshTime = gData.gameData.configs.ServerConfig.AutoTime;
+                this.refreshTime = parseInt(gData.gameData.configs.ServerConfig.AutoTime);
                 this.getRewardByHttp();
             }
         }
@@ -59,7 +59,7 @@ export class Farmer extends cc.Component {
         }
 
         let add = response.data.redMoneyAddition;
-        console.log('addCoinByFarmer===============>', add);
+        //console.log('addCoinByFarmer===============>', add);
         if (add > 0) {
             const several = 2;
             let intV = Math.floor(add / several);

assets/script/game/game/FunBtns.ts

@@ -37,6 +37,11 @@ export default class FunBtns extends cc.Component {
                 node_btn.active = data[i] == "1";
             }
         }
+
+        if(this.btn8.active)
+        {
+            this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
+        }
     }
 }
 

assets/script/game/game/Game.ts

@@ -67,6 +67,15 @@ export default class Game extends cc.Component {
     @property({ type: cc.Node, displayName: '增加效果文本3' })
     ani_add3: cc.Node = null;
 
+    @property({ type: cc.Node, displayName: '加经验效果' })
+    node_addExp: cc.Node = null;
+    @property({ type: cc.Label, displayName: '加经验文本' })
+    lbl_addExp: cc.Label = null;
+    @property({ type: cc.Node, displayName: '加红包币效果' })
+    node_addHb: cc.Node = null;
+    @property({ type: cc.Label, displayName: '加红包币文本' })
+    lbl_addHb: cc.Label = null;
+
     posY = 0;
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -86,6 +95,7 @@ export default class Game extends cc.Component {
         if (mk.ad.ifShowAd) {
             JsbSystem.showSplash();
         }
+
     }
 
     start() {
@@ -99,7 +109,7 @@ export default class Game extends cc.Component {
         // if(gData.sign.redPoint() && this.autoPopSign)
         // {
         //     let id = gData.gameData.getProp(GameProp.guideID);
-            
+
         //     if(id >= 1)
         //     {
         //         mk.ui.openPanel('module/sign/sign');
@@ -179,7 +189,7 @@ export default class Game extends cc.Component {
     private initInfo() {
         this.lbl_redMoney.string = gData.gameData.playerProp.redMoney / 100 + "";
         gData.gameData.init_coin = false;
-
+        
         if (gData.gameData.playerProp.userFarmTaskInfo) {
             let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
             let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
@@ -204,6 +214,21 @@ export default class Game extends cc.Component {
         cc.tween(this.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
         this.lbl_redMoney.string = gData.gameData.playerProp.redMoney / 100 + "";
         gData.gameData.init_coin = false;
+
+        if (gData.gameData.addHb > 0) {
+            let add =  gData.gameData.addHb / 100;
+            this.lbl_addHb.string = "+" + add.toString();
+            gData.gameData.addHb = 0;
+
+            {
+                cc.Tween.stopAllByTarget(this.node_addHb);
+                this.node_addHb.active = true;
+                this.node_addHb.scale = 0;
+                cc.tween(this.node_addHb).to(0.1, { scale: 1 }).delay(1).call(() => {
+                    this.node_addHb.active = false;
+                }).start();
+            }
+        }
     }
 
     private async initHead() {
@@ -503,9 +528,17 @@ export default class Game extends cc.Component {
 
     public playAdd(exp, type = 1) {
         if (type == 1) {
-            this.ani_add.node.getComponent(cc.Label).string = `+${exp}`;
-            this.ani_add.node.active = true;
-            this.ani_add.play();
+            // this.ani_add.node.getComponent(cc.Label).string = `+${exp}`;
+            // this.ani_add.node.active = true;
+            // this.ani_add.play();
+
+            cc.Tween.stopAllByTarget(this.node_addExp);
+            this.node_addExp.active = true;
+            this.node_addExp.scale = 0;
+            this.lbl_addExp.string = `+${exp}`;
+            cc.tween(this.node_addExp).to(0.1, { scale: 1 }).delay(1).call(() => {
+                this.node_addExp.active = false;
+            }).start();
         } else {
 
             this.ani_add2.getComponent(cc.Label).string = `生产次数+${exp}`;

assets/script/game/game/TouchListener.ts

@@ -17,7 +17,7 @@ const { ccclass, property } = cc._decorator;
         //cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, this.onKeyDown, this);
     }
 
-    private onTouchStart(e)
+    private onTouchStart(e) 
     {
         if(!gData.gameData.isTouchScreen)
         {

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

@@ -1,7 +1,7 @@
 import SetGray from "../../component/SetGray";
 import TweenCast from "../../component/tween/TweenCast";
 import { AdFun } from "../../data/AdData";
-import { VideoAdType } from "../../data/GameData";
+import { GameProp, VideoAdType } from "../../data/GameData";
 import CheckButton from "./CheckButton";
 
 
@@ -31,6 +31,8 @@ export default class WalletCashOut extends cc.Component {
     private lbl_noviceValue: cc.Label = null;
     @property({ displayName: '上提示', type: cc.Label })
     private lbl_tipUp: cc.Label = null;
+    @property({displayName: '加现金按钮节点', type: cc.Node})
+    private node_addCash: cc.Node = null;
 
     @property(SetGray)
     btn_cashOut: SetGray = null;
@@ -48,7 +50,7 @@ export default class WalletCashOut extends cc.Component {
 
     start() {
         // mk.ad.showNative(4);
-        this.initNoviceUI(true);
+        //this.initNoviceUI(true);
         this.initCashOutUI();
 
         // let data = [{}, {}, {}, {}, {}, {}];
@@ -107,6 +109,15 @@ export default class WalletCashOut extends cc.Component {
     }
 
     private initCashOutUI() {
+
+        let data = gData.gameData.funOpenData;
+        if(data[10] == '1')
+        {
+            this.node_addCash.active = gData.gameData._cashOutTimes >= parseInt(gData.gameData.configs.ServerConfig.CashIncrease);
+        }else{
+            this.node_addCash.active = false;
+        }
+        
         if (gData.gameData.configs.CashCfg) {
             let arr = [];
             let data = gData.gameData.configs.CashCfg

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -312,7 +312,7 @@ export default class RedBagTask extends cc.Component {
             mk.data.sendXYEvent('guide_harvest', '首次领取任务红包');
         }
         gData.gameData.doPointToXYLogic();
-
+        gData.gameData.addCashOutTimes();
         gData.adData.checkPopCashFull();
     }
 

assets/script/mk/system/FlySystem.ts

@@ -130,6 +130,7 @@ export default class FlySystem extends cc.Component {
 
     private showLabStrChange(value: number) {
         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();

assets/script/mk/system/FlySystem2.ts

@@ -130,7 +130,7 @@ export default class FlySystem2 extends cc.Component {
     private showLabStrChange(value: number)
     {
         if(gData.gameData.gameStyle.lbl_redMoney)
-        {
+        {         
             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();

assets/script/mk/system/JsbSystem.ts

@@ -79,7 +79,7 @@ export default class JsbSystem {
     /** 获取手机授权 */
     public static checkPermission() {
         if (CC_DEBUG) {
-            gData.appData.mac = '49:16:ec:c3:d3:55,89:46:dc:dd:b7:58';
+            gData.appData.mac = '05:16:ec:c3:d3:55,89:46:dc:dd:b7:13';
             gData.appData.machineInfo.mac = gData.appData.mac;
             gData.appData.getDeviceInfoCompelete = true;
         }
@@ -147,10 +147,10 @@ export default class JsbSystem {
         }
 
         if (CC_DEBUG) {
-            gData.appData.appId = "wx3c0cc2f730c5ad5a";
+            //gData.appData.appId = "wx3c0cc2f730c5ad5a";
+            //gData.appData.version = "1.0.0";
+            gData.appData.appId = "wx667751c00aad1686";
             gData.appData.version = "1.0.0";
-            // gData.appData.appId = "wx667751c00aad1686";
-            // gData.appData.version = "1.1.2";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)