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

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

@@ -917,14 +917,14 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 184,
-      "g": 0,
-      "b": 0,
+      "r": 222,
+      "g": 34,
+      "b": 23,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 283.46,
+      "width": 267.72,
       "height": 90.4
     },
     "_anchorPoint": {
@@ -976,9 +976,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "1000红包券=0.1元\n满0.3元即可提现",
-    "_N$string": "1000红包券=0.1元\n满0.3元即可提现",
-    "_fontSize": 36,
+    "_string": "1000红包币=0.1元\n满0.3元即可提现",
+    "_N$string": "1000红包币=0.1元\n满0.3元即可提现",
+    "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1708,8 +1708,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "获得少量红包券",
-    "_N$string": "获得少量红包券",
+    "_string": "获得少量红包币",
+    "_N$string": "获得少量红包币",
     "_fontSize": 18,
     "_lineHeight": 18,
     "_enableWrapText": true,
@@ -2550,7 +2550,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "02itKElAxGKoRLBhXylZvd",
+    "fileId": "d7pFdyKU1IwYMIZ4jRBWQC",
     "sync": false
   },
   {
@@ -2661,7 +2661,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "3eNlWvGmhNxrBAjWJ8etZY",
+    "fileId": "c5CnyDfepPxblwnvLtjCej",
     "sync": false
   },
   {
@@ -2744,8 +2744,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "红包券",
-    "_N$string": "红包券",
+    "_string": "红包币",
+    "_N$string": "红包币",
     "_fontSize": 18,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -2772,7 +2772,7 @@
     "asset": {
       "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
     },
-    "fileId": "fc0xRk/VhL/LIFt9zy5SfW",
+    "fileId": "da0uOAVexDjrPWrQ8JJBhi",
     "sync": false
   },
   {
@@ -2785,7 +2785,7 @@
     "_enabled": true,
     "_fontFamily": "Arial",
     "_isSystemFontUsed": false,
-    "_N$string": "最高获得</c><color=#ff0000>3000</color>红包券",
+    "_N$string": "最高获得</c><color=#ff0000>3000</color>红包币",
     "_N$horizontalAlign": 0,
     "_N$fontSize": 18,
     "_N$font": {

assets/resources/module/farmMap/farmItem.prefab

@@ -607,7 +607,7 @@
     "node": {
       "__id__": 8
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 200,

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

@@ -15,9 +15,9 @@ export default class HarvestPanel extends cc.Component {
     start() {
         let data = gData.gameData.configs.CashCfg[0];
         let money = data.money * 0.01;
-        this.lbl_des.string = `1000红包券=0.1元\n满${money}元即可提现`;
+        this.lbl_des.string = `1000红包币=0.1元\n满${money}元即可提现`;
 
-        this.lbl_max.string = `最高获得</c><color=#ff0000>${gData.harvestData.config.menuRedBagCoin}</color>红包券`;
+        this.lbl_max.string = `最高获得</c><color=#ff0000>${gData.harvestData.config.menuRedBagCoin/100}</color>红包币`;
     }
 
     public async clickNormalBtn() {

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

@@ -63,7 +63,7 @@ export default class PlantItem extends cc.Component {
         }
         this.plantIcon.spriteFrame = await mk.loader.load(plantPath + list_data.picture, cc.SpriteFrame);
         this.nameIcon.spriteFrame = await mk.loader.load(namePath + list_data.picture, cc.SpriteFrame);
-        this.awardLabel.string = list_data.menuRedBagCoin.toString();
+        this.awardLabel.string = (list_data.menuRedBagCoin/100).toString();
         this.timeLabel.string = list_data.time;
         let unlock = false;
         let times = 0;

assets/script/game/game/Farmer.ts

@@ -23,7 +23,7 @@ export class Farmer extends cc.Component {
 
         this.clips = this.animation.getClips();
 
-        this.refreshTime = 20;
+        this.refreshTime = gData.gameData.configs.ServerConfig.AutoTime;
         this.redMoneyNum = 3;
     }
     update(dt) {
@@ -46,7 +46,7 @@ export class Farmer extends cc.Component {
         {
             this.refreshTime -= dt;
         }else{
-            this.refreshTime = 20;
+            this.refreshTime = gData.gameData.configs.ServerConfig.AutoTime;
             this.getRewardByHttp();
         }
     }

assets/script/game/module/farmMap/FarmItem.ts

@@ -50,7 +50,7 @@ export default class FarmItem extends cc.Component {
             this.sp_icon.spriteFrame = await mk.loader.load(plantPath + data.picture, cc.SpriteFrame);
             this.lbl_nameDes.node.active = true;
             this.lbl_nameDes.string = `${data.name} ${data.time}秒成熟`;
-            this.lbl_des.string = `最高收获${data.MenuredBagCoin}红包币`;
+            this.lbl_des.string = `最高收获${data.menuRedBagCoin/100}红包币`;
 
             let state = gData.gameData.getFarmMapRewardState(this.getIndex());
             if (state == 1) {
@@ -160,7 +160,7 @@ export default class FarmItem extends cc.Component {
         mk.ad.watchAd(async (success) => {
             if (success) {
                 await gData.adData.watchVideo(AdFun.farmMap);
-                
+
                 if(gData.farmMapData.init_award)
                 {
                     gData.farmMapData.isStateChange = true;

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

@@ -44,19 +44,22 @@ export default class NewOpenRedBag extends cc.Component {
     }
 
     async sendRecommendList() {
-        this.sp_icon.node.active = true;
-        this.data = gData.moreGame.getRandomNormal();
-        if (this.data && cc.sys.os != cc.sys.OS_WINDOWS) {
-            cc.loader.load(this.data.icon, (err, res) => {
-                if (err) {
-                    console.log('err:', err);
-                    return;
-                }
-                let tex: cc.Texture2D = res as cc.Texture2D;
-                this.sp_icon.spriteFrame = new cc.SpriteFrame(tex);
-            })
+        if( this.sp_icon)
+        {
+            this.sp_icon.node.active = true;
+            this.data = gData.moreGame.getRandomNormal();
+            if (this.data && cc.sys.os != cc.sys.OS_WINDOWS) {
+                cc.loader.load(this.data.icon, (err, res) => {
+                    if (err) {
+                        console.log('err:', err);
+                        return;
+                    }
+                    let tex: cc.Texture2D = res as cc.Texture2D;
+                    this.sp_icon.spriteFrame = new cc.SpriteFrame(tex);
+                })
+            }
         }
-
+    
         this.node_openBtn.active = false;
         this.node_getBtn.active = true;
     }

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

@@ -133,7 +133,10 @@ export default class Reward extends cc.Component {
         let rewardNum: number = gData.reward.data[0].rewardNum || 0;
         if (gData.reward.data[0].rewardType === RewardType.pigRmb) {
         } else {
-            rewardNum = rewardNum/100;
+            if(gData.reward.data[0].rewardType != RewardType.productTimes)
+            {
+                rewardNum = rewardNum/100;
+            }   
             this.lbl_reward_num.string = `x${rewardNum}`;
         }
 

build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -8099,7 +8099,7 @@ this.getComponent(l.MoveToCenter).move();
 gData.gameData.changeLeftTimes(-1);
 gData.adData.checkPopRed();
 gData.gameData.isProducting = !1;
-}
+} else mk.tip.pop("商品已满！");
 };
 e.prototype.clickSpeedUp = function() {
 mk.ui.openPanel("module/speedUpUI/speedUp");
@@ -9346,7 +9346,7 @@ case 1:
 n.spriteFrame = c.sent();
 this.lbl_nameDes.node.active = !0;
 this.lbl_nameDes.string = t.name + " " + t.time + "秒成熟";
-this.lbl_des.string = "最高收获" + t.MenuredBagCoin + "红包币";
+this.lbl_des.string = "最高收获" + t.menuRedBagCoin / 100 + "红包币";
 if (1 == gData.gameData.getFarmMapRewardState(this.getIndex())) {
 this.node_getBtn.active = !0;
 this.node_ungetBtn.active = !1;
@@ -10027,7 +10027,7 @@ return e;
 }
 e.prototype.start = function() {
 this.clips = this.animation.getClips();
-this.refreshTime = 20;
+this.refreshTime = gData.gameData.configs.ServerConfig.AutoTime;
 this.redMoneyNum = 3;
 };
 e.prototype.update = function(t) {
@@ -10040,7 +10040,7 @@ this.animation.play(this.clips[0].name);
 this.forwardMask.node.active = !(this.backMask.node.active = !1);
 }
 if (this.refreshTime >= 0) this.refreshTime -= t; else {
-this.refreshTime = 20;
+this.refreshTime = gData.gameData.configs.ServerConfig.AutoTime;
 this.getRewardByHttp();
 }
 };
@@ -11828,7 +11828,6 @@ this.init_task = !1;
 this.init_expLevel = !1;
 this.init_redBagTask = !1;
 this.init_productTask = !1;
-this.speedUpLeftTimes = 0;
 this._farmMapRewardData = [];
 this._farmData = [];
 this._farmDataMap = new Map();
@@ -11921,6 +11920,7 @@ this.playerProp.userNoviceWeFareInfo = t.userNoviceWeFareInfo;
 this.playerProp.redMoneyCashPayRecordList = t.redMoneyCashPayRecordList;
 mk.console.logSingle("userNoviceWeFareInfo==>", t.userNoviceWeFareInfo);
 this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
+this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
 mk.data.setTAUserID(gData.loginData.uin);
 if (gData.loginData.isFirstIn) {
 gData.loginData.isFirstIn = !1;
@@ -12485,7 +12485,6 @@ t[t.factoryData = 15] = "factoryData";
 t[t.leftTimes = 16] = "leftTimes";
 t[t.farmMapGetRewardData = 17] = "farmMapGetRewardData";
 t[t.redBagTaskRefresh = 18] = "redBagTaskRefresh";
-t[t.speedUpLeftTimes = 19] = "speedUpLeftTimes";
 t[t.turnable_leftTimes = 20] = "turnable_leftTimes";
 })(i = o.GameProp || (o.GameProp = {}));
 var s, l, p, u, d = function() {
@@ -12514,6 +12513,7 @@ this.userNoviceWeFareInfo = {};
 this.redMoneyCashPayRecordList = null;
 this.userFarmTaskInfo = null;
 this.groupCode = 0;
+this.speedUpLeftTimes = 0;
 }
 Object.defineProperty(t.prototype, "isSignInToday", {
 get: function() {
@@ -13129,7 +13129,7 @@ mk.audio.playMusic("bgm");
 };
 e.prototype.initBtns = function() {};
 e.prototype.initInfo = function() {
-this.lbl_redMoney.string = gData.gameData.playerProp.redMoney + "";
+this.lbl_redMoney.string = gData.gameData.playerProp.redMoney / 100 + "";
 gData.gameData.init_coin = !1;
 if (gData.gameData.playerProp.userFarmTaskInfo) {
 var t = gData.gameData.playerProp.userFarmTaskInfo.completeCount, e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
@@ -13148,7 +13148,7 @@ scale: 1.2
 }).to(.05, {
 scale: 1
 }).start();
-this.lbl_redMoney.string = gData.gameData.playerProp.redMoney + "";
+this.lbl_redMoney.string = gData.gameData.playerProp.redMoney / 100 + "";
 gData.gameData.init_coin = !1;
 };
 e.prototype.initHead = function() {
@@ -13336,11 +13336,14 @@ gData.gameData.init_task = !0;
 e.prototype.doFlyExpAni = function(t, e, o) {
 var n = this, a = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
 mk.fly.PlayCoinAnim(2, 3, e, a, function() {
+if (gData.gameData.playerProp.gradeLevel < o.farmLevel) {
 gData.gameData.playerProp.gradeLevel = o.farmLevel;
+gData.gameData.checkGradeUpUnLock();
+}
 gData.gameData.playerProp.farmExpValue = o.userExp;
 gData.gameData.playerProp.farmGradeData = o.userFarmGrageRewardInfo;
 gData.gameData.init_red_point = !0;
-n.playAdd();
+n.playAdd(t);
 });
 };
 e.prototype.registerCallBack = function() {
@@ -13350,7 +13353,8 @@ s.default.callBack = function() {
 mk.ui.openPanel("module/speedUpUI/productReward2");
 };
 };
-e.prototype.playAdd = function() {
+e.prototype.playAdd = function(t) {
+this.ani_add.node.getComponent(cc.Label).string = "+" + t;
 this.ani_add.node.active = !0;
 this.ani_add.play();
 };
@@ -13743,8 +13747,10 @@ a = n.data.userExp - gData.gameData.playerProp.farmExpValue;
 if (e) gData.gameData.gameStyle.doFlyExpAni(a, e, n.data); else {
 this.changeExp = !0;
 mk.tip.pop("获得" + a + "点等级经验");
-gData.gameData.playerProp.gradeLevel < n.data.farmLevel && gData.gameData.checkGradeUpUnLock();
+if (gData.gameData.playerProp.gradeLevel < n.data.farmLevel) {
 gData.gameData.playerProp.gradeLevel = n.data.farmLevel;
+gData.gameData.checkGradeUpUnLock();
+}
 gData.gameData.playerProp.farmExpValue = n.data.userExp;
 gData.gameData.playerProp.farmGradeData = n.data.userFarmGrageRewardInfo;
 gData.gameData.init_red_point = !0;
@@ -15194,8 +15200,8 @@ return e;
 }
 e.prototype.start = function() {
 var t = .01 * gData.gameData.configs.CashCfg[0].money;
-this.lbl_des.string = "1000红包券=0.1元\n满" + t + "元即可提现";
-this.lbl_max.string = "最高获得</c><color=#ff0000>" + gData.harvestData.config.menuRedBagCoin + "</color>红包券";
+this.lbl_des.string = "1000红包币=0.1元\n满" + t + "元即可提现";
+this.lbl_max.string = "最高获得</c><color=#ff0000>" + gData.harvestData.config.menuRedBagCoin / 100 + "</color>红包币";
 };
 e.prototype.clickNormalBtn = function() {
 return r(this, void 0, void 0, function() {
@@ -19723,6 +19729,7 @@ mk.ad.destoryBanner();
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
@@ -21119,7 +21126,7 @@ return [ 4, mk.loader.load(o + t.picture, cc.SpriteFrame) ];
 
 case 2:
 a.spriteFrame = c.sent();
-this.awardLabel.string = t.menuRedBagCoin.toString();
+this.awardLabel.string = (t.menuRedBagCoin / 100).toString();
 this.timeLabel.string = t.time;
 i = !1;
 r = 0;
@@ -23484,6 +23491,7 @@ t.lbl_value[o].string = "" + n;
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
@@ -24581,6 +24589,7 @@ gData.reward.adData = null;
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
@@ -24614,7 +24623,10 @@ case 1:
 n.spriteFrame = i.sent();
 gData.reward.data[0].rewardType === l.RewardType.productTimes ? this.node_hb.node.scale = .5 : this.node_hb.node.scale = 1;
 a = gData.reward.data[0].rewardNum || 0;
-gData.reward.data[0].rewardType === l.RewardType.pigRmb || (this.lbl_reward_num.string = "x" + a);
+if (gData.reward.data[0].rewardType === l.RewardType.pigRmb) ; else {
+gData.reward.data[0].rewardType != l.RewardType.productTimes && (a /= 100);
+this.lbl_reward_num.string = "x" + a;
+}
 gData.reward.data[0].rewardType === l.RewardType.redBag && (gData.reward.add_redbag_value = gData.reward.data[0].rewardNum);
 return [ 2 ];
 }
@@ -25273,8 +25285,8 @@ console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
 this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);
 this.lbl_nickname.string = gData.wechatData.nickName;
 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.playerProp.redMoney / 1e4 + "元";
+this.lbl_redBagCoin.string = (gData.gameData.playerProp.redMoney / 100).toString();
+this.lbl_value.string = gData.gameData.playerProp.redMoney / 1e6 + "元";
 t = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
 e = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
 o = this.img_music;
@@ -26229,11 +26241,123 @@ t.prototype = null === e ? Object.create(e) : (o.prototype = e.prototype, new o(
 var a, i = arguments.length, r = i < 3 ? e : null === n ? n = Object.getOwnPropertyDescriptor(e, o) : n;
 if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(t, e, o, n); else for (var c = t.length - 1; c >= 0; c--) (a = t[c]) && (r = (i < 3 ? a(r) : i > 3 ? a(e, o, r) : a(e, o)) || r);
 return i > 3 && r && Object.defineProperty(e, o, r), r;
+}, r = this && this.__awaiter || function(t, e, o, n) {
+return new (o || (o = Promise))(function(a, i) {
+function r(t) {
+try {
+s(n.next(t));
+} catch (t) {
+i(t);
+}
+}
+function c(t) {
+try {
+s(n.throw(t));
+} catch (t) {
+i(t);
+}
+}
+function s(t) {
+t.done ? a(t.value) : (e = t.value, e instanceof o ? e : new o(function(t) {
+t(e);
+})).then(r, c);
+var e;
+}
+s((n = n.apply(t, e || [])).next());
+});
+}, c = this && this.__generator || function(t, e) {
+var o, n, a, i, r = {
+label: 0,
+sent: function() {
+if (1 & a[0]) throw a[1];
+return a[1];
+},
+trys: [],
+ops: []
+};
+return i = {
+next: c(0),
+throw: c(1),
+return: c(2)
+}, "function" == typeof Symbol && (i[Symbol.iterator] = function() {
+return this;
+}), i;
+function c(t) {
+return function(e) {
+return s([ t, e ]);
+};
+}
+function s(i) {
+if (o) throw new TypeError("Generator is already executing.");
+for (;r; ) try {
+if (o = 1, n && (a = 2 & i[0] ? n.return : i[0] ? n.throw || ((a = n.return) && a.call(n), 
+0) : n.next) && !(a = a.call(n, i[1])).done) return a;
+(n = 0, a) && (i = [ 2 & i[0], a.value ]);
+switch (i[0]) {
+case 0:
+case 1:
+a = i;
+break;
+
+case 4:
+r.label++;
+return {
+value: i[1],
+done: !1
+};
+
+case 5:
+r.label++;
+n = i[1];
+i = [ 0 ];
+continue;
+
+case 7:
+i = r.ops.pop();
+r.trys.pop();
+continue;
+
+default:
+if (!(a = r.trys, a = a.length > 0 && a[a.length - 1]) && (6 === i[0] || 2 === i[0])) {
+r = 0;
+continue;
+}
+if (3 === i[0] && (!a || i[1] > a[0] && i[1] < a[3])) {
+r.label = i[1];
+break;
+}
+if (6 === i[0] && r.label < a[1]) {
+r.label = a[1];
+a = i;
+break;
+}
+if (a && r.label < a[2]) {
+r.label = a[2];
+r.ops.push(i);
+break;
+}
+a[2] && r.ops.pop();
+r.trys.pop();
+continue;
+}
+i = e.call(t, r);
+} catch (t) {
+i = [ 6, t ];
+n = 0;
+} finally {
+o = a = 0;
+}
+if (5 & i[0]) throw i[1];
+return {
+value: i[0] ? i[1] : void 0,
+done: !0
+};
+}
 };
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = t("../../data/GameData"), c = cc._decorator, s = c.ccclass, l = c.property, p = function(t) {
+var s = t("../../data/GameData"), l = cc._decorator, p = l.ccclass, u = l.property, d = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -26246,10 +26370,10 @@ return e;
 }
 e.prototype.start = function() {
 this.initCashOutStyle(gData.gameData.playerProp.redMoney);
-this.lbl_remainTimes.string = "今日剩余次数：" + gData.gameData.speedUpLeftTimes;
+this.lbl_remainTimes.string = "今日剩余次数：" + gData.gameData.playerProp.speedUpLeftTimes;
 };
 e.prototype.onEnable = function() {
-mk.ad.showBanner(r.BannerAdType.banner_click_5);
+mk.ad.showBanner(s.BannerAdType.banner_click_5);
 };
 e.prototype.onDisable = function() {
 mk.ad.destoryBanner();
@@ -26259,6 +26383,7 @@ gData.reward.add_redbag_value && this.initCashOutStyle(gData.gameData.playerProp
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
@@ -26277,30 +26402,49 @@ gData.reward.addReward();
 mk.ui.closePanel(this.node.name);
 };
 e.prototype.clickWatchVideoBtn = function() {
+var t = this;
 mk.audio.playEffect("button");
-if (gData.gameData.speedUpLeftTimes <= 0) mk.tip.pop("今日加速次数已用完"); else if (gData.gameData.checkCanSpeedUp()) {
+if (gData.gameData.playerProp.speedUpLeftTimes <= 0) mk.tip.pop("今日加速次数已用完"); else if (gData.gameData.checkCanSpeedUp()) {
 mk.ui.closePanel(this.node.name);
-mk.ad.videoAdType = r.VideoAdType.video_init_14;
-mk.ad.watchAd(function(t) {
-if (t) {
+mk.ad.videoAdType = s.VideoAdType.video_init_14;
+mk.ad.watchAd(function(e) {
+return r(t, void 0, void 0, function() {
+var t;
+return c(this, function(o) {
+switch (o.label) {
+case 0:
+if (!e) return [ 3, 2 ];
 gData.adData.watchVideo(null);
+return [ 4, mk.http.sendData("farmSpeedUp", {}) ];
+
+case 1:
+if ((t = o.sent()) && 0 == t.errcore) {
+gData.gameData.playerProp.speedUpLeftTimes = t.data.speedUpLeftTimes;
+this.lbl_remainTimes.string = "今日剩余次数：" + gData.gameData.playerProp.speedUpLeftTimes;
+}
 gData.gameData.setHarvest();
 mk.tip.pop("加速成功！");
+o.label = 2;
+
+case 2:
+return [ 2 ];
 }
 });
+});
+});
 } else mk.tip.pop("没有可加速的物品");
 };
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
-i([ l(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
-i([ l(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
-i([ l(cc.Label) ], e.prototype, "lbl_progress", void 0);
-i([ l(cc.Animation) ], e.prototype, "node_cash", void 0);
-i([ l(cc.Label) ], e.prototype, "lbl_remainTimes", void 0);
-return i([ s ], e);
+i([ u(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
+i([ u(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
+i([ u(cc.Label) ], e.prototype, "lbl_progress", void 0);
+i([ u(cc.Animation) ], e.prototype, "node_cash", void 0);
+i([ u(cc.Label) ], e.prototype, "lbl_remainTimes", void 0);
+return i([ p ], e);
 }(cc.Component);
-o.default = p;
+o.default = d;
 cc._RF.pop();
 }, {
 "../../data/GameData": "GameData"
@@ -28465,6 +28609,7 @@ gData.reward.add_redbag_value && this.initCashOutStyle(gData.gameData.playerProp
 };
 e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
+t /= 100;
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
 var n = t > o.redMoney ? o.redMoney : t;
@@ -30128,8 +30273,8 @@ this.initTip();
 }
 };
 e.prototype.initTip = function() {
-this.lbl_redMoney.string = gData.gameData.playerProp.redMoney.toString();
-this.lbl_value.string = gData.gameData.playerProp.redMoney / 1e4 + "元";
+this.lbl_redMoney.string = (gData.gameData.playerProp.redMoney / 100).toString();
+this.lbl_value.string = gData.gameData.playerProp.redMoney / 1e6 + "元";
 if (-1 != this.curChooseIndex) {
 var t = gData.gameData.configs.CashCfg[this.curChooseIndex];
 if (gData.gameData.playerProp.redMoney - t.redMoney >= 0) {
@@ -30140,12 +30285,12 @@ this.btn_cashOut.setGray(!1);
 this.isCanCash = !1;
 this.btn_cashOut.setGray(!0);
 }
-var e = t.money / 100, o = (gData.gameData.playerProp.redMoney / 1e4).toString() + "元";
+var e = t.money / 100, o = (gData.gameData.playerProp.redMoney / 1e6).toString() + "元";
 this.lbl_tip.string = "需要" + e + "元，当前有" + o;
 } else {
 this.isCanCash = !1;
 this.btn_cashOut.setGray(!0);
-e = t.money / 100, o = (gData.gameData.playerProp.redMoney / 1e4).toString() + "元";
+e = t.money / 100, o = (gData.gameData.playerProp.redMoney / 1e6).toString() + "元";
 this.lbl_tip.string = "需要" + e + "元，当前只有" + o;
 }
 } else {

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631347921726,
-    "genTime": 1631347921726,
+    "buildTime": 1631353300750,
+    "genTime": 1631353300750,
     "genVersion": null
 }