优化

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/resources/module/newCashUI/walletCashOut.prefab

@@ -1127,7 +1127,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "61oMSCyrhJy7Xyplkttu99",
+    "fileId": "5dZrIAabhKH7LusaNbKGvt",
     "sync": false
   },
   {
@@ -1336,7 +1336,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "2eAhcy7MNDMpElYja5A0Ki",
+    "fileId": "1dmnQbt/5FMr+tT+wPmmBX",
     "sync": false
   },
   {
@@ -10777,7 +10777,9 @@
     "btn_cashOut": {
       "__id__": 313
     },
-    "btn_addProgress": null,
+    "btn_addProgress": {
+      "__id__": 85
+    },
     "check_button": [
       {
         "__id__": 161

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

@@ -266,6 +266,18 @@ mk.ad.destoryBanner();
 };
 e.prototype.clickWatchVideo = function() {
 mk.ui.closePanel(this.node.name);
+switch (gData.adClearSickData.tab) {
+case s.ProductType.nzw:
+mk.ad.videoAdType = s.VideoAdType.video_init_7;
+break;
+
+case s.ProductType.dw:
+mk.ad.videoAdType = s.VideoAdType.video_init_8;
+break;
+
+default:
+mk.ad.videoAdType = s.VideoAdType.video_init_9;
+}
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 if (t) {
@@ -393,13 +405,15 @@ return i > 3 && r && Object.defineProperty(e, o, r), r;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = (r.property, function(t) {
+var r = t("../../../game/data/GameData"), c = cc._decorator, s = c.ccclass, l = (c.property, 
+function(t) {
 a(e, t);
 function e() {
 return null !== t && t.apply(this, arguments) || this;
 }
 e.prototype.clickWatchVideo = function() {
 var t = this;
+mk.ad.videoAdType = r.VideoAdType.video_init_11;
 mk.ad.watchAd(function(e) {
 mk.console.log("watchAD:" + e);
 if (e) {
@@ -415,11 +429,13 @@ mk.ad.showBanner();
 e.prototype.onDisable = function() {
 mk.ad.destoryBanner();
 };
-return i([ c ], e);
+return i([ s ], e);
 }(cc.Component));
-o.default = s;
+o.default = l;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../../game/data/GameData": "GameData"
+} ],
 ATAndroidBannerJS: [ function(t, e) {
 "use strict";
 cc._RF.push(e, "373b2sCOFlCLZeomt863XyC", "ATAndroidBannerJS");
@@ -1814,7 +1830,9 @@ mk.data.sendDataEvent(r.DataEventId.video_end, mk.ad.videoAdType);
 this.canGet = !1;
 this.loadAd();
 };
-e.prototype.onRewardedVideoAdPlayClicked = function() {};
+e.prototype.onRewardedVideoAdPlayClicked = function() {
+mk.data.sendDataEvent(r.DataEventId.video_click, mk.ad.videoAdType);
+};
 e.prototype.onReward = function() {
 console.log("onReward  ");
 this.canGet = !0;
@@ -2643,6 +2661,7 @@ this.timeAd += t;
 var e = this.AutoRedMoneyMap.get(this.ecpmLevel);
 if (this.timeAd >= e) {
 this.timeAd = 0;
+mk.ad.videoAdType = c.VideoAdType.video_init_19;
 mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
 }
@@ -2657,12 +2676,15 @@ this.clickTimesAdd++;
 if (this.clickTimesAdd >= this.popClickTimes) {
 this.clickTimesAdd = 0;
 this.setPopClickTimes();
-Math.random() <= this.getPerByEcpm() && mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
+if (Math.random() <= this.getPerByEcpm()) {
+mk.ad.videoAdType = c.VideoAdType.video_init_17;
+mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
+}
 }
 }
 };
 t.prototype.getPerByEcpm = function() {
-return 1;
+return .26;
 };
 return t;
 }();
@@ -2693,7 +2715,7 @@ var n = t("../../game/data/GameData"), a = function() {
 function t(t) {
 this.adSdk = null;
 this.ifShowAd = !0;
-this.videoAdType = n.VideoAdType.Null;
+this.videoAdType = n.VideoAdType.video_init_1;
 this.videoAdcallBack = null;
 this.last_time_stamp = 0;
 this.adSdk = t;
@@ -2820,7 +2842,7 @@ return i > 3 && r && Object.defineProperty(e, o, r), r;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
+var r = t("../data/GameData"), c = cc._decorator, s = c.ccclass, l = c.property, p = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -2960,54 +2982,59 @@ mk.fly.PlayCoinAnim(1, 5, this.flyBird_2.node, "", null, -1, 2);
 } else if ("dog" == e) {
 this.moveDogFinished();
 mk.fly.PlayCoinAnim(1, 5, this.dogMove.node, "", null, -1, 2);
-} else "sheep" == e && mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
+} else if ("sheep" == e) {
+mk.ad.videoAdType = r.VideoAdType.video_init_10;
+mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
+}
 gData.adData.checkShowFullInter(1);
 };
-i([ s({
+i([ l({
 displayName: "bird_1",
 type: cc.Animation
 }) ], e.prototype, "flyBird_1", void 0);
-i([ s({
+i([ l({
 displayName: "bird_2",
 type: cc.Animation
 }) ], e.prototype, "flyBird_2", void 0);
-i([ s({
+i([ l({
 displayName: "star_1",
 type: cc.Animation
 }) ], e.prototype, "star_1", void 0);
-i([ s({
+i([ l({
 displayName: "star_2",
 type: cc.Animation
 }) ], e.prototype, "star_2", void 0);
-i([ s({
+i([ l({
 displayName: "star_3",
 type: cc.Animation
 }) ], e.prototype, "star_3", void 0);
-i([ s({
+i([ l({
 displayName: "dog",
 type: cc.Animation
 }) ], e.prototype, "dogMove", void 0);
-i([ s({
+i([ l({
 displayName: "duck",
 type: cc.Animation
 }) ], e.prototype, "moveDuck", void 0);
-i([ s({
+i([ l({
 displayName: "moveSheep",
 type: cc.Animation
 }) ], e.prototype, "moveSheep", void 0);
-i([ s({
+i([ l({
 displayName: "sheep",
 type: cc.Animation
 }) ], e.prototype, "sheep", void 0);
-i([ s({
+i([ l({
 displayName: "红包按钮",
 type: cc.Node
 }) ], e.prototype, "hb_btn", void 0);
-return i([ c ], e);
+return i([ s ], e);
 }(cc.Component);
-o.default = l;
+o.default = p;
 cc._RF.pop();
-}, {} ],
+}, {
+"../data/GameData": "GameData"
+} ],
 AniFinishDestroy: [ function(t, e, o) {
 "use strict";
 cc._RF.push(e, "042aabubkFC6JdQ3E4GwCQf", "AniFinishDestroy");
@@ -4623,7 +4650,7 @@ e.prototype.Click_AdProgressBtn = function() {
 mk.audio.playEffect("button");
 if (!cc.sys.isNative || gData.loginData.isAuth) {
 if (1 == gData.blessingBag.videoRbData.isVideo) gData.blessingBag.addProgress(); else {
-mk.ad.videoAdType = u.VideoAdType.Fudai;
+mk.ad.videoAdType = u.VideoAdType.video_init_15;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.blessingBag.addProgress();
@@ -7862,6 +7889,7 @@ gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.b
 break;
 
 case s.FactroyState.Sick:
+mk.data.sendDataEvent(s.DataEventId.button_click, "停电icon");
 gData.adClearSickData.openPanel(this.tab, this.configID);
 }
 return [ 2 ];
@@ -8799,6 +8827,7 @@ mk.tip.pop("点击拓建即可解锁农田");
 break;
 
 case s.FarmState.CanUnlock:
+mk.data.sendDataEvent(s.DataEventId.button_click, "拓建icon");
 gData.adUnlockData.openPanel(this.configID);
 break;
 
@@ -8817,6 +8846,7 @@ gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(thi
 break;
 
 case s.FarmState.Sick:
+mk.data.sendDataEvent(s.DataEventId.button_click, "生虫icon");
 gData.adClearSickData.openPanel(s.ProductType.nzw, this.configID);
 }
 return [ 2 ];
@@ -9239,13 +9269,19 @@ t = "制作";
 return t;
 };
 e.prototype.clickUnGetRewardBtn = function() {
+var t = this;
 mk.audio.playEffect("button");
+mk.ad.videoAdType = s.VideoAdType.video_init_6;
+mk.ad.watchAd(function(e) {
+if (e) {
 gData.farmMapData.isStateChange = !0;
-this.node_getBtn.active = !0;
-this.node_ungetBtn.active = !1;
-this.node_unluckBtn.active = !1;
-this.node_redPoint.active = !1;
-gData.gameData.setFarmMapRewardState(this.getIndex(), 1);
+t.node_getBtn.active = !0;
+t.node_ungetBtn.active = !1;
+t.node_unluckBtn.active = !1;
+t.node_redPoint.active = !1;
+gData.gameData.setFarmMapRewardState(t.getIndex(), 1);
+}
+});
 };
 e.prototype.clickUnluckBtn = function() {
 mk.audio.playEffect("button");
@@ -11028,7 +11064,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"), N = t("../../before/main/FarmSystem"), x = t("../../before/view/data/HarvestData"), j = t("../../before/view/data/ADClearSickData"), F = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), U = t("./module/LineUpUIData"), G = 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"), R = t("./module/NewCashUIData"), T = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), N = t("../../before/main/FarmSystem"), x = t("../../before/view/data/HarvestData"), j = t("../../before/view/data/ADClearSickData"), F = 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();
 }
@@ -11069,7 +11105,7 @@ this.farmSystem = new N.FarmSystem();
 this.farmMapData = new B.FarmMapData();
 this.farmGradeData = new L.GradeRewardData();
 this.walletCashOutData = new E.WalletCashOutData();
-this.lineUpUIData = new U.LineUpUIData();
+this.lineUpUIData = new G.LineUpUIData();
 this.moduleData = new Map();
 this.moduleData.set(n.moreGame, this.moreGame);
 this.moduleData.set(n.turnable, this.turnable);
@@ -11094,7 +11130,7 @@ t[t.cashNormal = 7] = "cashNormal";
 t[t.redBagCash = 8] = "redBagCash";
 t[t.redeem = 9] = "redeem";
 })(n = o.Fun || (o.Fun = {}));
-window.gData = new G();
+window.gData = new U();
 cc._RF.pop();
 }, {
 "../../before/main/FactorySystem": "FactorySystem",
@@ -11701,6 +11737,7 @@ gData.farmSystem.btnMake();
 gData.gameData.nextMake = null;
 this.nextMake = null;
 this.setNextProduct(!1);
+gData.adData.checkPopRed();
 break;
 
 case 2:
@@ -11716,6 +11753,7 @@ gData.factorySystem.btnMake();
 gData.gameData.nextMake = null;
 this.nextMake = null;
 this.setNextProduct(!1);
+gData.adData.checkPopRed();
 }
 };
 t.prototype.setFarmDataMap = function(t, e, o) {
@@ -12130,7 +12168,6 @@ return this._redMoney;
 set: function(t) {
 this._redMoney = t;
 gData.gameData.init_coin = !0;
-gData.gameData.init_red_point = !0;
 gData.gameData.init_wallet_redMoney = !0;
 },
 enumerable: !1,
@@ -12213,6 +12250,7 @@ t.UPDATE_CashNum = "UPDATE_CashNum";
 t.guide = "guide";
 t.button_click = "button_click";
 t.video_init = "video_init";
+t.video_click = "video_click";
 t.video_end = "video_end";
 t.fudaiFunction = "fudaiFunction";
 t.hutuiFunction = "hutuiFunction";
@@ -12224,17 +12262,25 @@ t.ad_videoEcpm = "ad_video";
 t.ad_openEcpm = "ad_open";
 })(o.DataEventId || (o.DataEventId = {}));
 (function(t) {
-t.Null = "";
-t.LevelScoreRedBag = "关卡积分红包";
-t.StartQiPaoRedBag = "主界面气泡红包";
-t.LevelQiPaoRedBag = "关卡气泡红包";
-t.Turntable = "转盘视频";
-t.Fudai = "福袋视频";
-t.Sign = "签到视频";
-t.CashOutNoviceWelfare = "钱包提现新手视频";
-t.CashOutAddCash = "钱包提现加现金视频";
-t.farmGradeAddExp = "农场等级加经验视频";
-t.farmGradeCashOut = "农场等级提现视频";
+t.video_init_1 = "农场加等级经验";
+t.video_init_2 = "提现-加进度";
+t.video_init_3 = "提现-加现金";
+t.video_init_4 = "签到";
+t.video_init_5 = "抽奖";
+t.video_init_6 = "图鉴领奖";
+t.video_init_7 = "消灭害虫";
+t.video_init_8 = "恢复健康";
+t.video_init_9 = "恢复供电";
+t.video_init_10 = "山羊红包";
+t.video_init_11 = "拓建";
+t.video_init_12 = "收获";
+t.video_init_13 = "飘浮红包";
+t.video_init_14 = "全体加速";
+t.video_init_15 = "福利加进度";
+t.video_init_16 = "生产加次数";
+t.video_init_17 = "点击生产按钮";
+t.video_init_18 = "离开游戏领红包";
+t.video_init_19 = "定时弹出红包";
 })(o.VideoAdType || (o.VideoAdType = {}));
 (function(t) {
 t[t.EAT_video = 1] = "EAT_video";
@@ -12549,37 +12595,17 @@ value: !0
 o.RedPoinNode = void 0;
 var s = t("../../mk/system/JsbSystem"), l = t("../data/GameData"), p = cc._decorator, u = p.ccclass, d = p.property, h = function() {
 function t() {
+this.node_gradeReward = null;
 this.node_sign = null;
-this.node_pigbank = null;
-this.node_redbagCash = null;
-this.node_blessingBag = null;
-this.node_turnable = null;
-this.node_redeem = null;
 }
 i([ d({
 type: cc.Node,
-displayName: "签到"
-}) ], t.prototype, "node_sign", void 0);
-i([ d({
-type: cc.Node,
-displayName: "存钱罐"
-}) ], t.prototype, "node_pigbank", void 0);
-i([ d({
-type: cc.Node,
-displayName: "红包提现"
-}) ], t.prototype, "node_redbagCash", void 0);
+displayName: "等级奖励"
+}) ], t.prototype, "node_gradeReward", void 0);
 i([ d({
 type: cc.Node,
-displayName: "福袋"
-}) ], t.prototype, "node_blessingBag", void 0);
-i([ d({
-type: cc.Node,
-displayName: "转盘"
-}) ], t.prototype, "node_turnable", void 0);
-i([ d({
-type: cc.Node,
-displayName: "福利礼包"
-}) ], t.prototype, "node_redeem", void 0);
+displayName: "签到"
+}) ], t.prototype, "node_sign", void 0);
 return i([ u("RedPoinNode") ], t);
 }();
 o.RedPoinNode = h;
@@ -12587,7 +12613,6 @@ var f = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
-e.node_gameplay = null;
 e.node_btn = null;
 e.lbl_redMoney = null;
 e.btn_cashOutNormal = null;
@@ -12721,13 +12746,12 @@ gData.gameData.init_expLevel = !1;
 };
 e.prototype.initRedPoint = function() {
 this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
-this.nodeRedPoint.node_pigbank.active = gData.pigbank.redPoint();
-this.nodeRedPoint.node_redbagCash.active = gData.redBagCash.redPoint();
-this.nodeRedPoint.node_turnable.active = gData.turnable.redPoint();
-this.nodeRedPoint.node_blessingBag.active = gData.blessingBag.redPoint();
-this.nodeRedPoint.node_redeem.active = gData.redeem.redPoint();
-gData.gameData.init_red_point = !1;
-this.nodeRedPoint.node_redbagCash.active;
+var t = !1, e = gData.gameData.gameData.farmGradeData.farmGradeRewardList;
+if (e) for (var o = e.length, n = 0; n != o; ++n) if (1 == e[n].status) {
+t = !0;
+break;
+}
+this.nodeRedPoint.node_gradeReward.active = t;
 };
 e.prototype.autoOpenPanel = function() {
 if (!gData.gameData.isNewPlayer()) {
@@ -12794,19 +12818,16 @@ e.prototype.onCount = function() {};
 e.prototype.testFly = function() {
 mk.fly.PlayCoinAnim(1, 20, null, cc.v2(0, 0));
 };
-e.prototype.onClickStart = function() {
-mk.data.sendDataEvent(l.DataEventId.button_click, "开始游戏icon");
-this.node_gameplay.active = !0;
-};
 e.prototype.onClickHuTui = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "互推icon");
 };
 e.prototype.onClickFuli = function() {
-mk.data.sendDataEvent(l.DataEventId.button_click, "福利礼包icon");
+mk.data.sendDataEvent(l.DataEventId.button_click, "福利icon");
 };
 e.prototype.onClickQipaoRedBag = function() {
-mk.ad.videoAdType = l.VideoAdType.StartQiPaoRedBag;
-mk.data.sendDataEvent(l.DataEventId.button_click, "气泡红包icon");
+mk.data.sendDataEvent(l.DataEventId.button_click, "飘浮红包icon");
+mk.ad.videoAdType = l.VideoAdType.video_init_13;
+mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 };
 e.prototype.onClickRedBagCash = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "常规提现-提现icon");
@@ -12818,7 +12839,7 @@ e.prototype.onClickPigBank = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "存钱罐icon");
 };
 e.prototype.onClickTurntable = function() {
-mk.data.sendDataEvent(l.DataEventId.button_click, "转盘icon");
+mk.data.sendDataEvent(l.DataEventId.button_click, "抽奖icon");
 };
 e.prototype.onClickSign = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "签到icon");
@@ -12830,6 +12851,18 @@ e.prototype.onClickShare = function() {
 mk.data.sendDataEvent(l.DataEventId.button_click, "互推icon");
 gData.loginData.isAuth ? s.default.sharePic() : s.default.WxAuth();
 };
+e.prototype.onClickGradeReward = function() {
+mk.data.sendDataEvent(l.DataEventId.button_click, "农场等级领奖按钮");
+};
+e.prototype.onClickWalletCash = function() {
+mk.data.sendDataEvent(l.DataEventId.button_click, "红包币提现按钮");
+};
+e.prototype.onClickTask = function() {
+mk.data.sendDataEvent(l.DataEventId.button_click, "任务红包icon");
+};
+e.prototype.onClickInvite = function() {
+mk.data.sendDataEvent(l.DataEventId.button_click, "邀请icon");
+};
 e.prototype.onClickPlant = function() {
 if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (gData.gameData.isProducting) mk.tip.pop("点击太快了"); else {
 gData.gameData.makeProduct();
@@ -12845,6 +12878,7 @@ mk.fly.PlayCoinAnim(2, 3, e, a, function() {
 gData.gameData.gameData.gradeLevel = o.farmLevel;
 gData.gameData.gameData.farmExpValue = o.userExp;
 gData.gameData.gameData.farmGradeData = o.userFarmGrageRewardInfo;
+gData.gameData.init_red_point = !0;
 n.playAdd();
 });
 };
@@ -12861,10 +12895,6 @@ this.ani_add.play();
 };
 i([ d({
 type: cc.Node,
-displayName: "游戏核心玩法"
-}) ], e.prototype, "node_gameplay", void 0);
-i([ d({
-type: cc.Node,
 displayName: "功能按钮"
 }) ], e.prototype, "node_btn", void 0);
 i([ d({
@@ -13217,7 +13247,8 @@ mk.console.logSingle("农场等级提现数据=>", o);
 if (0 != o.errcode) return [ 2, null ];
 this.changeExp = !0;
 gData.gameData.gameData.farmGradeData = o.data.userFarmGrageRewardInfo;
-gData.receiptNotice.receip_rmb = o.data.money;
+gData.receiptNotice.receip_rmb = o.data.userFarmGrageRewardInfo[this.cashId - 1].money;
+gData.gameData.init_red_point = !0;
 mk.ui.openPanel("module/newNotice/newNotice");
 return [ 2, o ];
 }
@@ -13245,6 +13276,7 @@ mk.tip.pop("获得" + a + "点等级经验");
 gData.gameData.gameData.gradeLevel = n.data.farmLevel;
 gData.gameData.gameData.farmExpValue = n.data.userExp;
 gData.gameData.gameData.farmGradeData = n.data.userFarmGrageRewardInfo;
+gData.gameData.init_red_point = !0;
 }
 return [ 2 ];
 }
@@ -13608,7 +13640,7 @@ this.sp_slider.fillRange = r + s;
 e.prototype.clickVideoBtn = function() {
 mk.audio.playEffect("button");
 if (!cc.sys.isNative || gData.loginData.isAuth) {
-mk.ad.videoAdType = c.VideoAdType.farmGradeAddExp;
+mk.ad.videoAdType = c.VideoAdType.video_init_1;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.farmGradeData.addGradeExp(c.ExpAddType.EAT_video);
@@ -13894,7 +13926,6 @@ function t() {}
 t.prototype.open = function(t) {
 this.crtGuideID = gData.gameData.getProp(n.GameProp.guideID);
 null == this.crtGuideID && (this.crtGuideID = 0);
-this.crtGuideID = 0;
 if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t <= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
 gData.guideData.crtID = t;
 this.crtGuideID = t;
@@ -14676,7 +14707,7 @@ done: !0
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var s = t("../../../game/data/AdData"), l = cc._decorator, p = l.ccclass, u = (l.property, 
+var s = t("../../../game/data/AdData"), l = t("../../../game/data/GameData"), p = cc._decorator, u = p.ccclass, d = (p.property, 
 function(t) {
 a(e, t);
 function e() {
@@ -14711,6 +14742,7 @@ return [ 4, mk.time.WaitForSeconds(.3) ];
 
 case 1:
 e.sent();
+mk.ad.videoAdType = l.VideoAdType.video_init_12;
 mk.ad.watchAd(function(e) {
 return r(t, void 0, void 0, function() {
 var t;
@@ -14772,12 +14804,13 @@ mk.ad.destoryBanner();
 e.prototype.clickClose = function() {
 mk.ui.closePanel(this.node.name);
 };
-return i([ p ], e);
+return i([ u ], e);
 }(cc.Component));
-o.default = u;
+o.default = d;
 cc._RF.pop();
 }, {
-"../../../game/data/AdData": "AdData"
+"../../../game/data/AdData": "AdData",
+"../../../game/data/GameData": "GameData"
 } ],
 HelpData: [ function(t, e, o) {
 "use strict";
@@ -17364,7 +17397,7 @@ Object.defineProperty(o, "__esModule", {
 value: !0
 });
 o.MapMove = void 0;
-var r = t("../util/Util"), c = cc._decorator, s = c.ccclass, l = c.property, p = function(t) {
+var r = t("../../game/data/GameData"), c = t("../util/Util"), s = cc._decorator, l = s.ccclass, p = s.property, u = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -17398,9 +17431,9 @@ this.move(new cc.Vec2(n, a));
 this.startPoint = o;
 } else if (2 == e.length) {
 this.isDoubleTouch = !0;
-var i = cc.Vec2.distance(e[0].getStartLocation(), e[1].getStartLocation()), c = cc.Vec2.distance(e[0].getLocation(), e[1].getLocation());
+var i = cc.Vec2.distance(e[0].getStartLocation(), e[1].getStartLocation()), r = cc.Vec2.distance(e[0].getLocation(), e[1].getLocation());
 this.tarScale = this.map.scale;
-this.tarScale = i > c ? r.default.clamp(this.tarScale - .1, 1.3, 1.7) : r.default.clamp(this.tarScale + .1, 1.3, 1.7);
+this.tarScale = i > r ? c.default.clamp(this.tarScale - .1, 1.3, 1.7) : c.default.clamp(this.tarScale + .1, 1.3, 1.7);
 }
 };
 e.prototype.onTouchEnd = function() {
@@ -17420,7 +17453,7 @@ this.startPoint = cc.Vec2.ZERO;
 this.node.setPosition(this.confirmPosition(new cc.Vec2(this.node.position.x + t.x, this.node.position.y + t.y)));
 };
 e.prototype.confirmPosition = function(t) {
-var e = r.default.clamp(t.x, -(this.map.width * (this.map.scaleX - .2) / 2 - this.canvas.width / 2), this.map.width * (this.map.scaleX - .2) / 2 - this.canvas.width / 2), o = r.default.clamp(t.y, -(this.map.height * (this.map.scaleY - .2) / 2 - this.canvas.height / 2), this.map.height * (this.map.scaleY - .2) / 2 - this.canvas.height / 2);
+var e = c.default.clamp(t.x, -(this.map.width * (this.map.scaleX - .2) / 2 - this.canvas.width / 2), this.map.width * (this.map.scaleX - .2) / 2 - this.canvas.width / 2), o = c.default.clamp(t.y, -(this.map.height * (this.map.scaleY - .2) / 2 - this.canvas.height / 2), this.map.height * (this.map.scaleY - .2) / 2 - this.canvas.height / 2);
 return new cc.Vec3(e, o, 0);
 };
 e.prototype.moveTo = function(t) {
@@ -17433,16 +17466,21 @@ easing: "sineOut"
 };
 e.prototype.clickMapBookBtn = function() {
 mk.ui.openPanel("module/farmMap/farmMap");
+mk.data.sendDataEvent(r.DataEventId.button_click, "图鉴icon");
 };
-i([ l({
+e.prototype.clickSpeedup = function() {
+mk.data.sendDataEvent(r.DataEventId.button_click, "全体加速icon");
+};
+i([ p({
 type: cc.Node,
 tooltip: "地图容器"
 }) ], e.prototype, "map", void 0);
-return i([ s ], e);
+return i([ l ], e);
 }(cc.Component);
-o.MapMove = p;
+o.MapMove = u;
 cc._RF.pop();
 }, {
+"../../game/data/GameData": "GameData",
 "../util/Util": "Util"
 } ],
 MathUtil: [ function(t, e, o) {
@@ -19227,13 +19265,10 @@ t.lbl_value[o].string = "" + n;
 e.prototype.clickOpenBtn = function() {
 mk.audio.playEffect("button");
 mk.ui.closePanel(this.name);
-if (this.sp_icon.node.active) this.creatorDownLoadTask(); else {
-mk.ad.videoAdType = u.VideoAdType.StartQiPaoRedBag;
-mk.ad.watchAd(function(t) {
+this.sp_icon.node.active ? this.creatorDownLoadTask() : mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.adData.watchVideo(p.AdFun.bubble);
 });
-}
 };
 e.prototype.clickCloseBtn = function() {
 gData.adData.checkShowFullInter(1);
@@ -19798,6 +19833,7 @@ gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.b
 break;
 
 case s.PastureState.Sick:
+mk.data.sendDataEvent(s.DataEventId.button_click, "生病icon");
 gData.adClearSickData.openPanel(s.ProductType.dw, this.configID);
 }
 return [ 2 ];
@@ -21144,7 +21180,7 @@ return i > 3 && r && Object.defineProperty(e, o, r), r;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
+var r = t("../../data/GameData"), c = cc._decorator, s = c.ccclass, l = c.property, p = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -21160,6 +21196,7 @@ this.lbl_times.string = "生产次数x" + gData.gameData.configs.ServerConfig.Pr
 e.prototype.clickVideoBtn = function() {
 mk.audio.playEffect("button");
 mk.ui.closePanel(this.node.name);
+mk.ad.videoAdType = r.VideoAdType.video_init_16;
 mk.ad.watchAd(function(t) {
 t && gData.gameData.changeLeftTimes(parseInt(gData.gameData.configs.ServerConfig.ProductionAd));
 });
@@ -21168,15 +21205,17 @@ e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 mk.ui.closePanel(this.node.name);
 };
-i([ s({
+i([ l({
 type: cc.Label,
 displayName: "文本"
 }) ], e.prototype, "lbl_times", void 0);
-return i([ c ], e);
+return i([ s ], e);
 }(cc.Component);
-o.default = l;
+o.default = p;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../data/GameData": "GameData"
+} ],
 ProductShow: [ function(t, e, o) {
 "use strict";
 cc._RF.push(e, "e61a4UWGVNFwr4XAxXXFx38", "ProductShow");
@@ -25393,7 +25432,7 @@ mk.audio.playEffect("button");
 if (1 != gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay()) {
 var t = gData.gameData.gameData.signInDay;
 if (!cc.sys.isNative || gData.sign.c_sign[t].rewardType !== s.RewardType.rmb || gData.loginData.isAuth) {
-mk.ad.videoAdType = s.VideoAdType.Sign;
+mk.ad.videoAdType = s.VideoAdType.video_init_4;
 mk.ad.watchAd(function(e) {
 mk.console.log("watchAD:" + e);
 if (e) {
@@ -25466,7 +25505,7 @@ return i > 3 && r && Object.defineProperty(e, o, r), r;
 Object.defineProperty(o, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
+var r = t("../../data/GameData"), c = cc._decorator, s = c.ccclass, l = c.property, p = function(t) {
 a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -25493,14 +25532,14 @@ e.prototype.initCashOutStyle = function(t) {
 void 0 === t && (t = 0);
 var e = gData.redBagCash.cash_bar, o = gData.redBagCash.getItemDataByIndex(e);
 if (o) {
-var n = t > o.type_value ? o.type_value : t;
+var n = t > o.redMoney ? o.redMoney : t;
 this.lbl_reward_value.string = o.money / 100 + "元";
-this.lbl_progress.string = n + "/" + o.type_value;
-var a = n / o.type_value >= 1 ? 1 : n / o.type_value;
+this.lbl_progress.string = n + "/" + o.redMoney;
+var a = n / o.redMoney >= 1 ? 1 : n / o.redMoney;
 cc.tween(this.spr_cash_out).to(a, {
 fillRange: a
 }).start();
-t >= o.type_value ? this.node_cash.play() : this.node_cash.stop();
+t >= o.redMoney ? this.node_cash.play() : this.node_cash.stop();
 }
 };
 e.prototype.clickCashOut = function() {
@@ -25510,20 +25549,24 @@ mk.ui.closePanel(this.node.name);
 };
 e.prototype.clickWatchVideoBtn = function() {
 mk.audio.playEffect("button");
+mk.ad.videoAdType = r.VideoAdType.video_init_14;
+mk.ad.watchAd(function() {});
 };
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
 };
-i([ s(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
-i([ s(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
-i([ s(cc.Label) ], e.prototype, "lbl_progress", void 0);
-i([ s(cc.Animation) ], e.prototype, "node_cash", void 0);
-i([ s(cc.Label) ], e.prototype, "lbl_remainTimes", void 0);
-return i([ c ], e);
+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);
 }(cc.Component);
-o.default = l;
+o.default = p;
 cc._RF.pop();
-}, {} ],
+}, {
+"../../data/GameData": "GameData"
+} ],
 SpineEffectPlay: [ function(t, e, o) {
 "use strict";
 cc._RF.push(e, "d2a29T/kkBHZbkhAfjHhUby", "SpineEffectPlay");
@@ -27895,7 +27938,7 @@ this.updateLeftTimes();
 };
 e.prototype.clickDraw = function() {
 if (gData.turnable.leftTimes > 0) {
-mk.ad.videoAdType = u.VideoAdType.Turntable;
+mk.ad.videoAdType = u.VideoAdType.video_init_5;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.adData.watchVideo(p.AdFun.turntable);
@@ -29207,6 +29250,7 @@ return [ 4, mk.http.sendData("noviceWeFare/updateNoviceWeFareInfo", t) ];
 case 1:
 if (0 != (e = o.sent()).errcode) return [ 2 ];
 gData.gameData.gameData.userNoviceWeFareInfo = e.data.userNoviceWeFareInfo;
+mk.tip.pop("现金进度已增加");
 this.init_novice = !0;
 return [ 2 ];
 }
@@ -29229,7 +29273,7 @@ o = n.sent();
 mk.console.logSingle("wallet2=>", o);
 if (0 != o.errcode) {
 if (o.data.count > 0) {
-gData.lineUpUIData.personCount = o.count;
+gData.lineUpUIData.personCount = o.data.count;
 mk.ui.openPanel("module/newNotice/LineUpUI");
 }
 return [ 2 ];
@@ -29287,6 +29331,7 @@ e.lbl_noviceTitle = null;
 e.lbl_noviceValue = null;
 e.lbl_tipUp = null;
 e.btn_cashOut = null;
+e.btn_addProgress = null;
 e.check_button = [];
 e.curChooseIndex = -1;
 e.intV = 0;
@@ -29302,13 +29347,22 @@ var t = gData.gameData.gameData.userNoviceWeFareInfo;
 if (t) {
 this.lbl_noviceTitle.string = t.name + ":";
 this.sp_progress.fillRange = t.progressRate;
-var e = t.cashmoney / 100;
-this.lbl_noviceValue.string = (e * t.progressRate).toFixed(2) + "元";
+var e = t.cashmoney / 100, o = this.multiply(e, t.progressRate);
+this.lbl_noviceValue.string = o.toString() + "元";
 this.intV = Math.round(e);
 this.lbl_tipUp.string = "进度加满后必得" + this.intV + "元现金";
 this.lbl_cashOut.string = "满" + this.intV + "元提现";
+t.progressRate >= 1 ? this.btn_addProgress.setGray(!0) : this.btn_addProgress.setGray(!1);
 }
 };
+e.prototype.multiply = function(t, e) {
+var o = Number(t.toString().replace(".", "")), n = Number(e.toString().replace(".", "")), a = this.digitLength(t) + this.digitLength(e);
+return o * n / Math.pow(10, a);
+};
+e.prototype.digitLength = function(t) {
+var e = t.toString().split(/[eE]/), o = (e[0].split(".")[1] || "").length - +(e[1] || 0);
+return o > 0 ? o : 0;
+};
 e.prototype.initCashOutUI = function() {
 if (gData.gameData.configs.CashCfg) {
 for (var t = [], e = gData.gameData.configs.CashCfg, o = 0; o != this.check_button.length; ++o) if (o < e.length) {
@@ -29390,7 +29444,7 @@ gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
 };
 e.prototype.clickAddProgressBtn = function() {
 mk.audio.playEffect("button");
-mk.ad.videoAdType = l.VideoAdType.CashOutNoviceWelfare;
+mk.ad.videoAdType = l.VideoAdType.video_init_2;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.walletCashOutData.addProgress();
@@ -29398,7 +29452,7 @@ t && gData.walletCashOutData.addProgress();
 };
 e.prototype.clickAddCashBtn = function() {
 mk.audio.playEffect("button");
-mk.ad.videoAdType = l.VideoAdType.CashOutNoviceWelfare;
+mk.ad.videoAdType = l.VideoAdType.video_init_3;
 mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.adData.watchVideo(s.AdFun.cashOutAddCash);
@@ -29455,6 +29509,7 @@ displayName: "上提示",
 type: cc.Label
 }) ], e.prototype, "lbl_tipUp", void 0);
 i([ h(r.default) ], e.prototype, "btn_cashOut", void 0);
+i([ h(r.default) ], e.prototype, "btn_addProgress", void 0);
 i([ h({
 displayName: "6个选择按钮",
 type: p.default

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