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

assets/resources/module/speedUpUI/speedUp.prefab

@@ -3337,7 +3337,7 @@
       "__id__": 2
     },
     "open_effect": 1,
-    "isOpenCloseEffect": true,
+    "isOpenCloseEffect": false,
     "close_effect": 1,
     "close_toPoint": "",
     "close_uibg": false,

assets/script/before/main/FactorySystem.ts

@@ -49,4 +49,17 @@ export default class FactorySystem {
             }
         }
     }
+
+    canSpeedUp() {
+        let can = false;
+        let len = this.factoryIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.factoryIcons[i].data.state == FactroyState.Producting) {
+                can = true;
+                break;
+            }
+        }
+
+        return can;
+    }
 }

assets/script/before/main/FarmSystem.ts

@@ -76,5 +76,18 @@ export class FarmSystem {
             }
         }
     }
+
+    public canSpeedUp() {
+        let can = false;
+        let len = this.farms.length;
+        for (let i = 0; i < len; i++) {
+            if (this.farms[i].data.state == FarmState.Growing) {
+                can = true;
+                break;
+            }
+        }
+
+        return can;
+    }
 }
 

assets/script/before/main/PastureSystem.ts

@@ -52,4 +52,17 @@ export default class PastureSystem {
             }
         }
     }
+
+    canSpeedUp() {
+        let can = false;
+        let len = this.pastureIcons.length;
+        for (var i = 0; i < len; i++) {
+            if (this.pastureIcons[i].data.state == PastureState.Growing) {
+                can = true;
+                break;
+            }
+        }
+
+        return can;
+    }
 }

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

