1

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = false;
+    public ifShowLog: boolean = true;
 
     /**
      * 标签符号

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

@@ -1339,6 +1339,8 @@ if (0 == o) ; else if (1 == o) {
 var n = JSON.parse(e);
 gData.adData.updateADLog(8, t, n);
 mk.data.sendDataEvent(c.DataEventId.interstitial2_end, mk.ad.interFullAdType);
+console.log("onInterstitialAdClose======");
+p.default.getInstance().onInterstitialAdCloseCallBack();
 }
 gData.warnTipData.getUserShutdownAds(function() {
 a.loadInter(o);
@@ -2414,6 +2416,9 @@ case c.Cancel:
 mk.ad.watchAdFail();
 }
 };
+e.prototype.onInterstitialAdCloseCallBack = function() {
+mk.ad.closeInterFullAdCallBack();
+};
 e.prototype.showInter = function(t) {
 void 0 === t && (t = 0);
 d.default.getInstance().showInter(t);
@@ -3084,13 +3089,7 @@ this.timeAd += t;
 var e = this.AutoRedMoneyMap.get(this.ecpmLevel);
 if (this.timeAd >= e) {
 this.timeAd = 0;
-if ("1" == gData.gameData.insertAdSwitch[13]) {
-mk.ad.videoAdType = c.VideoAdType.video_init_22;
-mk.ad.watchAd(function(t) {
-mk.console.log("watchAD:" + t);
-t && gData.adData.watchVideo(null);
-});
-}
+"1" == gData.gameData.insertAdSwitch[13] && gData.adData.checkShowFullInter(1, c.InterFullAdType.interstitial2_init_4);
 }
 }
 };
@@ -3233,6 +3232,7 @@ this.ifShowAd = !1;
 this.videoAdType = n.VideoAdType.video_init_1;
 this.videoAdcallBack = null;
 this.interFullAdType = n.InterFullAdType.interstitial2_init_1;
+this.interFullAdCallBack = null;
 this.interAdType = n.InterAdType.interstitial1_click_1;
 this.bannerAdType = n.BannerAdType.banner_click_1;
 this.last_time_stamp = 0;
@@ -3267,8 +3267,19 @@ mk.data.setTAEventUser(1, "video_time", 1);
 mk.ui.scheduleOnce(function() {
 gData.adData.checkAdMax() || e.videoAdcallBack(!0);
 e.initLastTimeStamp();
+gData.gameData.uploadAverageEcpm();
 }, 0);
 };
+t.prototype.closeInterFullAdCallBack = function() {
+var t = this;
+setTimeout(function() {
+if (t.interFullAdCallBack) {
+t.interFullAdCallBack();
+t.interFullAdCallBack = null;
+console.log("closeInterFullAdCallBack===");
+}
+}, 1e3);
+};
 t.prototype.showNative = function(t) {
 void 0 === t && (t = 4);
 if (this.ifShowAd) {
@@ -3322,10 +3333,14 @@ this.adSdk.showBanner();
 t.prototype.destoryBanner = function() {
 this.ifShowAd && this.adSdk.destoryBanner();
 };
-t.prototype.showInterAd = function(t, e) {
+t.prototype.showInterAd = function(t, e, a) {
 void 0 === e && (e = null);
+void 0 === a && (a = null);
 if (this.ifShowAd && !(gData.warnTipData.curSolution >= 2)) {
-1 == t ? e && (this.interFullAdType = e) : e && (this.interAdType = e);
+if (1 == t) {
+e && (this.interFullAdType = e);
+this.interFullAdCallBack = a;
+} else e && (this.interAdType = e);
 this.adSdk.showInter(t);
 }
 };
@@ -3955,7 +3970,6 @@ this.appNameBugly = "3xiao";
 this.appVersion = "";
 this.tfChannel = "";
 this.version = "";
-this.UA = "";
 this.IP = "";
 this.appId = "";
 this.umengChannel = "";
@@ -6081,6 +6095,9 @@ e.sp_moregame.spriteFrame = new cc.SpriteFrame(o);
 }
 });
 this.lab_moregame.string = t.title;
+gData.moreGame.placement_id = t.placement_id;
+gData.moreGame.nebulaAppId = t.nebulaAppId;
+gData.moreGame.userBehaveLog(3, gData.moreGame.placement_id, gData.moreGame.nebulaAppId);
 };
 i([ c(cc.Sprite) ], e.prototype, "sp_moregame", void 0);
 i([ c(cc.Label) ], e.prototype, "lab_moregame", void 0);
@@ -7772,7 +7789,7 @@ report_time: Date.now(),
 user_id: gData.loginData.uin,
 device_id: "",
 os_type: 1,
-user_agent: gData.appData.UA,
+user_agent: gData.appData.machineInfo.UA,
 imei: gData.appData.machineInfo.imei,
 ifda: gData.appData.machineInfo.idfa,
 oaid: gData.appData.machineInfo.oaid,
@@ -9352,8 +9369,8 @@ e.prototype.riped = function(t) {
 void 0 === t && (t = !0);
 this.counting = !1;
 this.normalGroup.active = !1;
-var e = !1;
-if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) if (this.productConfig.tab == l.ProductType.nzw) {
+var e = !1, a = gData.gameData.getProp(l.GameProp.cashTimes);
+if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= 1 && a >= gData.gameData.insectAutoShowLimit && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) if (this.productConfig.tab == l.ProductType.nzw) {
 if (gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
 e = !0;
 gData.gameData.RawInsectCurArr[0]++;
@@ -11739,7 +11756,10 @@ scale: 1
 }).start();
 };
 e.prototype.showLabStrChange = function(t) {
-gData.gameData.gameStyle.lbl_redMoney && (gData.gameData.playerProp.redMoney += t);
+if (gData.gameData.gameStyle.lbl_redMoney) {
+gData.gameData.addHb = t;
+gData.gameData.playerProp.redMoney += t;
+}
 };
 e.prototype.playFlyAni = function(t, e, a, o, n, i) {
 void 0 === n && (n = null);
@@ -12746,7 +12766,7 @@ return i > 3 && r && Object.defineProperty(e, a, r), r;
 Object.defineProperty(a, "__esModule", {
 value: !0
 });
-var r = cc._decorator, s = r.ccclass, c = r.property, l = function(t) {
+var r = t("../data/GameData"), s = cc._decorator, c = s.ccclass, l = s.property, p = function(t) {
 n(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -12778,68 +12798,95 @@ a.active = "1" == t[e];
 if (11 == e && "0" == t[e]) {
 this.btn5.y = this.btn5.y + 170;
 this.addCount += 1;
-} else 2 == e && "0" == t[e] ? this.btn4.y = this.btn4.y + 170 : 4 == e && "0" == t[e] && (this.addCount += 1);
+} else if (2 == e && "0" == t[e]) this.btn4.y = this.btn4.y + 170; else if (4 == e) if ("1" == t[e]) {
+var o = gData.gameData.getProp(r.GameProp.cashTimes);
+o || (o = 0);
+if (o < gData.gameData.taskRedBagAutoShowLimit) {
+a.active = !1;
+mk.event.register("showTaskRedBagAction", this.doShowTaskRedBagActionLogic.bind(this), this);
+}
+} else this.addCount += 1;
 }
 }
 this.btn9.y = this.btn9.y + 130 * this.addCount;
 if (this.btn8.active) {
-var o = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
-this.btn8.active = o;
-o || mk.event.register("refreshBubble", this.refreshStatus.bind(this), this);
+var n = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
+this.btn8.active = n;
+n || mk.event.register("refreshBubble", this.refreshStatus.bind(this), this);
 }
 };
 e.prototype.refreshStatus = function() {
 this.btn8.active = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
 };
-i([ c({
+e.prototype.doShowTaskRedBagActionLogic = function() {
+var t = this;
+if ("1" == gData.gameData.funOpenData[8]) {
+var e = this.btn9.y + 130;
+cc.tween(this.btn9).to(.2, {
+y: e
+}).call(function() {
+t.doAction();
+}).start();
+} else this.doAction();
+};
+e.prototype.doAction = function() {
+var t = this.btn5.x;
+this.btn5.x = t + 430;
+cc.tween(this.btn5).to(.4, {
+x: t
+}).call(function() {}).start();
+};
+i([ l({
 type: cc.Node,
 displayName: "农场等级奖励"
 }) ], e.prototype, "btn1", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "提现"
 }) ], e.prototype, "btn2", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "签到"
 }) ], e.prototype, "btn3", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "抽奖"
 }) ], e.prototype, "btn4", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "任务红包"
 }) ], e.prototype, "btn5", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "福利"
 }) ], e.prototype, "btn6", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "邀请"
 }) ], e.prototype, "btn7", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "漂浮红包"
 }) ], e.prototype, "btn8", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "互推"
 }) ], e.prototype, "btn9", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "订单"
 }) ], e.prototype, "btn12", void 0);
-i([ c({
+i([ l({
 type: cc.Node,
 displayName: "富翁银行"
 }) ], e.prototype, "btn14", void 0);
-return i([ s ], e);
+return i([ c ], e);
 }(cc.Component);
-a.default = l;
+a.default = p;
 cc._RF.pop();
-}, {} ],
+}, {
+"../data/GameData": "GameData"
+} ],
 GData: [ function(t, e, a) {
 "use strict";
 cc._RF.push(e, "c968fZ1+W1BDIpoLXI/0qsN", "GData");
@@ -12847,7 +12894,7 @@ Object.defineProperty(a, "__esModule", {
 value: !0
 });
 a.Fun = void 0;
-var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), s = t("./LoginData"), c = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), D = t("./module/RedBagCashData"), b = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), k = t("./module/GuideData"), A = t("./module/GuideWeakData"), P = t("./ConfigData"), T = t("./module/NewCashUIData"), O = t("../../before/view/data/ADUnlockData"), I = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), F = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), E = t("./module/LineUpUIData"), L = t("./module/WarnTipData"), U = t("./module/SafeDepositBoxData"), G = function() {
+var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), s = t("./LoginData"), c = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), D = t("./module/RedBagCashData"), b = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), k = t("./module/GuideData"), A = t("./module/GuideWeakData"), P = t("./ConfigData"), T = t("./module/NewCashUIData"), I = t("../../before/view/data/ADUnlockData"), O = t("../../before/view/data/PlantData"), C = t("../../before/main/FarmSystem"), R = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), F = t("./module/FarmMapData"), j = t("./module/GradeRewardData"), B = t("./module/WalletCashOutData"), E = t("./module/LineUpUIData"), L = t("./module/WarnTipData"), U = t("./module/SafeDepositBoxData"), G = function() {
 function t() {
 this.init();
 }
@@ -12876,13 +12923,13 @@ this.blessingBag = new _.BlessingBagData();
 this.cashPro = new v.default();
 this.redCodeData = new b.default();
 this.newCashUiData = new T.NewCashUIData();
-this.adUnlockData = new O.default();
-this.plantData = new I.default();
-this.harvestData = new C.default();
+this.adUnlockData = new I.default();
+this.plantData = new O.default();
+this.harvestData = new R.default();
 this.adClearSickData = new x.default();
 this.pastureSystem = new N.default();
 this.factorySystem = new M.default();
-this.farmSystem = new R.FarmSystem();
+this.farmSystem = new C.FarmSystem();
 this.farmMapData = new F.FarmMapData();
 this.farmGradeData = new j.GradeRewardData();
 this.walletCashOutData = new B.WalletCashOutData();
@@ -13249,8 +13296,12 @@ this.productionAdMaxTimes = 20;
 this.popTipCallBack = null;
 this.orderAinFinishNum = 0;
 this.welfareOpenLimit = 0;
+this.orderRewardType = 1;
+this.taskRedBagAutoShowLimit = 0;
+this.insectAutoShowLimit = 2;
 this.insertAdLimit = 0;
 this.insertAdSwitch = [];
+this.fullScreenAdSwitch = [];
 this._farmMapRewardData = [];
 this._cashOutTimes = 0;
 this._farmData = [];
@@ -13295,13 +13346,7 @@ mk.console.logSingle("getInfoCrypt", e.data);
 this.initPlayerProp(e.data);
 this.initProps(e.data.gameUserData);
 4 == gData.warnTipData.curSolution && 0 == e.data.isSystemRisk && gData.warnTipData.setSolution(0);
-t = {};
-return [ 4, mk.http.sendData("user/adShowConfig", t) ];
-
-case 3:
-if (0 != (e = a.sent()).errcode) return [ 2 ];
-this.adShowConfig = e.data;
-mk.console.logSingle("user/adShowConfig", e.data);
+this.uploadAverageEcpm();
 gData.adData.initEcpmData();
 gData.guideData.init();
 gData.guideWeakData.init();
@@ -13314,6 +13359,25 @@ return [ 2 ];
 });
 });
 };
+t.prototype.uploadAverageEcpm = function() {
+return o(this, void 0, void 0, function() {
+var t, e;
+return n(this, function(a) {
+switch (a.label) {
+case 0:
+t = {};
+return [ 4, mk.http.sendData("user/adShowConfig", t) ];
+
+case 1:
+if (0 != (e = a.sent()).errcode) return [ 2 ];
+this.adShowConfig = e.data;
+mk.data.setTAEventUser(0, "average_ecpm", this.adShowConfig.average_ecpm);
+mk.console.logSingle("user/adShowConfig", e.data);
+return [ 2 ];
+}
+});
+});
+};
 t.prototype.initConfigs = function(t) {
 this.configs = t;
 this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
@@ -13329,8 +13393,11 @@ gData.gameData.shareImgUrl = this.configs.ServerConfig.shareImgUrl;
 gData.gameData.RawInsectArr = this.configs.ServerConfig.RawInsect.split(",");
 gData.safeDepositBoxData.richBankConfig = this.configs.BankTask;
 gData.gameData.welfareOpenLimit = parseInt(this.configs.ServerConfig.welfareOpen);
+gData.gameData.orderRewardType = parseInt(this.configs.ServerConfig.OrderReward);
+gData.gameData.insectAutoShowLimit = parseInt(this.configs.ServerConfig.StopProductionSwitch);
 gData.gameData.insertAdLimit = parseInt(this.configs.ServerConfig.InsertAdCash);
 gData.gameData.insertAdSwitch = this.configs.ServerConfig.InsertAdScene.split(",");
+gData.gameData.fullScreenAdSwitch = this.configs.ServerConfig.FullScreenAdScene.split(",");
 };
 t.prototype.initPlayerProp = function(t) {
 this.playerProp = new y();
@@ -14807,12 +14874,12 @@ t.video_init_18 = "离开游戏领红包";
 t.video_init_19 = "定时弹出红包";
 t.video_init_20 = "插队";
 t.video_init_21 = "恢复生产次数";
-t.video_init_22 = "长时间未操作弹出视频";
 })(a.VideoAdType || (a.VideoAdType = {}));
 (function(t) {
 t.interstitial2_init_1 = "点击红包的关闭按钮";
 t.interstitial2_init_2 = "普通收获";
 t.interstitial2_init_3 = "点击鸟和狗";
+t.interstitial2_init_4 = "长时间未操作弹出";
 })(a.InterFullAdType || (a.InterFullAdType = {}));
 (function(t) {
 t.interstitial1_click_1 = "恭喜发财红包弹出后";
@@ -15238,12 +15305,15 @@ e.lbl_redMoneyValue = [];
 e.node_getOrderReward = null;
 e.node_orderHand = null;
 e.ani_add4 = null;
-e.lbl_addRedMoney = null;
+e.lbl_addCash = null;
 e.node_orderHb = null;
 e.node_extraOrderUi = null;
 e.node_bgUi = null;
 e.node_crop = [];
 e.node_orderHbIcon = null;
+e.node_showCash = null;
+e.node_showRedMoney = null;
+e.lbl_orderRedMoney = null;
 e.posY = 0;
 e.lastTimeSpan = 0;
 e.span = 0;
@@ -15502,6 +15572,7 @@ gData.gameData.init_leftTimes = !1;
 e.prototype.onCount = function() {};
 e.prototype.onClickHuTui = function() {
 mk.data.sendDataEvent(d.DataEventId.button_click, "互推icon");
+gData.moreGame.userBehaveLog(4, gData.moreGame.placement_id, gData.moreGame.nebulaAppId);
 };
 e.prototype.onClickFuli = function() {
 if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= gData.gameData.welfareOpenLimit) {
@@ -15554,11 +15625,7 @@ return [ 2 ];
 mk.ui.openPanel("module/speedUpUI/productReward");
 return [ 2 ];
 }
-if (gData.gameData.isProducting) {
-mk.tip.pop("点击太快了");
-return [ 2 ];
-}
-return [ 4, gData.gameData.makeProduct() ];
+return gData.gameData.isProducting ? [ 2 ] : [ 4, gData.gameData.makeProduct() ];
 
 case 1:
 if (o.sent()) {
@@ -15912,7 +15979,11 @@ this.orderPicIdArray = [];
 this.isGray = !0;
 t = gData.gameData.configs.Product;
 if (!(e = gData.gameData.playerProp.orderData)) return [ 3, 6 ];
-this.lbl_addRedMoney.string = (e.cashMoney / 100).toFixed(2);
+if (1 == gData.gameData.orderRewardType) {
+this.node_showCash.active = !1;
+this.node_showRedMoney.active = !0;
+this.lbl_orderRedMoney.string = e.redMoneyAddition / 100 + "";
+} else this.lbl_addCash.string = (e.cashMoney / 100).toFixed(2);
 if (3 != (a = e.orderTaskList.length)) return [ 3, 6 ];
 o = 0;
 n = 0;
@@ -15989,13 +16060,13 @@ var t, e, a;
 return s(this, function(o) {
 switch (o.label) {
 case 0:
+if (2 != gData.gameData.orderRewardType) return [ 3, 2 ];
 if (cc.sys.isNative && !gData.loginData.isAuth) {
 gData.gameData.authUIType = 0;
 mk.ui.openPanel("module/authUI/authUI");
 return [ 2 ];
 }
-t = {};
-return [ 4, mk.http.sendData("orderTask/receiveRewardCash", t) ];
+return [ 4, mk.http.sendData("orderTask/receiveRewardCash", {}) ];
 
 case 1:
 if (0 != (e = o.sent()).errcode) {
@@ -16015,6 +16086,35 @@ t.active = !1;
 });
 this.node_orderHbIcon.active = !1;
 this.node_getOrderReward.node.active = !1;
+return [ 3, 4 ];
+
+case 2:
+t = {};
+return [ 4, mk.http.sendData("orderTask/receiveReward", t) ];
+
+case 3:
+if (0 != (e = o.sent()).errcode) return [ 2, null ];
+a = gData.gameData.playerProp.orderData.redMoneyAddition;
+gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
+gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
+gData.reward.adData = {
+videoRedMoney: {
+videoRewardList: null
+}
+};
+gData.reward.adData.videoRedMoney.videoRewardList = [ {
+rewardType: 1,
+rewardNum: a
+} ];
+mk.ui.openPanel("module/reward/reward");
+this.node_crop.forEach(function(t) {
+t.active = !1;
+});
+this.node_orderHbIcon.active = !1;
+this.node_getOrderReward.node.active = !1;
+o.label = 4;
+
+case 4:
 return [ 2 ];
 }
 });
@@ -16346,9 +16446,9 @@ type: cc.Node,
 displayName: "增加效果文本2"
 }) ], e.prototype, "ani_add4", void 0);
 i([ y({
-displayName: "红包币",
+displayName: "现金",
 type: cc.Label
-}) ], e.prototype, "lbl_addRedMoney", void 0);
+}) ], e.prototype, "lbl_addCash", void 0);
 i([ y({
 displayName: "红包币图标",
 type: cc.Node
@@ -16369,6 +16469,18 @@ i([ y({
 displayName: "订单红包",
 type: cc.Node
 }) ], e.prototype, "node_orderHbIcon", void 0);
+i([ y({
+displayName: "显示现金",
+type: cc.Node
+}) ], e.prototype, "node_showCash", void 0);
+i([ y({
+displayName: "显示红包币",
+type: cc.Node
+}) ], e.prototype, "node_showRedMoney", void 0);
+i([ y({
+displayName: "订单红包币",
+type: cc.Label
+}) ], e.prototype, "lbl_orderRedMoney", void 0);
 return i([ f ], e);
 }(cc.Component);
 a.default = m;
@@ -18156,58 +18268,77 @@ gData.harvestData.call = null;
 };
 e.prototype.getNormalReward = function() {
 return r(this, void 0, void 0, function() {
-var t, e, a, o, n, i, r, c, p = this;
+var t, e, a, o, n, i, r, c, p, u = this;
 return s(this, function(s) {
 switch (s.label) {
 case 0:
+return [ 4, mk.time.WaitForSeconds(.2) ];
+
+case 1:
+s.sent();
 t = {
 id: this.config.id
 };
 return [ 4, mk.http.sendData("redMoney/addRedMoneyByFarm", t) ];
 
-case 1:
+case 2:
 if ((e = s.sent()) && 0 != e.errcode) return [ 2 ];
-if (!(e.data.redMoneyAddition <= 0)) return [ 3, 2 ];
+if (!(e.data.redMoneyAddition <= 0)) return [ 3, 3 ];
 console.log("返回奖励为0");
-return [ 3, 5 ];
+return [ 3, 7 ];
 
-case 2:
-if (!this.isTouchBtn) return [ 3, 4 ];
+case 3:
+if (!this.isTouchBtn) return [ 3, 5 ];
 a = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
-o = mk.fly.node.convertToNodeSpaceAR(a);
+r = mk.fly.node.convertToNodeSpaceAR(a);
 return [ 4, mk.loader.load("module/guide/hand", cc.Prefab) ];
 
-case 3:
-n = s.sent();
-(i = cc.instantiate(n)).scale = .8;
-i.getComponent(cc.Animation).getAnimationState("guideA").speed = 2;
-i.parent = mk.fly.node;
-i.setPosition(o);
-cc.tween(i).delay(.4).call(function() {
-p.getType = 0;
+case 4:
+c = s.sent();
+(p = cc.instantiate(c)).scale = .8;
+p.getComponent(cc.Animation).getAnimationState("guideA").speed = 2;
+p.parent = mk.fly.node;
+p.setPosition(r);
+cc.tween(p).delay(.4).call(function() {
+u.getType = 0;
 var t = [ {
 rewardType: 1,
 rewardNum: e.data.redMoneyAddition
 } ];
 gData.reward.data = t;
-gData.reward.callback = p.call;
+gData.reward.callback = u.call;
 gData.reward.getReward(a);
 }).removeSelf().start();
-return [ 3, 5 ];
+return [ 3, 7 ];
 
-case 4:
+case 5:
 this.getType = 0;
-r = [ {
+o = [ {
 rewardType: 1,
 rewardNum: e.data.redMoneyAddition
 } ];
-gData.reward.data = r;
+gData.reward.data = o;
 gData.reward.callback = this.call;
-c = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
-gData.reward.getReward(c);
-s.label = 5;
+n = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
+gData.reward.getReward(n);
+i = "+" + e.data.redMoneyAddition / 100;
+r = mk.fly.node.convertToNodeSpaceAR(n);
+return [ 4, mk.loader.load("game/prefab/flyHb", cc.Prefab) ];
 
-case 5:
+case 6:
+c = s.sent();
+(p = cc.instantiate(c)).zIndex = 1e3;
+p.parent = mk.fly.node;
+p.setPosition(r);
+p.getComponentInChildren(cc.Label).string = i;
+cc.tween(p).by(.8, {
+y: 100
+}).to(.4, {
+opacity: 0
+}).removeSelf().start();
+s.label = 7;
+
+case 7:
 if (!mk.guide.isGuiding() && gData.adData.checkShowFullInter(4)) {
 gData.moreGame.openType = 0;
 mk.data.sendDataEvent(l.DataEventId.htRedBag_scene, "点击可收获");
@@ -19159,7 +19290,7 @@ value: !0
 a.ServerUrl = a.HttpData = void 0;
 var o, n = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -20504,7 +20635,7 @@ value: !0
 a.LogTagColor = void 0;
 var n, i = function() {
 function t() {
-this.ifShowLog = !1;
+this.ifShowLog = !0;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -21641,7 +21772,7 @@ cc._RF.push(e, "f0038hKHC9Nf5+ipaUV9rc5", "MKSystem");
 Object.defineProperty(a, "__esModule", {
 value: !0
 });
-var o = t("../sdk/BuglySDK"), n = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), s = t("./HttpSystem"), c = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), D = t("../utils/TweenUtil"), b = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), k = t("../../game/component/NumberAnim"), A = t("../sdk/aliRisk/AliRiskManager"), P = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), T = t("../sdk/shuzilm/ShuzilmM"), O = t("../sdk/tongdun/TongdunM"), I = function() {
+var o = t("../sdk/BuglySDK"), n = t("../utils/FileUtil"), i = t("../utils/TimeUtil"), r = t("./DataSystem"), s = t("./HttpSystem"), c = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), p = t("../utils/EncryptUtil"), u = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("./AudioSystem"), v = t("./PoolSystem"), D = t("../utils/TweenUtil"), b = t("./GuideSystem"), w = t("../utils/StringUtil"), S = t("../../game/component/SetGray"), k = t("../../game/component/NumberAnim"), A = t("../sdk/aliRisk/AliRiskManager"), P = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), T = t("../sdk/shuzilm/ShuzilmM"), I = t("../sdk/tongdun/TongdunM"), O = function() {
 function t() {}
 Object.defineProperty(t.prototype, "time", {
 get: function() {
@@ -21832,7 +21963,7 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "component", {
 get: function() {
-return this._component || (this._component = new R());
+return this._component || (this._component = new C());
 },
 enumerable: !1,
 configurable: !0
@@ -21846,13 +21977,13 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "tongdunM", {
 get: function() {
-return this._tongdunM || (this._tongdunM = new O.default());
+return this._tongdunM || (this._tongdunM = new I.default());
 },
 enumerable: !1,
 configurable: !0
 });
 return t;
-}(), R = function() {
+}(), C = function() {
 function t() {}
 Object.defineProperty(t.prototype, "setGray", {
 get: function() {
@@ -21870,7 +22001,7 @@ configurable: !0
 });
 return t;
 }();
-window.mk = new I();
+window.mk = new O();
 cc._RF.pop();
 }, {
 "../../game/component/NumberAnim": "NumberAnim",
@@ -22765,6 +22896,8 @@ e._moreGameList = null;
 e.init_moreGameList = !1;
 e.init_newOpenRedBag = !1;
 e.openType = -1;
+e.placement_id = "";
+e.nebulaAppId = "";
 e.testData = {
 normal: [ {
 nebulaAppId: "wxd2e694c55d457ded",
@@ -22943,6 +23076,16 @@ return [ 2 ];
 });
 });
 };
+e.prototype.userBehaveLog = function(t, e, a) {
+var o = {
+toAppId: a,
+recommend_type: t,
+placement_id: e,
+ip: gData.appData.IP,
+ua: gData.appData.machineInfo.UA
+};
+mk.http.sendData("fission/userBehaveLog", o);
+};
 e.downLoadTaskMap = new Map();
 return e;
 }(s.Data);
@@ -23689,6 +23832,7 @@ e.prototype.start = function() {
 var t = gData.gameData.getProp(r.GameProp.cashTimes);
 t || (t = 0);
 gData.gameData.setProp(r.GameProp.cashTimes, ++t);
+gData.gameData.taskRedBagAutoShowLimit == t && "1" == gData.gameData.funOpenData[4] && mk.event.emit("showTaskRedBagAction");
 };
 e.prototype.onEnable = function() {
 mk.ad.showNative();
@@ -25287,11 +25431,7 @@ gData.gameData.popTipCallBack = this.showTips;
 mk.ui.openPanel("module/speedUpUI/productReward");
 return [ 2 ];
 }
-if (gData.gameData.isProducting) {
-mk.tip.pop("点击太快了");
-return [ 2 ];
-}
-return this.data.tab != l.ProductType.nzw ? [ 3, 2 ] : [ 4, gData.farmSystem.plant(this.data.picture, this.nameIcon.node) ];
+return gData.gameData.isProducting ? [ 2 ] : this.data.tab != l.ProductType.nzw ? [ 3, 2 ] : [ 4, gData.farmSystem.plant(this.data.picture, this.nameIcon.node) ];
 
 case 1:
 t = a.sent();
@@ -27837,6 +27977,7 @@ e.add_redbag_value = 0;
 e._data = [];
 e.callback = null;
 e.subType = 1;
+e.closeUICallBack = null;
 return e;
 }
 Object.defineProperty(e.prototype, "data", {
@@ -28115,6 +28256,10 @@ mk.ui.openPanel("module/redBagCash/redBagCash");
 };
 e.prototype.onDestroy = function() {
 this.cur_stage === c.none && mk.audio.playEffect("button");
+if (gData.reward.closeUICallBack) {
+gData.reward.closeUICallBack();
+gData.reward.closeUICallBack = null;
+}
 };
 e.prototype.onClickClose = function() {
 mk.ad.destoryBanner();
@@ -34886,15 +35031,15 @@ this.initTip();
 };
 e.prototype.clickCashOutBtn = function() {
 mk.audio.playEffect("button");
-if (this.isCanCash) if (this.checkShowTip()) mk.tip.pop("请先提现完前一档次数"); else {
+if (this.isCanCash) {
 if (cc.sys.isNative && !gData.loginData.isAuth) {
 gData.gameData.authUIType = 0;
 mk.ui.openPanel("module/authUI/authUI");
 return;
 }
-gData.adData.checkPopCashFull();
+gData.adData.checkShowFullInter(1);
 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
-} else mk.tip.pop("红包币不足");
+} else mk.tip.pop("收获农作物可获得红包币");
 };
 e.prototype.checkShowTip = function() {
 if (this.curChooseIndex >= 1) {

packages-hot-update/cfg.json

@@ -14,7 +14,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJsb/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfJSB/baseRemote/"
     ],
-    "buildTime": 1639020018880,
-    "genTime": 1639020018880,
+    "buildTime": 1639216934766,
+    "genTime": 1639216934766,
     "genVersion": null
 }