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

assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "492c72b5-4111-48c1-b67b-c5f32a220220",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

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

@@ -53,8 +53,17 @@
             }
             return;
         }  
+
         gData.gameData.gameData.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.receiptNotice.receip_rmb = cashData[id-1].money;
+            mk.ui.openPanel('module/newNotice/newNotice');
+        }
     }
 
  }

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

@@ -220,6 +220,7 @@ export default class WalletCashOut extends cc.Component {
 
     private clickCashOutBtn() {
         mk.audio.playEffect("button");
+        console.log('=========>', this.isCanCash);
         if (this.isCanCash) {
             gData.adData.checkPopCashFull();
             //this.check_button[this.curChooseIndex].setIsCanNotChoose();

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

@@ -99,9 +99,11 @@ export default class RedBagTask extends cc.Component {
                 if (this.times == 2) {
                     this.times = 0;
                     this.num += 1;
-                    this.lbl_Ani.string = this.num.toString();
+                    let randNum = mk.math.random(1, this.maxNum);
+                    this.lbl_Ani.string = randNum.toString();
 
-                    if (this.num == this.maxNum) {
+                    if (this.num == 14) {
+                        this.lbl_Ani.string = this.maxNum.toString();
                         this.isShowNewTask = false;
 
                         this.lbl_Ani.node.color = new cc.Color(255, 218, 49);

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

@@ -11112,7 +11112,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.Fun = void 0;
-var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), k = t("./module/SettingData"), P = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), R = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), j = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), G = t("./module/LineUpUIData"), U = function() {
+var n, a = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), D = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), S = t("./module/RedeemData"), A = t("./module/MoreGameData"), k = t("./module/SettingData"), P = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), T = t("./module/NewCashUIData"), R = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), j = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), G = t("./module/LineUpUIData"), U = function() {
 function t() {
 this.init();
 }
@@ -11142,8 +11142,8 @@ this.blessingBag = new v.BlessingBagData();
 this.cashPro = new b.default();
 this.redCodeData = new w.default();
 this.redeem = new S.default();
-this.newCashUiData = new R.NewCashUIData();
-this.adUnlockData = new T.default();
+this.newCashUiData = new T.NewCashUIData();
+this.adUnlockData = new R.default();
 this.plantData = new C.default();
 this.harvestData = new N.default();
 this.adClearSickData = new F.default();
@@ -11807,18 +11807,24 @@ this.updateNewTaskProgress();
 };
 t.prototype.updateNewTaskProgress = function() {
 return n(this, void 0, void 0, function() {
-var t, e;
-return a(this, function(o) {
-switch (o.label) {
+var t, e, o, n;
+return a(this, function(a) {
+switch (a.label) {
 case 0:
-t = {};
-return [ 4, mk.http.sendData("farmTask/updateUserFarmTaskInfo", t) ];
+if (gData.gameData.init_redBagTask) return [ 2 ];
+if (gData.gameData.gameData.userFarmTaskInfo) {
+t = gData.gameData.gameData.userFarmTaskInfo.completeCount;
+e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+if (t >= e) return [ 2 ];
+}
+o = {};
+return [ 4, mk.http.sendData("farmTask/updateUserFarmTaskInfo", o) ];
 
 case 1:
-e = o.sent();
-mk.console.logSingle("refrehTask=>", e);
-if (0 != e.errcode) return [ 2, null ];
-gData.gameData.gameData.userFarmTaskInfo = e.data.userFarmTaskInfo;
+n = a.sent();
+mk.console.logSingle("refrehTask=>", n);
+if (0 != n.errcode) return [ 2, null ];
+gData.gameData.gameData.userFarmTaskInfo = n.data.userFarmTaskInfo;
 gData.gameData.init_task = !0;
 return [ 2 ];
 }
@@ -12729,6 +12735,7 @@ e.btn_product = null;
 e.lbl_farmLevel = null;
 e.sp_levelPer = null;
 e.ani_add = null;
+e.node_hand = null;
 e.lastTimeSpan = 0;
 e.span = 0;
 return e;
@@ -12800,7 +12807,13 @@ this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
 gData.gameData.init_coin = !1;
 if (gData.gameData.gameData.userFarmTaskInfo) {
 var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+if (gData.gameData.init_redBagTask) {
+this.lbl_task.string = "<b><color=#8D4D32>点击领取任务!</c></b>";
+this.node_hand.active = !0;
+} else {
 this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#7EB80E>(" + t + "/" + e + ")</color></b>";
+this.node_hand.active = t >= e;
+}
 }
 };
 e.prototype.changeInfo = function() {
@@ -12827,7 +12840,13 @@ scale: 1
 }).start();
 if (gData.gameData.gameData.userFarmTaskInfo) {
 var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+if (gData.gameData.init_redBagTask) {
+this.lbl_task.string = "<b><color=#8D4D32>点击领取任务!</c></b>";
+this.node_hand.active = !0;
+} else {
 this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#7EB80E>(" + t + "/" + e + ")</color></b>";
+this.node_hand.active = t >= e;
+}
 }
 gData.gameData.init_task = !1;
 };
@@ -13057,6 +13076,10 @@ i([ d({
 type: cc.Animation,
 displayName: "增加效果文本"
 }) ], e.prototype, "ani_add", void 0);
+i([ d({
+type: cc.Node,
+displayName: "任务红包手"
+}) ], e.prototype, "node_hand", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.default = f;
@@ -22726,6 +22749,7 @@ return e;
 }
 e.prototype.start = function() {
 this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+this.isShowNewTask = gData.gameData.init_redBagTask;
 if (this.isShowNewTask) this.showNewTaskUI(); else {
 this.initTaskProgressUI();
 this.showChangePart();
@@ -22738,6 +22762,7 @@ this.node_task.active = !1;
 this.openBtn_ani.node.active = !1;
 this.lbl_Ani.node.active = !0;
 gData.gameData.init_redBagTask = !1;
+gData.gameData.init_task = !0;
 gData.gameData.setProp(p.GameProp.redBagTaskRefresh, gData.gameData.init_redBagTask);
 };
 e.prototype.onEnable = function() {
@@ -22755,23 +22780,25 @@ this.times += 1;
 if (2 == this.times) {
 this.times = 0;
 this.num += 1;
-this.lbl_Ani.string = this.num.toString();
-if (this.num == this.maxNum) {
+var o = mk.math.random(1, this.maxNum);
+this.lbl_Ani.string = o.toString();
+if (14 == this.num) {
+this.lbl_Ani.string = this.maxNum.toString();
 this.isShowNewTask = !1;
 this.lbl_Ani.node.color = new cc.Color(255, 218, 49);
-var o = cc.instantiate(this.lbl_Ani.node);
-o.parent = this.lbl_Ani.node.parent;
-cc.tween(o).to(.8, {
+var n = cc.instantiate(this.lbl_Ani.node);
+n.parent = this.lbl_Ani.node.parent;
+cc.tween(n).to(.8, {
 scale: 4,
 opacity: 0
 }).call(function() {
-o.active = !1;
-var t = e.lbl_taskNum.node.parent.convertToWorldSpaceAR(e.lbl_taskNum.node.position), n = e.lbl_taskNum.node.parent.parent.convertToNodeSpaceAR(t);
+n.active = !1;
+var t = e.lbl_taskNum.node.parent.convertToWorldSpaceAR(e.lbl_taskNum.node.position), o = e.lbl_taskNum.node.parent.parent.convertToNodeSpaceAR(t);
 cc.tween(e.lbl_Ani).to(.6, {
 fontSize: 40
 }).start();
 cc.tween(e.lbl_Ani.node).to(.6, {
-position: n
+position: o
 }, cc.easeSineOut()).call(function() {
 e.lbl_Ani.node.active = !1;
 e.node_task.active = !0;
@@ -22863,7 +22890,6 @@ mk.console.logSingle("redBagTask=>", e);
 if (0 != e.errcode) return [ 2, null ];
 gData.gameData.gameData.userFarmTaskInfo = e.data.userFarmTaskInfo;
 gData.gameData.init_redBagTask = !0;
-gData.gameData.init_task = !0;
 this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
 this.num = 0;
 this.delayTime = 0;
@@ -29426,6 +29452,7 @@ this.initTip();
 };
 e.prototype.clickCashOutBtn = function() {
 mk.audio.playEffect("button");
+console.log("=========>", this.isCanCash);
 if (this.isCanCash) {
 gData.adData.checkPopCashFull();
 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);

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": 1631168832893,
-    "genTime": 1631168832893,
+    "buildTime": 1631174292417,
+    "genTime": 1631174292417,
     "genVersion": null
 }