@@ -76,7 +76,7 @@ export default class PlantItem extends cc.Component {
         }
         //根据农场等级
         else if (list_data.unlock == 2) {
-            if (list_data.value >= gData.gameData.gameData.gradeLevel) {
+            if (list_data.value >= gData.gameData.playerProp.gradeLevel) {
                 unlock = true;
             }
         }

assets/script/game/data/GameData.ts

@@ -26,7 +26,7 @@ export class GameData {
     /** 功能开启 */
     public funOpenData: string[] = [];
 
-    public gameData: PlayerProp = null;
+    public playerProp: PlayerProp = null;
     /** 标志位：刷新主界面货币 */
     public init_coin: boolean = false;
 
@@ -85,6 +85,8 @@ export class GameData {
 
     //标志位 生产奖励的任务ui刷新
     public init_productTask = false;
+
+    public speedUpLeftTimes = 0;
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -129,7 +131,7 @@ export class GameData {
         // if (response.errcode != 0) {
         //     return;
         // }
-        // this.gameData.userTuCaoInfo = response.data.userWelFareTaskInfo;
+        // this.playerProp.userTuCaoInfo = response.data.userWelFareTaskInfo;
         // mk.console.logSingle("welFare/getUserWelFareTaskInfo", response.data);
         gData.guideData.init();
         gData.guideWeakData.init();
@@ -152,33 +154,33 @@ export class GameData {
      * 初始化玩家数据
      */
     private initPlayerProp(res_data) {
-        this.gameData = new PlayerProp();
-        this.gameData.cashIndex = res_data.cashIndex;
-        this.gameData.gameUserData = res_data.gameUserData;
-        this.gameData.isSignInToday = res_data.isSignInToday;
-        this.gameData.isWithdrawable = res_data.isWithdrawable;
-        this.gameData.lastTime = res_data.lastTime;
-        this.gameData.loginDays = res_data.loginDays;
-        this.gameData.newPlayer = res_data.newPlayer;
-        this.gameData.initPiggyBank(res_data.piggyBank);
-        this.gameData.piggyBankCashTimes = res_data.piggyBankCashTimes;
-        this.gameData.redMoney = res_data.redMoney == null ? 0 : res_data.redMoney;
-        this.gameData.signInDay = res_data.signInDay;
-        this.gameData.totalPiggyBankCashTimes = res_data.totalPiggyBankCashTimes;
-        this.gameData.turntableTimes = res_data.turntableTimes;
-        this.gameData.versioncfg = res_data.versioncfg;
-        this.gameData.isFirstRedMoney = res_data.isFirstRedMoney;
+        this.playerProp = new PlayerProp();
+        this.playerProp.cashIndex = res_data.cashIndex;
+        this.playerProp.gameUserData = res_data.gameUserData;
+        this.playerProp.isSignInToday = res_data.isSignInToday;
+        this.playerProp.isWithdrawable = res_data.isWithdrawable;
+        this.playerProp.lastTime = res_data.lastTime;
+        this.playerProp.loginDays = res_data.loginDays;
+        this.playerProp.newPlayer = res_data.newPlayer;
+        this.playerProp.initPiggyBank(res_data.piggyBank);
+        this.playerProp.piggyBankCashTimes = res_data.piggyBankCashTimes;
+        this.playerProp.redMoney = res_data.redMoney == null ? 0 : res_data.redMoney;
+        this.playerProp.signInDay = res_data.signInDay;
+        this.playerProp.totalPiggyBankCashTimes = res_data.totalPiggyBankCashTimes;
+        this.playerProp.turntableTimes = res_data.turntableTimes;
+        this.playerProp.versioncfg = res_data.versioncfg;
+        this.playerProp.isFirstRedMoney = res_data.isFirstRedMoney;
         gData.adData.watchNumToday = res_data.dayVideoTimesForRedMoney == null ? 0 : res_data.dayVideoTimesForRedMoney;
 
-        this.gameData.gradeLevel = res_data.farmLevel
-        this.gameData.userTuCaoInfo = res_data.userWelFareTaskInfo;
-        this.gameData.farmExpValue = res_data.userExp;
-        this.gameData.farmGradeData = res_data.userFarmGrageRewardInfo;
-        this.gameData.userNoviceWeFareInfo = res_data.userNoviceWeFareInfo;
-        this.gameData.redMoneyCashPayRecordList = res_data.redMoneyCashPayRecordList;
+        this.playerProp.gradeLevel = res_data.farmLevel
+        this.playerProp.userTuCaoInfo = res_data.userWelFareTaskInfo;
+        this.playerProp.farmExpValue = res_data.userExp;
+        this.playerProp.farmGradeData = res_data.userFarmGrageRewardInfo;
+        this.playerProp.userNoviceWeFareInfo = res_data.userNoviceWeFareInfo;
+        this.playerProp.redMoneyCashPayRecordList = res_data.redMoneyCashPayRecordList;
         mk.console.logSingle('userNoviceWeFareInfo==>', res_data.userNoviceWeFareInfo);
         //mk.console.logSingle('redMoneyCashPayRecordList==>', res_data.redMoneyCashPayRecordList);
-        this.gameData.userFarmTaskInfo = res_data.userFarmTaskInfo;
+        this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
 
         mk.data.setTAUserID(gData.loginData.uin);
 
@@ -186,7 +188,7 @@ export class GameData {
             gData.loginData.isFirstIn = false;
 
             mk.data.setTAEventRegister();
-            mk.data.sendDataEvent('ABTest', `触发${this.gameData.groupCode}方案`);
+            mk.data.sendDataEvent('ABTest', `触发${this.playerProp.groupCode}方案`);
 
             //注册时版本号
             mk.data.setTAEventUserStr(0, 'regtime_app_id', gData.appData.appVersion);
@@ -365,18 +367,6 @@ export class GameData {
         }
     }
 
-    /**
-     * 第二天需要重置的数据
-     */
-    public resetProps() {
-        let arr = [];
-        arr.push({ key: GameProp.sign_can, value: 1 });
-        arr.push({ key: GameProp.isAutoOpenPanel, value: 1 });
-        arr.push({ key: GameProp.isOpenBankOnCloseCash, value: 0 });
-
-        this.setProps(arr);
-    }
-
     /** 是否是新用户 */
     public isNewPlayer(): boolean {
         let v = this.getProp(GameProp.newPlayer);
@@ -498,9 +488,9 @@ export class GameData {
         // 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 (this.playerProp.userFarmTaskInfo) {
+            let com = this.playerProp.userFarmTaskInfo.completeCount;
+            let count = this.playerProp.userFarmTaskInfo.taskCount;
 
             if (com >= count)
                 return;
@@ -513,7 +503,7 @@ export class GameData {
             return null;
         }
 
-        gData.gameData.gameData.userFarmTaskInfo = response.data.userFarmTaskInfo;
+        this.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         //gData.gameData.init_task = true;
     }
 
@@ -724,7 +714,7 @@ export class GameData {
             let id = 30001;
             let data = null;
             for (var i = 0; i < len1; i++) {
-                if (this.gameData.gradeLevel < arr[i].value) {
+                if (this.playerProp.gradeLevel < arr[i].value) {
                     data = { id: id, state: PastureState.Lock, productID: arr[i].picture, growSpan: 0 };
                 }
                 else {
@@ -790,7 +780,7 @@ export class GameData {
             for (var i = 0; i < 6; i++) {
                 tab = this.getTabByConfigID(id);
                 let arr = this.getProductArrByType(tab);
-                if (this.gameData.gradeLevel < arr[0].value) {
+                if (this.playerProp.gradeLevel < arr[0].value) {
                     data = { id: id, state: FactroyState.Lock, productID: 0, growSpan: 0 };
                 }
                 else {
@@ -945,7 +935,7 @@ export class GameData {
                     needUpdate = false;
                     for (var i = 0; i < len; i++) {
                         data = this.getPastureDataMap(id);
-                        if (data.state == PastureState.Lock && this.gameData.gradeLevel >= configArr[i].value) {
+                        if (data.state == PastureState.Lock && this.playerProp.gradeLevel >= configArr[i].value) {
                             data = { id: id, state: PastureState.Empty, productID: configArr[i].picture, growSpan: 0 };
                             this.setPastureDataMap(id, data, false);
                             needUpdate = true;
@@ -963,7 +953,7 @@ export class GameData {
                     needUpdate = false;
                     let configID = this.getConfigIDByTab(tab);
                     data = this.getFactoryDataMap(configID);
-                    if (data.state == FactroyState.Lock && this.gameData.gradeLevel >= configArr[0].value) {
+                    if (data.state == FactroyState.Lock && this.playerProp.gradeLevel >= configArr[0].value) {
                         data = { id: id, state: FactroyState.Empty, productID: 0, growSpan: 0 };
                         this.setFactoryDataMap(configID, data, false);
                         needUpdate = true;
@@ -980,6 +970,19 @@ export class GameData {
         }
     }
 
+    checkCanSpeedUp() {
+        let can = false;
+        can = gData.farmSystem.canSpeedUp();
+        if (!can) {
+            can = gData.pastureSystem.canSpeedUp();
+            if (!can) {
+                can = gData.factorySystem.canSpeedUp();
+            }
+        }
+
+        return can;
+    }
+
     setHarvest() {
         gData.farmSystem.setHarvest();
         gData.pastureSystem.setHarvest();
@@ -1029,21 +1032,11 @@ export enum GameProp {
     //红包任务tag
     redBagTaskRefresh = 18,
 
-
+    //加速剩余次数
+    speedUpLeftTimes = 19,
 
     /** ------------------ 转盘数据 ------------------------------ */
     turnable_leftTimes = 20,
-
-    /** ------------------ 存钱罐数据 ----------------------------- */
-
-    /** ------------------ 签到数据 ----------------------------- */
-    /** 上次签到进度 */
-    sign_last_bar = 120,
-    /** 当前能否签到 */
-    sign_can = 121,
-    /** ------------------ 红包提现 ----------------------------- */
-    /** 提现进度 */
-    redBag_cash_bar = 220,
 }
 
 /**
@@ -1072,7 +1065,7 @@ class PlayerProp {
     /** 存钱罐存款 */
     set piggyBank(value: number) {
         if (this._piggyBank === value) return;
-        if (gData.gameData.gameData.isWithdrawable && value > 0) return;// 存钱罐可提现状态，不能增加存钱罐金额
+        if (gData.gameData.playerProp.isWithdrawable && value > 0) return;// 存钱罐可提现状态，不能增加存钱罐金额
         this._piggyBank = value;
         gData.gameData.init_coin = true;
         gData.pigbank.init_data = true;

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

@@ -31,7 +31,7 @@ export class BlessingBagData extends Data {
 
     init() {
         this.isPlayAniUpdate = false;
-        this.videoRbData = gData.gameData.gameData.userTuCaoInfo;
+        this.videoRbData = gData.gameData.playerProp.userTuCaoInfo;
         console.log("福袋数据---------------->", this.videoRbData);
     }
 

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

@@ -30,7 +30,7 @@ export class GradeRewardData extends Data {
 
         mk.data.sendDataEvent(DataEventId.Sundry, '农场等级奖励提现成功');
         this.changeExp = true;
-        gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo
+        gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo
         //const rewardNum = Math.round(response.data.userFarmGrageRewardInfo.money * 100);
         gData.receiptNotice.receip_rmb = response.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
 
@@ -51,17 +51,17 @@ export class GradeRewardData extends Data {
             return;
         }
 
-        let addExp = response.data.userExp - gData.gameData.gameData.farmExpValue;
+        let addExp = response.data.userExp - gData.gameData.playerProp.farmExpValue;
         if (!desNode) {
             this.changeExp = true;
             //提示
             mk.tip.pop(`获得${addExp}点等级经验`);
-            if (gData.gameData.gameData.gradeLevel < response.data.farmLevel) {
+            if (gData.gameData.playerProp.gradeLevel < response.data.farmLevel) {
                 gData.gameData.checkGradeUpUnLock();
             }
-            gData.gameData.gameData.gradeLevel = response.data.farmLevel;
-            gData.gameData.gameData.farmExpValue = response.data.userExp;
-            gData.gameData.gameData.farmGradeData = response.data.userFarmGrageRewardInfo;
+            gData.gameData.playerProp.gradeLevel = response.data.farmLevel;
+            gData.gameData.playerProp.farmExpValue = response.data.userExp;
+            gData.gameData.playerProp.farmGradeData = response.data.userFarmGrageRewardInfo;
             gData.gameData.init_red_point = true;
         } else {
             gData.gameData.gameStyle.doFlyExpAni(addExp, desNode, response.data);

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

@@ -42,11 +42,11 @@ export class PigBankData extends Data {
         }
 
         // 打开提现到账界面
-        gData.receiptNotice.receip_rmb = gData.gameData.gameData.piggyBank;
+        gData.receiptNotice.receip_rmb = gData.gameData.playerProp.piggyBank;
         gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
         mk.ui.openPanel('module/receiptNotice/receiptNotice');
-        gData.gameData.gameData.piggyBank = 0;
-        gData.gameData.gameData.isWithdrawable = 0;
+        gData.gameData.playerProp.piggyBank = 0;
+        gData.gameData.playerProp.isWithdrawable = 0;
         gData.gameData.updatePiggyBankValue = true;
         gData.cashNormal.getRecord();// 请求新的提现记录
 
@@ -56,7 +56,7 @@ export class PigBankData extends Data {
      * 红点功能
      */
     public redPoint(): boolean {
-        let bool = !!gData.gameData.gameData.isWithdrawable && gData.gameData.gameData.piggyBank >= this.cash_min_limit;
+        let bool = !!gData.gameData.playerProp.isWithdrawable && gData.gameData.playerProp.piggyBank >= this.cash_min_limit;
         return bool;
     }
 }

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

@@ -15,7 +15,7 @@ export class RedBagCashData extends Data {
     public init() {
         // 提现进度
         // this.cash_bar = gData.gameData.getProp(GameProp.redBag_cash_bar);// 自定义测试数据
-        this.cash_bar = gData.gameData.gameData.cashIndex;// 服务端数据
+        this.cash_bar = gData.gameData.playerProp.cashIndex;// 服务端数据
         // this.initCData();// 假数据列表
         // 签到配置表
         if (gData.gameData.configs.CashCfg) {
@@ -70,11 +70,11 @@ export class RedBagCashData extends Data {
 
         this.cash_bar++;
         this.update_list = true;
-        gData.gameData.gameData.cashIndex++;
+        gData.gameData.playerProp.cashIndex++;
 
         // 扣除红包
         let item_data = this.getItemDataByIndex(cash_index);
-        gData.gameData.gameData.redMoney -= item_data.redMoney;
+        gData.gameData.playerProp.redMoney -= item_data.redMoney;
         // 打开提现到账界面
         let money = 0;
         for (let i = 0; i < r_data.CashStatusList.length; i++) {
@@ -122,7 +122,7 @@ export class RedBagCashData extends Data {
      * 初始化状态
      */
     public initState() {
-        let total = gData.gameData.gameData.redMoney + 0;
+        let total = gData.gameData.playerProp.redMoney + 0;
         const l_count = this.c_data.length;
         for (let i = 0; i < l_count; i++) {
             // 已提现
@@ -197,7 +197,7 @@ export class RedBagCashData extends Data {
      * 红点功能
      */
     public redPoint(): boolean {
-        const redbag_count = gData.gameData.gameData.redMoney;
+        const redbag_count = gData.gameData.playerProp.redMoney;
         const d_count = this.c_data.length;
         for (let i = 0; i < d_count; i++) {
             if (this.c_data[i].index < gData.redBagCash.cash_bar) continue;// 已提现

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

@@ -36,13 +36,13 @@ 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.gameData.redMoney += gData.reward.data[i].rewardNum;
+                    gData.gameData.playerProp.redMoney += gData.reward.data[i].rewardNum;
                 }
             } else if (gData.reward.data[i].rewardType == RewardType.rmb) {
                 // ?
             } else if (gData.reward.data[i].rewardType == RewardType.pigRmb) {
                 if (gData.reward.data[i].rewardNum) {
-                    gData.gameData.gameData.piggyBank += gData.reward.data[i].rewardNum;
+                    gData.gameData.playerProp.piggyBank += gData.reward.data[i].rewardNum;
                 }
             }
         }

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

@@ -81,9 +81,9 @@ export class SignData extends Data {
      */
     public getStateByDay(login_day: number) {
         let _state = 0;
-        if (login_day <= gData.gameData.gameData.signInDay) {
+        if (login_day <= gData.gameData.playerProp.signInDay) {
             _state = RewardState.none;
-        } else if (gData.gameData.gameData.isSignInToday == 0 && login_day == (gData.gameData.gameData.signInDay + 1)) {
+        } else if (gData.gameData.playerProp.isSignInToday == 0 && login_day == (gData.gameData.playerProp.signInDay + 1)) {
             _state = RewardState.unlock;
         } else {
             _state = RewardState.lock;
@@ -96,7 +96,7 @@ export class SignData extends Data {
      * - 签到天数用完后将不可签到
      */
     public haveSignDay() {
-        if (gData.gameData.gameData.signInDay >= this.c_sign.length) {
+        if (gData.gameData.playerProp.signInDay >= this.c_sign.length) {
             return false;
         } else {
             return true;
@@ -108,13 +108,13 @@ export class SignData extends Data {
      */
     public async signComplete() {
         cc.log('签到奖励', gData.sign.adData)
-        gData.gameData.gameData.signInDay++;
-        gData.gameData.gameData.isSignInToday = 1;
+        gData.gameData.playerProp.signInDay++;
+        gData.gameData.playerProp.isSignInToday = 1;
         // // 自定义状态
         // let new_data = [
         //     {
         //         key: GameProp.sign_can,
-        //         value: gData.gameData.gameData.isSignInToday
+        //         value: gData.gameData.playerProp.isSignInToday
         //     },
         //     {
         //         key: GameProp.sign_last_bar,
@@ -123,7 +123,7 @@ export class SignData extends Data {
         // ]
         // gData.gameData.setProps(new_data);
         // 奖励展示
-        let reward_data = this.c_sign[gData.gameData.gameData.signInDay - 1];
+        let reward_data = this.c_sign[gData.gameData.playerProp.signInDay - 1];
         if (reward_data.rewardType === RewardType.redBag) {
             // 红包
             // gData.reward.data = [reward_data];// 数据列表
@@ -175,7 +175,7 @@ export class SignData extends Data {
             const i_count = this.list_data[i].length;
             for (let j = 0; j < i_count; j++) {
                 let state = this.getStateByDay(this.list_data[i][j].id);
-                if (gData.gameData.gameData.isSignInToday == 0) {
+                if (gData.gameData.playerProp.isSignInToday == 0) {
                     if (state === RewardState.unlock) {
                         index = i;
                         return index
@@ -195,7 +195,7 @@ export class SignData extends Data {
      * 红点功能
      */
     public redPoint(): boolean {
-        let bool = !gData.gameData.gameData.isSignInToday && this.haveSignDay();
+        let bool = !gData.gameData.playerProp.isSignInToday && this.haveSignDay();
         return bool;
     }
 

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

@@ -20,7 +20,7 @@ export class TurnableData extends Data {
 
     public init() {
         this.config = gData.gameData.configs.TurntableCfg;
-        this.leftTimes = gData.gameData.gameData.turntableTimes == null ? 0 : gData.gameData.gameData.turntableTimes;
+        this.leftTimes = gData.gameData.playerProp.turntableTimes == null ? 0 : gData.gameData.playerProp.turntableTimes;
     }
 
     public async requestData() {
@@ -49,7 +49,7 @@ export class TurnableData extends Data {
             }
         });
     }
-    
+
     /**
      * 红点功能
      */

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

@@ -20,7 +20,7 @@
             return null;
         }
         this.init_novice = true;
-        gData.gameData.gameData.userNoviceWeFareInfo = response.data.userNoviceWeFareInfo;
+        gData.gameData.playerProp.userNoviceWeFareInfo = response.data.userNoviceWeFareInfo;
 
         gData.receiptNotice.receip_rmb = value;
         mk.ui.openPanel('module/newNotice/newNotice');
@@ -34,7 +34,7 @@
             return;
         }
 
-        gData.gameData.gameData.userNoviceWeFareInfo = response.data.userNoviceWeFareInfo;
+        gData.gameData.playerProp.userNoviceWeFareInfo = response.data.userNoviceWeFareInfo;
         mk.tip.pop('现金进度已增加');
         this.init_novice = true;
     }
@@ -56,13 +56,13 @@
             return;
         }  
 
-        gData.gameData.gameData.redMoneyCashPayRecordList = response.data.redMoneyCashPayRecordList;
+        gData.gameData.playerProp.redMoneyCashPayRecordList = response.data.redMoneyCashPayRecordList;
         this.init_cashOut = true;
 
         let cashData = gData.gameData.configs.CashCfg;
         if(cashData)
         {
-            gData.gameData.gameData.redMoney -= cashData[id-1].redMoney;
+            gData.gameData.playerProp.redMoney -= cashData[id-1].redMoney;
             gData.receiptNotice.receip_rmb = cashData[id-1].money;
             mk.ui.openPanel('module/newNotice/newNotice');
         }

assets/script/game/game/Game.ts

@@ -179,12 +179,12 @@ export default class Game extends cc.Component {
     }
 
     private initInfo() {
-        this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
+        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney + "";
         gData.gameData.init_coin = false;
 
-        if (gData.gameData.gameData.userFarmTaskInfo) {
-            let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
-            let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+        if (gData.gameData.playerProp.userFarmTaskInfo) {
+            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
             if (gData.gameData.init_redBagTask) {
                 this.lbl_task.string = `<b><color=#8D4D32>点击领取任务!</c></b>`
                 this.node_hand.active = true;
@@ -202,9 +202,9 @@ export default class Game extends cc.Component {
     }
 
     private changeInfo() {
-        //this.lbl_redMoney.node.getComponent(mk.component.numberAnim).setValue(gData.gameData.gameData.redMoney);
+        //this.lbl_redMoney.node.getComponent(mk.component.numberAnim).setValue(gData.gameData.playerProp.redMoney);
         cc.tween(this.lbl_redMoney.node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
-        this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
+        this.lbl_redMoney.string = gData.gameData.playerProp.redMoney + "";
         gData.gameData.init_coin = false;
     }
 
@@ -215,9 +215,9 @@ export default class Game extends cc.Component {
 
     private changeTaskUI() {
         cc.tween(this.lbl_task.node).to(0.1, { scale: 1.2 }).to(0.1, { scale: 1 }).start();
-        if (gData.gameData.gameData.userFarmTaskInfo) {
-            let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
-            let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+        if (gData.gameData.playerProp.userFarmTaskInfo) {
+            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
             //if(gData.gameData.init_redBagTask)
             // {
             //     this.lbl_task.string = `<b><color=#8D4D32>点击领取任务!</c></b>`
@@ -238,33 +238,33 @@ export default class Game extends cc.Component {
     }
 
     private async initFarmExpUI() {
-        let curLevel = gData.gameData.gameData.gradeLevel;
+        let curLevel = gData.gameData.playerProp.gradeLevel;
         this.lbl_farmLevel.string = curLevel.toString();
 
         if (gData.gameData.configs.UpgradeReward.length > curLevel) {
             let needExp = gData.gameData.configs.UpgradeReward[curLevel].exp - gData.gameData.configs.UpgradeReward[curLevel - 1].exp;
-            let curExp = gData.gameData.gameData.farmExpValue - gData.gameData.configs.UpgradeReward[curLevel - 1].exp;
+            let curExp = gData.gameData.playerProp.farmExpValue - gData.gameData.configs.UpgradeReward[curLevel - 1].exp;
 
             this.sp_levelPer.fillRange = curExp / needExp;
         }
 
         let nameIndex= 1;
-        if(gData.gameData.gameData.farmGradeData)
+        if(gData.gameData.playerProp.farmGradeData)
         {
-            let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList;
+            let data = gData.gameData.playerProp.farmGradeData.farmGradeRewardList;
             if(data)
             {
                 let len = data.length;
                 for(let i = 0; i != len; ++i)
                 {
-                    if(gData.gameData.gameData.farmExpValue >= data[i].expMax)
+                    if(gData.gameData.playerProp.farmExpValue >= data[i].expMax)
                     {
                         nameIndex = i + 1;
                     }
                 }
             }        
         }
-        gData.gameData.gameData.farmGradeName = nameIndex;
+        gData.gameData.playerProp.farmGradeName = nameIndex;
 
         this.sp_gradeName.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + nameIndex, cc.SpriteFrame); 
 
@@ -278,7 +278,7 @@ export default class Game extends cc.Component {
         this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
         this.nodeRedPoint.node_turnable.active = gData.turnable.leftTimes>0;
         let isShow = false;
-        let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList;
+        let data = gData.gameData.playerProp.farmGradeData.farmGradeRewardList;
         if (data) {
             let len = data.length;
             for (let i = 0; i != len; ++i) {
@@ -466,9 +466,9 @@ export default class Game extends cc.Component {
     public doFlyExpAni(exp: number, startPos: cc.Node, data) {
         let pos = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
         mk.fly.PlayCoinAnim(2, 3, startPos, pos, () => {
-            gData.gameData.gameData.gradeLevel = data.farmLevel;
-            gData.gameData.gameData.farmExpValue = data.userExp;
-            gData.gameData.gameData.farmGradeData = data.userFarmGrageRewardInfo;
+            gData.gameData.playerProp.gradeLevel = data.farmLevel;
+            gData.gameData.playerProp.farmExpValue = data.userExp;
+            gData.gameData.playerProp.farmGradeData = data.userFarmGrageRewardInfo;
             // gData.gameData.init_add = true;
             gData.gameData.init_red_point = true;
             this.playAdd();

assets/script/game/module/gradeReward/GradeReward.ts

@@ -34,12 +34,12 @@ export class GradeReward extends cc.Component {
 
     start(){
 
-        if(gData.gameData.gameData.farmGradeData)
+        if(gData.gameData.playerProp.farmGradeData)
         {
-            let len = gData.gameData.gameData.farmGradeData.farmGradeRewardList.length;
+            let len = gData.gameData.playerProp.farmGradeData.farmGradeRewardList.length;
             for(let i = len; i != 0; --i)
             {
-                let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList[i-1];
+                let data = gData.gameData.playerProp.farmGradeData.farmGradeRewardList[i-1];
                 let child = cc.instantiate(this.node_child);
                 let item = child.getComponent(GradeRewardItem); 
                 item.setData(data);
@@ -74,7 +74,7 @@ export class GradeReward extends cc.Component {
         let len = this.gradeItemArr.length;
         for(let i = 0 ; i != len; ++i)
         {
-            let data = gData.gameData.gameData.farmGradeData.farmGradeRewardList[len-1-i];
+            let data = gData.gameData.playerProp.farmGradeData.farmGradeRewardList[len-1-i];
             this.gradeItemArr[i].setData(data);
             this.gradeItemArr[i].changeBtnState();
         }
@@ -82,7 +82,7 @@ export class GradeReward extends cc.Component {
 
     private calulateExpAndShowUI()
     {
-        this.curExp = gData.gameData.gameData.farmExpValue;
+        this.curExp = gData.gameData.playerProp.farmExpValue;
         let curIndex = -1;
         for (let i = 0; i != this.gradeExp.length; ++i) {
             if (this.curExp < this.gradeExp[i]) {
@@ -126,10 +126,10 @@ export class GradeReward extends cc.Component {
     {
         let curIndex = -1;
         let curPer = 0;
-        let len = gData.gameData.gameData.farmGradeData.farmGradeRewardList.length;
+        let len = gData.gameData.playerProp.farmGradeData.farmGradeRewardList.length;
         for(let i = 0; i != len; ++i)
         {
-            let per = gData.gameData.gameData.farmGradeData.farmGradeRewardList[i].progressRate;   
+            let per = gData.gameData.playerProp.farmGradeData.farmGradeRewardList[i].progressRate;   
             this.lbl_progress[i].string = Math.round(per * 100) + '%';
             if(curIndex == -1)
             {

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

@@ -23,7 +23,7 @@ export default class Turnable extends cc.Component {
     public setShowUI(data):boolean
     {
         this.data = data;
-        let haveTimes = data.cashFrequency - gData.gameData.gameData.getRedMoneyCashOutTimesByIndex(data.index);
+        let haveTimes = data.cashFrequency - gData.gameData.playerProp.getRedMoneyCashOutTimesByIndex(data.index);
         this.lbl_times.string = `剩${haveTimes}次`;
         this.lbl_value.string = (data.money/100) + '元';
         return haveTimes > 0;
@@ -56,7 +56,7 @@ export default class Turnable extends cc.Component {
 
     public setRemaineTimes(): boolean
     {
-        let haveTimes = gData.gameData.gameData.getRedMoneyCashOutTimesByIndex(this.data.index);
+        let haveTimes = gData.gameData.playerProp.getRedMoneyCashOutTimesByIndex(this.data.index);
         let remainTimes = this.data.cashFrequency- haveTimes;
         this.lbl_times.string = `剩${remainTimes}次`;
         if(remainTimes <= 0)

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

@@ -62,7 +62,7 @@ export default class WalletCashOut extends cc.Component {
     }
 
     private initNoviceUI() {
-        let data = gData.gameData.gameData.userNoviceWeFareInfo;
+        let data = gData.gameData.playerProp.userNoviceWeFareInfo;
         if (data) {
             this.lbl_noviceTitle.string = data.name + ':';
             this.sp_progress.fillRange = data.progressRate;
@@ -128,12 +128,12 @@ export default class WalletCashOut extends cc.Component {
 
     private initTip() {
 
-        this.lbl_redMoney.string =  gData.gameData.gameData.redMoney.toString();
-        this.lbl_value.string = (gData.gameData.gameData.redMoney/10000) + '元';
+        this.lbl_redMoney.string =  gData.gameData.playerProp.redMoney.toString();
+        this.lbl_value.string = (gData.gameData.playerProp.redMoney/10000) + '元';
 
         if (this.curChooseIndex != -1) {
             let data = gData.gameData.configs.CashCfg[this.curChooseIndex];
-            let isEnough = gData.gameData.gameData.redMoney - data.redMoney;
+            let isEnough = gData.gameData.playerProp.redMoney - data.redMoney;
             if (isEnough >= 0) {
                 if (this.curChooseIndex != -1) {
                     this.isCanCash = true;
@@ -144,13 +144,13 @@ export default class WalletCashOut extends cc.Component {
                 }
 
                 let needV = data.money / 100;
-                let haveV = (gData.gameData.gameData.redMoney / 10000).toString() + '元';
+                let haveV = (gData.gameData.playerProp.redMoney / 10000).toString() + '元';
                 this.lbl_tip.string = `需要${needV}元，当前有` + haveV;
             } else {
                 this.isCanCash = false;
                 this.btn_cashOut.setGray(true);
                 let needV = data.money / 100;
-                let haveV = (gData.gameData.gameData.redMoney / 10000).toString() + '元';
+                let haveV = (gData.gameData.playerProp.redMoney / 10000).toString() + '元';
                 this.lbl_tip.string = `需要${needV}元，当前只有` + haveV;
             }
         } else {
@@ -240,7 +240,7 @@ export default class WalletCashOut extends cc.Component {
         if(this.curChooseIndex >=1)
         {
             let data = gData.gameData.configs.CashCfg[this.curChooseIndex -1];
-            let haveTimes = gData.gameData.gameData.getRedMoneyCashOutTimesByIndex(data.index);
+            let haveTimes = gData.gameData.playerProp.getRedMoneyCashOutTimesByIndex(data.index);
             if(data.cashFrequency > haveTimes)
             {
                 return true;
@@ -286,7 +286,7 @@ export default class WalletCashOut extends cc.Component {
     private clickEnoughCashOutBtn() {
         mk.audio.playEffect("button");
 
-        let data = gData.gameData.gameData.userNoviceWeFareInfo;
+        let data = gData.gameData.playerProp.userNoviceWeFareInfo;
         if (data) {
             if (data.progressRate >= 1) {
                 let v = Math.round(this.intV * 100);

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -35,7 +35,7 @@ export default class NewOpenRedBag extends cc.Component {
         }
         this.showChangePart();
 
-        this.initCashOutStyle(gData.gameData.gameData.redMoney);
+        this.initCashOutStyle(gData.gameData.playerProp.redMoney);
     }
 
     showElectUI() {

assets/script/game/module/pigBank/PigBank.ts

@@ -30,7 +30,7 @@ export default class PigBank extends cc.Component {
         // const end_node_pos = gData.gameData.gameStyle.node.parent.convertToNodeSpaceAR(end_world_pos);
         // let start_node_pos = new cc.Vec2(0, -300);
         // mk.fly.PlayCoinAnim(1, 10, start_node_pos, end_node_pos, () => {
-        //     if (!gData.gameData.init_coin) gData.gameData.gameData.redMoney = 1234
+        //     if (!gData.gameData.init_coin) gData.gameData.playerProp.redMoney = 1234
         // });
     }
 
@@ -52,12 +52,12 @@ export default class PigBank extends cc.Component {
      * 提现描述展示
      */
     private initCashDesc() {
-        if (gData.gameData.gameData.isWithdrawable) {
+        if (gData.gameData.playerProp.isWithdrawable) {
             this.lbl_get_desc.string = '直接提现';
             this.node_tip_anim.active = false;
             this.anim_btn_cash.play();
         } else {
-            if (gData.gameData.gameData.piggyBank >= gData.pigbank.cash_min_limit) {
+            if (gData.gameData.playerProp.piggyBank >= gData.pigbank.cash_min_limit) {
                 this.lbl_get_desc.string = '明日可提现';
             } else {
                 this.lbl_get_desc.string = '满' + (gData.pigbank.cash_min_limit / 100).toFixed(2) + '元可提';
@@ -74,7 +74,7 @@ export default class PigBank extends cc.Component {
      * - 精确到分
      */
     private initDeposit() {
-        const new_count = gData.gameData.gameData.piggyBank / 100;
+        const new_count = gData.gameData.playerProp.piggyBank / 100;
         this.lbl_deposit.string = new_count.toFixed(2) + '元';
     }
 
@@ -83,10 +83,10 @@ export default class PigBank extends cc.Component {
      */
     private clickCashOP() {
         mk.audio.playEffect("button");
-        if (!gData.gameData.gameData.isWithdrawable) {
+        if (!gData.gameData.playerProp.isWithdrawable) {
             mk.tip.pop('明日可提现')
             return;
-        } else if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) {
+        } else if (gData.gameData.playerProp.piggyBank < gData.pigbank.cash_min_limit) {
             mk.tip.pop('满' + (gData.pigbank.cash_min_limit / 100).toFixed(2) + '元可提现')
             return;
         }
@@ -115,7 +115,7 @@ export default class PigBank extends cc.Component {
         const isAutoOpenPanel = gData.gameData.getProp(GameProp.isAutoOpenPanel);
         if (isAutoOpenPanel === 1) {
             // 必须是可签到才弹
-            if (!gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay()) {
+            if (!gData.gameData.playerProp.isSignInToday && gData.sign.haveSignDay()) {
                 mk.ui.openPanel('module/sign/sign');
             }
             gData.gameData.setProp(GameProp.isAutoOpenPanel, 2);

assets/script/game/module/redBagCash/RedBagCash.ts

@@ -20,7 +20,7 @@ export default class RedBagCash extends cc.Component {
 
     private tableview: TableView = null;
     onLoad() {
-        // gData.gameData.gameData.redMoney = 10200;// 测试数据，数据正确后请删除
+        // gData.gameData.playerProp.redMoney = 10200;// 测试数据，数据正确后请删除
         this.tableview = this.sroll_view.getComponent('TableView');
     }
 
@@ -77,10 +77,10 @@ export default class RedBagCash extends cc.Component {
      * 初始化货币数量
      */
     private initMoney() {
-        let red = gData.gameData.gameData.redMoney;
+        let red = gData.gameData.playerProp.redMoney;
         red = parseFloat(red.toFixed(2));
         this.lbl_redbag.string = `${red}`;
-        let rmb = gData.gameData.gameData.redMoney / 10000;
+        let rmb = gData.gameData.playerProp.redMoney / 10000;
         rmb = rmb > 1 ? Math.floor(rmb) : parseFloat(rmb.toFixed(2));
         this.lbl_rmb.string = `${rmb}`;
     }

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

@@ -50,12 +50,12 @@ export default class RedBagTask extends cc.Component {
 
 
     start() {
-        mk.console.logSingle('redBagTask=>', gData.gameData.gameData.userFarmTaskInfo);
-        if (!gData.gameData.gameData.userFarmTaskInfo) {
+        mk.console.logSingle('redBagTask=>', gData.gameData.playerProp.userFarmTaskInfo);
+        if (!gData.gameData.playerProp.userFarmTaskInfo) {
             return;
         }
         gData.gameData.init_redBagTask = false;
-        this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+        this.maxNum = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
         //this.isShowNewTask = gData.gameData.init_redBagTask;
         if (this.isShowNewTask) {
             this.showNewTaskUI();
@@ -68,7 +68,7 @@ export default class RedBagTask extends cc.Component {
         }
 
 
-        this.initCashOutStyle(gData.gameData.gameData.redMoney);
+        this.initCashOutStyle(gData.gameData.playerProp.redMoney);
 
     }
 
@@ -95,7 +95,7 @@ export default class RedBagTask extends cc.Component {
     update(dt) {
 
         if (gData.reward.add_redbag_value) {
-            this.initCashOutStyle(gData.gameData.gameData.redMoney + gData.reward.add_redbag_value);
+            this.initCashOutStyle(gData.gameData.playerProp.redMoney + gData.reward.add_redbag_value);
         }
 
         if (this.isShowNewTask) {
@@ -152,9 +152,9 @@ export default class RedBagTask extends cc.Component {
     }
 
     private initTaskProgressUI() {
-        if (gData.gameData.gameData.userFarmTaskInfo) {
-            let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
-            let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+        if (gData.gameData.playerProp.userFarmTaskInfo) {
+            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
             let per = com / count;
             if(!this.isRefreshTask)
             {
@@ -241,11 +241,11 @@ export default class RedBagTask extends cc.Component {
         if (response.errcode != 0) {
             return null;
         }
-        gData.gameData.gameData.userFarmTaskInfo = response.data.userFarmTaskInfo;
+        gData.gameData.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         //gData.gameData.init_redBagTask = true;
         gData.gameData.init_task = true;
 
-        this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+        this.maxNum = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
         this.num = 0;
         this.delayTime = 0;
         this.times = 0;

assets/script/game/module/redeem/RedeemNode.ts

@@ -154,10 +154,10 @@ export default class RedeemNode extends cc.Component {
             //mk.fly.PlayCoinAnim(type, 5, cc.v2(0, -300));
             switch (type) {
                 case RewardType.redBag:
-                    gData.gameData.gameData.redMoney += count;
+                    gData.gameData.playerProp.redMoney += count;
                     break;
                 case RewardType.pigRmb:
-                    gData.gameData.gameData.piggyBank += count;
+                    gData.gameData.playerProp.piggyBank += count;
                     break;
             }
 

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

@@ -48,8 +48,8 @@ export default class Reward extends cc.Component {
     }
 
     start() {
-        // gData.gameData.gameData.redMoney = 1500;// 测试数据
-        this.initCashOutStyle(gData.gameData.gameData.redMoney);
+        // gData.gameData.playerProp.redMoney = 1500;// 测试数据
+        this.initCashOutStyle(gData.gameData.playerProp.redMoney);
     }
 
     onEnable() {
@@ -64,7 +64,7 @@ export default class Reward extends cc.Component {
 
     update(dt) {
         if (gData.reward.add_redbag_value) {
-            this.initCashOutStyle(gData.gameData.gameData.redMoney + gData.reward.add_redbag_value);
+            this.initCashOutStyle(gData.gameData.playerProp.redMoney + gData.reward.add_redbag_value);
         }
         // if (gData.reward.adData) {
         //     // 展示奖励

assets/script/game/module/setting/Setting.ts

@@ -48,17 +48,17 @@ export default class Setting extends cc.Component {
         this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);// 14 
         this.lbl_nickname.string = gData.wechatData.nickName;
 
-        this.lbl_lv.string = 'Lv:' + gData.gameData.gameData.gradeLevel.toString();
-        this.lbl_redBagCoin.string = gData.gameData.gameData.redMoney.toString();
+        this.lbl_lv.string = 'Lv:' + gData.gameData.playerProp.gradeLevel.toString();
+        this.lbl_redBagCoin.string = gData.gameData.playerProp.redMoney.toString();
 
-        this.lbl_value.string = (gData.gameData.gameData.redMoney / 10000) + '元';
+        this.lbl_value.string = (gData.gameData.playerProp.redMoney / 10000) + '元';
 
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
         this.img_music.spriteFrame = await mk.loader.load(music, cc.SpriteFrame);
         this.img_effect.spriteFrame = await mk.loader.load(effect, cc.SpriteFrame);
 
-        this.sp_achieve.spriteFrame =  await mk.loader.load('module/gradeReward/texture/name' + gData.gameData.gameData.farmGradeName, cc.SpriteFrame);
+        this.sp_achieve.spriteFrame =  await mk.loader.load('module/gradeReward/texture/name' + gData.gameData.playerProp.farmGradeName, cc.SpriteFrame);
         console.log("=== gData.wechatData.avatar", gData.wechatData.avatar);
         let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
         this.img_head.spriteFrame = new cc.SpriteFrame(result);

assets/script/game/module/sign/Sign.ts

@@ -90,11 +90,11 @@ export default class Sign extends cc.Component {
      */
     private clickReceiveReward() {
         mk.audio.playEffect("button");
-        if (gData.gameData.gameData.isSignInToday == 1) return;
+        if (gData.gameData.playerProp.isSignInToday == 1) return;
         if (!gData.sign.haveSignDay()) return;
 
         //const index_old = gData.sign.getItemIndexByCanSign();
-        const index_old = gData.gameData.gameData.signInDay;
+        const index_old = gData.gameData.playerProp.signInDay;
         if(cc.sys.isNative)
         {
             if (gData.sign.c_sign[index_old].rewardType === RewardType.rmb) {
@@ -139,7 +139,7 @@ export default class Sign extends cc.Component {
      * 初始化按钮样式
      */
     private initBtnStyle() {
-        if (gData.gameData.gameData.isSignInToday == 0 && gData.sign.haveSignDay()) {
+        if (gData.gameData.playerProp.isSignInToday == 0 && gData.sign.haveSignDay()) {
             this.anim_btn.play();
             // this.anim_btn.getComponent(SetGray).setGray(false);
             this.anim_btn.getComponent(mk.component.setGray).setGray(false)

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -27,9 +27,9 @@ export default class ProductReward extends cc.Component {
         this.lbl_times.string = `生产次数x${gData.gameData.configs.ServerConfig.ProductionAd}`;
 
         gData.gameData.init_productTask = false;
-        if (gData.gameData.gameData.userFarmTaskInfo) {
-            let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
-            let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+        if (gData.gameData.playerProp.userFarmTaskInfo) {
+            let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
             if (count > com) {
                 this.lbl_taskTimes.string = (count - com).toString();
                 this.node_Uncomplete.active = true;
@@ -45,9 +45,9 @@ export default class ProductReward extends cc.Component {
 
     update(dt) {
         if (gData.gameData.init_productTask) {
-            if (gData.gameData.gameData.userFarmTaskInfo) {
-                let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
-                let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+            if (gData.gameData.playerProp.userFarmTaskInfo) {
+                let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
+                let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
                 if (count > com) {
                     this.lbl_taskTimes.string = (count - com).toString();
                     this.node_Uncomplete.active = true;

assets/script/game/module/speedUpUI/SpeedUpUI.ts

@@ -19,8 +19,8 @@ export default class SpeedUpUI extends cc.Component {
 
 
     start() {
-
-        this.initCashOutStyle(gData.gameData.gameData.redMoney);
+        this.initCashOutStyle(gData.gameData.playerProp.redMoney);
+        this.lbl_remainTimes.string = `今日剩余次数：${gData.gameData.speedUpLeftTimes}`;
     }
 
     onEnable() {
@@ -32,9 +32,8 @@ export default class SpeedUpUI extends cc.Component {
     }
 
     update(dt) {
-
         if (gData.reward.add_redbag_value) {
-            this.initCashOutStyle(gData.gameData.gameData.redMoney + gData.reward.add_redbag_value);
+            this.initCashOutStyle(gData.gameData.playerProp.redMoney + gData.reward.add_redbag_value);
         }
     }
 
@@ -72,16 +71,24 @@ export default class SpeedUpUI extends cc.Component {
 
     private clickWatchVideoBtn() {
         mk.audio.playEffect("button");
-
-        mk.ad.videoAdType = VideoAdType.video_init_14;
-        mk.ad.watchAd((success) => {
-            if (success) {
-                gData.adData.watchVideo(null);
-                gData.gameData.setHarvest();
-                mk.ui.closePanel(this.node.name);
-                mk.tip.pop('加速成功！');
-            }
-        })
+        if (gData.gameData.speedUpLeftTimes <= 0) {
+            mk.tip.pop('今日加速次数已用完');
+            return;
+        }
+        if (gData.gameData.checkCanSpeedUp()) {
+            mk.ui.closePanel(this.node.name);
+            mk.ad.videoAdType = VideoAdType.video_init_14;
+            mk.ad.watchAd((success) => {
+                if (success) {
+                    gData.adData.watchVideo(null);
+                    gData.gameData.setHarvest();
+                    mk.tip.pop('加速成功！');
+                }
+            })
+        }
+        else {
+            mk.tip.pop('没有可加速的物品');
+        }
     }
 
 

assets/script/game/module/turntable/Turnablerule.ts

@@ -24,13 +24,13 @@ export default class Turnablerule extends cc.Component {
     start() {
         mk.ad.showBanner(BannerAdType.banner_click_9);
 
-        this.initCashOutStyle(gData.gameData.gameData.redMoney);
+        this.initCashOutStyle(gData.gameData.playerProp.redMoney);
     }
 
     update(dt) {
 
         if (gData.reward.add_redbag_value) {
-            this.initCashOutStyle(gData.gameData.gameData.redMoney + gData.reward.add_redbag_value);
+            this.initCashOutStyle(gData.gameData.playerProp.redMoney + gData.reward.add_redbag_value);
         }
     }
 

assets/script/mk/system/DataSystem.ts

@@ -74,7 +74,7 @@ export default class DataSystem {
         if (eventId && des) {
             let data = {
                 "uin": gData.loginData.uin,
-                "isFirstDay": gData.gameData.gameData.loginDays == 1 ? 1 : 0,
+                "isFirstDay": gData.gameData.playerProp.loginDays == 1 ? 1 : 0,
                 "umengChannel": gData.appData.umengChannel,
                 "deviceType": gData.appData.deviceType,
                 "androidVerison": gData.appData.androidVersion,

assets/script/mk/system/FlySystem.ts

@@ -137,8 +137,8 @@ export default class FlySystem extends cc.Component {
 
     private showLabStrChange(value: number) {
         if (gData.gameData.gameStyle.lbl_redMoney) {
-            gData.gameData.gameData.redMoney += value;
-            //gData.gameData.gameStyle.lbl_redMoney.string = gData.gameData.gameData.redMoney.toString();
+            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

@@ -137,8 +137,8 @@ export default class FlySystem2 extends cc.Component {
     {
         if(gData.gameData.gameStyle.lbl_redMoney)
         {
-            gData.gameData.gameData.redMoney += value;
-            //gData.gameData.gameStyle.lbl_redMoney.string = gData.gameData.gameData.redMoney.toString();
+            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();
         }
     }