bug修复

assets/script/before/main/FactoryIcon.ts

@@ -140,6 +140,9 @@ export class FactoryIcon extends cc.Component {
 
             gData.gameData.isProducting = false;
         }
+        else {
+            mk.tip.pop('商品已满！')
+        }
     }
 
     clickSpeedUp() {

assets/script/game/data/GameData.ts

@@ -86,7 +86,6 @@ export class GameData {
     //标志位 生产奖励的任务ui刷新
     public init_productTask = false;
 
-    public speedUpLeftTimes = 0;
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -181,6 +180,7 @@ export class GameData {
         mk.console.logSingle('userNoviceWeFareInfo==>', res_data.userNoviceWeFareInfo);
         //mk.console.logSingle('redMoneyCashPayRecordList==>', res_data.redMoneyCashPayRecordList);
         this.playerProp.userFarmTaskInfo = res_data.userFarmTaskInfo;
+        this.playerProp.speedUpLeftTimes = res_data.speedUpLeftTimes;
 
         mk.data.setTAUserID(gData.loginData.uin);
 
@@ -1032,9 +1032,6 @@ export enum GameProp {
     //红包任务tag
     redBagTaskRefresh = 18,
 
-    //加速剩余次数
-    speedUpLeftTimes = 19,
-
     /** ------------------ 转盘数据 ------------------------------ */
     turnable_leftTimes = 20,
 }
@@ -1184,6 +1181,8 @@ class PlayerProp {
 
     /** ABTest分组id */
     groupCode = 0;
+
+    speedUpLeftTimes = 0;
 }
 
 /**

assets/script/game/data/LoginData.ts

@@ -87,7 +87,7 @@ export class LoginData {
      */
     private async connect() {
         if (CC_DEBUG) {
-            gData.appData.mac = '8e:46:ec:43:c3:55,86:45:d4:db:b7:27';
+            gData.appData.mac = '8e:46:ec:43:e3:55,86:45:d4:dc:b7:27';
         }
         //connect
         this.randomKey = mk.encrypt.randomString();

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

@@ -57,9 +57,9 @@ export class GradeRewardData extends Data {
             //提示
             mk.tip.pop(`获得${addExp}点等级经验`);
             if (gData.gameData.playerProp.gradeLevel < response.data.farmLevel) {
+                gData.gameData.playerProp.gradeLevel = response.data.farmLevel;
                 gData.gameData.checkGradeUpUnLock();
             }
-            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;

assets/script/game/game/Game.ts

@@ -9,7 +9,7 @@ export class RedPoinNode {
     node_gradeReward: cc.Node = null;
     @property({ type: cc.Node, displayName: "签到" })
     node_sign: cc.Node = null;
-    @property({type: cc.Node, displayName: '轮盘'})
+    @property({ type: cc.Node, displayName: '轮盘' })
     node_turnable: cc.Node = null;
 }
 
@@ -59,7 +59,7 @@ export default class Game extends cc.Component {
     ani_add: cc.Animation = null;
     @property({ type: cc.Node, displayName: '任务红包手' })
     node_hand: cc.Node = null;
-    @property({type: cc.Sprite, displayName: '等级名字'})
+    @property({ type: cc.Sprite, displayName: '等级名字' })
     sp_gradeName: cc.Sprite = null;
 
 
@@ -225,10 +225,9 @@ export default class Game extends cc.Component {
             // }else
             {
                 this.lbl_task.string = `<b><color=#8D4D32>进行${count}次生产</c><color=#7EB80E>(${com}/${count})</color></b>`
-                if(com >= count)
-                {
+                if (com >= count) {
                     this.node_hand.active = true;
-                }else{
+                } else {
                     this.node_hand.active = false;
                 }
             }
@@ -248,25 +247,21 @@ export default class Game extends cc.Component {
             this.sp_levelPer.fillRange = curExp / needExp;
         }
 
-        let nameIndex= 1;
-        if(gData.gameData.playerProp.farmGradeData)
-        {
+        let nameIndex = 1;
+        if (gData.gameData.playerProp.farmGradeData) {
             let data = gData.gameData.playerProp.farmGradeData.farmGradeRewardList;
-            if(data)
-            {
+            if (data) {
                 let len = data.length;
-                for(let i = 0; i != len; ++i)
-                {
-                    if(gData.gameData.playerProp.farmExpValue >= data[i].expMax)
-                    {
+                for (let i = 0; i != len; ++i) {
+                    if (gData.gameData.playerProp.farmExpValue >= data[i].expMax) {
                         nameIndex = i + 1;
                     }
                 }
-            }        
+            }
         }
         gData.gameData.playerProp.farmGradeName = nameIndex;
 
-        this.sp_gradeName.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + nameIndex, cc.SpriteFrame); 
+        this.sp_gradeName.spriteFrame = await mk.loader.load('module/gradeReward/texture/name' + nameIndex, cc.SpriteFrame);
 
         gData.gameData.init_expLevel = false;
     }
@@ -276,7 +271,7 @@ export default class Game extends cc.Component {
      */
     private initRedPoint() {
         this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
-        this.nodeRedPoint.node_turnable.active = gData.turnable.leftTimes>0;
+        this.nodeRedPoint.node_turnable.active = gData.turnable.leftTimes > 0;
         let isShow = false;
         let data = gData.gameData.playerProp.farmGradeData.farmGradeRewardList;
         if (data) {
@@ -466,12 +461,15 @@ 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.playerProp.gradeLevel = data.farmLevel;
+            if (gData.gameData.playerProp.gradeLevel < data.farmLevel) {
+                gData.gameData.playerProp.gradeLevel = data.farmLevel;
+                gData.gameData.checkGradeUpUnLock();
+            }
             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();
+            this.playAdd(exp);
         })
     }
 
@@ -484,7 +482,8 @@ export default class Game extends cc.Component {
         }
     }
 
-    private playAdd() {
+    private playAdd(exp) {
+        this.ani_add.node.getComponent(cc.Label).string = `+${exp}`;
         this.ani_add.node.active = true;
         this.ani_add.play();
         // gData.gameData.init_add = false;

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

@@ -20,7 +20,7 @@ export default class SpeedUpUI extends cc.Component {
 
     start() {
         this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-        this.lbl_remainTimes.string = `今日剩余次数：${gData.gameData.speedUpLeftTimes}`;
+        this.lbl_remainTimes.string = `今日剩余次数：${gData.gameData.playerProp.speedUpLeftTimes}`;
     }
 
     onEnable() {
@@ -71,16 +71,21 @@ export default class SpeedUpUI extends cc.Component {
 
     private clickWatchVideoBtn() {
         mk.audio.playEffect("button");
-        if (gData.gameData.speedUpLeftTimes <= 0) {
+        if (gData.gameData.playerProp.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) => {
+            mk.ad.watchAd(async (success) => {
                 if (success) {
                     gData.adData.watchVideo(null);
+                    let response = await mk.http.sendData('farmSpeedUp', {});
+                    if (response && response.errcore == 0) {
+                        gData.gameData.playerProp.speedUpLeftTimes = response.data.speedUpLeftTimes;
+                        this.lbl_remainTimes.string = `今日剩余次数：${gData.gameData.playerProp.speedUpLeftTimes}`;
+                    }
                     gData.gameData.setHarvest();
                     mk.tip.pop('加速成功！');
                 }