|
|
@@ -8609,6 +8609,7 @@ e.sortID = 0;
|
|
|
e.tab = c.ProductType.bmhc;
|
|
|
e._state = -1;
|
|
|
e.data = null;
|
|
|
+e.isCanTouch = !0;
|
|
|
return e;
|
|
|
}
|
|
|
Object.defineProperty(e.prototype, "state", {
|
|
|
@@ -8695,8 +8696,9 @@ this.showGroup.removeAllChildren();
|
|
|
};
|
|
|
e.prototype.onTouch = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e;
|
|
|
+var t, e, a = this;
|
|
|
return s(this, function() {
|
|
|
+if (!this.isCanTouch) return [ 2 ];
|
|
|
switch (this.data.state) {
|
|
|
case c.FactroyState.Lock:
|
|
|
t = gData.gameData.getProductArrByType(this.tab);
|
|
|
@@ -8717,7 +8719,11 @@ break;
|
|
|
|
|
|
case c.FactroyState.Ripe:
|
|
|
gData.factorySystem.currSelectFactory = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+a.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
break;
|
|
|
|
|
|
case c.FactroyState.Sick:
|
|
|
@@ -8810,7 +8816,7 @@ return [ 2 ];
|
|
|
e.prototype.canHarvest = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
gData.factorySystem.currSelectFactory = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
@@ -9844,6 +9850,7 @@ e.sortID = 0;
|
|
|
e.plantID = 0;
|
|
|
e._state = -1;
|
|
|
e.data = null;
|
|
|
+e.isCanTouch = !0;
|
|
|
return e;
|
|
|
}
|
|
|
Object.defineProperty(e.prototype, "state", {
|
|
|
@@ -9967,7 +9974,9 @@ t && this.getComponent(l.MoveToCenter).move();
|
|
|
};
|
|
|
e.prototype.onTouch = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
+var t = this;
|
|
|
return s(this, function() {
|
|
|
+if (!this.isCanTouch) return [ 2 ];
|
|
|
switch (this.data.state) {
|
|
|
case c.FarmState.Lock:
|
|
|
mk.tip.pop("点击拓建即可解锁农田");
|
|
|
@@ -9989,7 +9998,11 @@ break;
|
|
|
|
|
|
case c.FarmState.Ripe:
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !0);
|
|
|
+gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+t.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
break;
|
|
|
|
|
|
case c.FarmState.Sick:
|
|
|
@@ -10066,8 +10079,19 @@ case 6:
|
|
|
return [ 2, o.sent() ];
|
|
|
|
|
|
case 7:
|
|
|
+gData.gameData.setNextProduct(!1);
|
|
|
+if (0 != gData.gameData.nextType) return [ 3, 8 ];
|
|
|
mk.tip.pop("农田已满，无法继续生产");
|
|
|
return [ 2, !1 ];
|
|
|
+
|
|
|
+case 8:
|
|
|
+return [ 4, gData.gameData.makeProduct() ];
|
|
|
+
|
|
|
+case 9:
|
|
|
+return [ 2, o.sent() ];
|
|
|
+
|
|
|
+case 10:
|
|
|
+return [ 2, !1 ];
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
@@ -10116,8 +10140,15 @@ e.prototype.novice_clean = function() {
|
|
|
this.process.cleanProcess();
|
|
|
};
|
|
|
e.prototype.canHarvest = function() {
|
|
|
+var t = this;
|
|
|
+if (this.isCanTouch) {
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !0);
|
|
|
+gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+t.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
@@ -10125,7 +10156,7 @@ mk.data.sendDataEvent(c.DataEventId.button_click, "生虫icon");
|
|
|
gData.adClearSickData.openPanel(c.ProductType.nzw, this.configID);
|
|
|
};
|
|
|
e.prototype.clickGuideBtn = function() {
|
|
|
-mk.guide.isGuiding() && gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !0, !1, !0);
|
|
|
+mk.guide.isGuiding() && gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, 0, !1, !0);
|
|
|
};
|
|
|
i([ y({
|
|
|
type: cc.Node,
|
|
|
@@ -13346,7 +13377,10 @@ 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);
|
|
|
-this.uploadAverageEcpm();
|
|
|
+return [ 4, this.uploadAverageEcpm() ];
|
|
|
+
|
|
|
+case 3:
|
|
|
+a.sent();
|
|
|
gData.adData.initEcpmData();
|
|
|
gData.guideData.init();
|
|
|
gData.guideWeakData.init();
|
|
|
@@ -14746,6 +14780,7 @@ this._redMoney = t;
|
|
|
gData.gameData.init_coin = !0;
|
|
|
gData.gameData.init_wallet_redMoney = !0;
|
|
|
mk.event.emit("refreshCoin");
|
|
|
+this._redMoney >= 3e5 && (mk.ui.isPopPanel() || mk.guide.open(13));
|
|
|
mk.data.setTAEventUser(0, "current_redmoney_stock", this._redMoney);
|
|
|
},
|
|
|
enumerable: !1,
|
|
|
@@ -15341,6 +15376,10 @@ this.registerCallBack();
|
|
|
console.log("===[Jsbsystem 显示开屏广告================================");
|
|
|
mk.ad.ifShowAd && Math.random() <= gData.adData.getPerByEcpm(u.RateConfig.RC_splash) && l.default.showSplash();
|
|
|
this.initRefreshEvent();
|
|
|
+if (1 == gData.gameData.orderRewardType) {
|
|
|
+this.node_showCash.active = !1;
|
|
|
+this.node_showRedMoney.active = !0;
|
|
|
+}
|
|
|
gData.gameData.playerProp.orderData ? this.initOrderUI() : mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
@@ -15645,6 +15684,7 @@ a.destroy();
|
|
|
}
|
|
|
this.dpFlyRedAni();
|
|
|
}
|
|
|
+mk.data.sendDataEvent(d.DataEventId.button_click, "一键生产按钮");
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -15978,11 +16018,7 @@ this.orderPicIdArray = [];
|
|
|
this.isGray = !0;
|
|
|
t = gData.gameData.configs.Product;
|
|
|
if (!(e = gData.gameData.playerProp.orderData)) return [ 3, 6 ];
|
|
|
-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);
|
|
|
+1 == gData.gameData.orderRewardType ? this.lbl_orderRedMoney.string = e.redMoneyAddition / 100 + "" : this.lbl_addCash.string = (e.cashMoney / 100).toFixed(2);
|
|
|
if (3 != (a = e.orderTaskList.length)) return [ 3, 6 ];
|
|
|
o = 0;
|
|
|
n = 0;
|
|
|
@@ -16053,11 +16089,12 @@ this.getOrderReward();
|
|
|
e.prototype.getIsCanGetOrderReward = function() {
|
|
|
return !this.isGray;
|
|
|
};
|
|
|
-e.prototype.getOrderReward = function() {
|
|
|
+e.prototype.getOrderReward = function(t) {
|
|
|
+void 0 === t && (t = !0);
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e, a;
|
|
|
-return s(this, function(o) {
|
|
|
-switch (o.label) {
|
|
|
+var e, a, o;
|
|
|
+return s(this, function(n) {
|
|
|
+switch (n.label) {
|
|
|
case 0:
|
|
|
if (2 != gData.gameData.orderRewardType) return [ 3, 2 ];
|
|
|
if (cc.sys.isNative && !gData.loginData.isAuth) {
|
|
|
@@ -16068,33 +16105,35 @@ return [ 2 ];
|
|
|
return [ 4, mk.http.sendData("orderTask/receiveRewardCash", {}) ];
|
|
|
|
|
|
case 1:
|
|
|
-if (0 != (e = o.sent()).errcode) {
|
|
|
-if (405 == e.errcode) {
|
|
|
+if (0 != (a = n.sent()).errcode) {
|
|
|
+if (405 == a.errcode) {
|
|
|
mk.tip.pop("今日提现额度已到上限，请明天再提现");
|
|
|
mk.data.sendDataEvent(d.DataEventId.cashLimit, "提现触发上限");
|
|
|
}
|
|
|
return [ 2, null ];
|
|
|
}
|
|
|
-a = gData.gameData.playerProp.orderData.cashMoney;
|
|
|
-gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
|
|
|
+o = gData.gameData.playerProp.orderData.cashMoney;
|
|
|
+gData.gameData.playerProp.orderData = a.data.userOrderTaskInfo;
|
|
|
gData.cashPro.callBack = this.getRewardCallBack.bind(this);
|
|
|
-gData.receiptNotice.receip_rmb = a;
|
|
|
+gData.receiptNotice.receip_rmb = o;
|
|
|
mk.ui.openPanel("module/newNotice/newNotice");
|
|
|
+if (t) {
|
|
|
this.node_crop.forEach(function(t) {
|
|
|
t.active = !1;
|
|
|
});
|
|
|
this.node_orderHbIcon.active = !1;
|
|
|
this.node_getOrderReward.node.active = !1;
|
|
|
+} else this.showRefreshLogic();
|
|
|
return [ 3, 4 ];
|
|
|
|
|
|
case 2:
|
|
|
-t = {};
|
|
|
-return [ 4, mk.http.sendData("orderTask/receiveReward", t) ];
|
|
|
+e = {};
|
|
|
+return [ 4, mk.http.sendData("orderTask/receiveReward", e) ];
|
|
|
|
|
|
case 3:
|
|
|
-if (0 != (e = o.sent()).errcode) return [ 2, null ];
|
|
|
-a = gData.gameData.playerProp.orderData.redMoneyAddition;
|
|
|
-gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
|
|
|
+if (0 != (a = n.sent()).errcode) return [ 2, null ];
|
|
|
+o = gData.gameData.playerProp.orderData.redMoneyAddition;
|
|
|
+gData.gameData.playerProp.orderData = a.data.userOrderTaskInfo;
|
|
|
gData.reward.closeUICallBack = this.getRewardCallBack.bind(this);
|
|
|
gData.reward.adData = {
|
|
|
videoRedMoney: {
|
|
|
@@ -16103,15 +16142,17 @@ videoRewardList: null
|
|
|
};
|
|
|
gData.reward.adData.videoRedMoney.videoRewardList = [ {
|
|
|
rewardType: 1,
|
|
|
-rewardNum: a
|
|
|
+rewardNum: o
|
|
|
} ];
|
|
|
mk.ui.openPanel("module/reward/reward");
|
|
|
+if (t) {
|
|
|
this.node_crop.forEach(function(t) {
|
|
|
t.active = !1;
|
|
|
});
|
|
|
this.node_orderHbIcon.active = !1;
|
|
|
this.node_getOrderReward.node.active = !1;
|
|
|
-o.label = 4;
|
|
|
+} else this.showRefreshLogic();
|
|
|
+n.label = 4;
|
|
|
|
|
|
case 4:
|
|
|
return [ 2 ];
|
|
|
@@ -17439,6 +17480,7 @@ r.finger = s.finger;
|
|
|
r.lag_next = parseFloat(s.lagNext);
|
|
|
r.display_type = parseInt(s.trNum);
|
|
|
r.continue = s.continue;
|
|
|
+r.isShowSkip = s.isShowSkip;
|
|
|
if (o != r.id) {
|
|
|
this.data.set(o, a);
|
|
|
a = [];
|
|
|
@@ -17493,7 +17535,7 @@ this.setGuideID(this.crtGuideID++);
|
|
|
return !0;
|
|
|
};
|
|
|
t.prototype.setGuideID = function(t) {
|
|
|
-if (12 == t) {
|
|
|
+if (13 == t) {
|
|
|
t = 9999;
|
|
|
mk.data.sendXYEvent("guide_end", "新手引导结束");
|
|
|
}
|
|
|
@@ -17528,6 +17570,7 @@ value: !0
|
|
|
a.default = function() {
|
|
|
this.display_type = 0;
|
|
|
this.continue = null;
|
|
|
+this.isShowSkip = null;
|
|
|
};
|
|
|
cc._RF.pop();
|
|
|
}, {} ],
|
|
|
@@ -17825,6 +17868,7 @@ e.node_head = null;
|
|
|
e.node_person = null;
|
|
|
e.rich_dialog = null;
|
|
|
e.rich_dialog1 = null;
|
|
|
+e.node_skip = null;
|
|
|
e.widgets = [ "top", "bottom", "left", "right", "verticalCenter", "horizontalCenter" ];
|
|
|
return e;
|
|
|
}
|
|
|
@@ -17844,6 +17888,7 @@ this.crtStep++;
|
|
|
this.crtGuide = this.guides[this.crtStep];
|
|
|
mk.guide.curGuideIdStr = gData.guideData.crtID + "_" + this.crtStep;
|
|
|
this.updateGuide();
|
|
|
+"true" == this.crtGuide.isShowSkip ? this.node_skip.active = !0 : this.node_skip.active = !1;
|
|
|
mk.data.sendDataEvent(c.DataEventId.guide, "新手引导第" + gData.guideData.crtID + "_" + this.crtStep + "步完成");
|
|
|
};
|
|
|
e.prototype.updateGuide = function() {
|
|
|
@@ -18082,6 +18127,10 @@ i([ u({
|
|
|
type: cc.RichText,
|
|
|
displayName: "对话内容1"
|
|
|
}) ], e.prototype, "rich_dialog1", void 0);
|
|
|
+i([ u({
|
|
|
+type: cc.Node,
|
|
|
+displayName: "对话内容1"
|
|
|
+}) ], e.prototype, "node_skip", void 0);
|
|
|
return i([ p ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = d;
|
|
|
@@ -18239,10 +18288,11 @@ e.init_reward = !1;
|
|
|
e.node_fly = null;
|
|
|
e.isMatchOrder = !1;
|
|
|
e.isTouchBtn = !1;
|
|
|
+e.isCrops_ = 0;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.openPanel = function(t, e, a, o, n, i, r) {
|
|
|
-void 0 === n && (n = !1);
|
|
|
+void 0 === n && (n = 0);
|
|
|
void 0 === i && (i = !1);
|
|
|
void 0 === r && (r = !1);
|
|
|
this.configID = t;
|
|
|
@@ -18250,8 +18300,9 @@ this.plantID = e;
|
|
|
this.call = a;
|
|
|
this.node_fly = o;
|
|
|
this.isTouchBtn = i;
|
|
|
+this.isCrops_ = n;
|
|
|
this.config = gData.gameData.getProductMap(this.plantID);
|
|
|
-if (r || n) this.getNormalReward(); else {
|
|
|
+if (r || 0 == n) this.getNormalReward(); else {
|
|
|
var s = mk.guide.isGuiding(), l = Math.random(), p = gData.adData.getPerByEcpm(c.RateConfig.RC_superDouble);
|
|
|
!s && l <= p && gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0 && "1" == gData.gameData.prohibiJBAd[gData.loginData.userChannel].split(",")[1 - gData.loginData.isMatched] ? mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel") : this.getNormalReward();
|
|
|
}
|
|
|
@@ -18264,6 +18315,7 @@ gData.reward.callback = gData.harvestData.call;
|
|
|
var a = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
|
|
|
gData.reward.getReward(a);
|
|
|
gData.harvestData.call = null;
|
|
|
+1 == this.isCrops_ ? mk.data.sendDataEvent(l.DataEventId.button_click, "动物超级加倍收获") : 2 == this.isCrops_ && mk.data.sendDataEvent(l.DataEventId.button_click, "商品超级加倍收获");
|
|
|
};
|
|
|
e.prototype.getNormalReward = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
@@ -18342,6 +18394,7 @@ if (!mk.guide.isGuiding() && gData.adData.checkShowFullInter(4)) {
|
|
|
gData.moreGame.openType = 0;
|
|
|
mk.data.sendDataEvent(l.DataEventId.htRedBag_scene, "点击可收获");
|
|
|
}
|
|
|
+0 == this.isCrops_ ? mk.data.sendDataEvent(l.DataEventId.button_click, "农作物普通收获") : 1 == this.isCrops_ ? mk.data.sendDataEvent(l.DataEventId.button_click, "动物普通收获") : 2 == this.isCrops_ && mk.data.sendDataEvent(l.DataEventId.button_click, "商品普通收获");
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -18520,9 +18573,9 @@ this.lbl_max.string = "最高获得</c><color=#ff0000>" + gData.harvestData.conf
|
|
|
};
|
|
|
e.prototype.clickNormalBtn = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e, a, o;
|
|
|
-return s(this, function(n) {
|
|
|
-switch (n.label) {
|
|
|
+var t, e, a, o, n, i, r, c;
|
|
|
+return s(this, function(s) {
|
|
|
+switch (s.label) {
|
|
|
case 0:
|
|
|
mk.audio.playEffect("button");
|
|
|
gData.adData.checkShowFullInter(1, l.InterFullAdType.interstitial2_init_2);
|
|
|
@@ -18532,8 +18585,12 @@ id: gData.harvestData.config.id
|
|
|
return [ 4, mk.http.sendData("redMoney/addRedMoneyByFarm", t) ];
|
|
|
|
|
|
case 1:
|
|
|
-if ((e = n.sent()) && 0 != e.errcode) return [ 2 ];
|
|
|
-if (e.data.redMoneyAddition <= 0) console.log("返回奖励为0"); else {
|
|
|
+if ((e = s.sent()) && 0 != e.errcode) return [ 2 ];
|
|
|
+if (!(e.data.redMoneyAddition <= 0)) return [ 3, 2 ];
|
|
|
+console.log("返回奖励为0");
|
|
|
+return [ 3, 4 ];
|
|
|
+
|
|
|
+case 2:
|
|
|
gData.harvestData.getType = 0;
|
|
|
a = [ {
|
|
|
rewardType: 1,
|
|
|
@@ -18543,7 +18600,24 @@ gData.reward.data = a;
|
|
|
gData.reward.callback = gData.harvestData.call;
|
|
|
o = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
|
|
|
gData.reward.getReward(o);
|
|
|
-}
|
|
|
+n = "+" + e.data.redMoneyAddition / 100;
|
|
|
+i = mk.fly.node.convertToNodeSpaceAR(o);
|
|
|
+return [ 4, mk.loader.load("game/prefab/flyHb", cc.Prefab) ];
|
|
|
+
|
|
|
+case 3:
|
|
|
+r = s.sent();
|
|
|
+(c = cc.instantiate(r)).zIndex = 1e3;
|
|
|
+c.parent = mk.fly.node;
|
|
|
+c.setPosition(i);
|
|
|
+c.getComponentInChildren(cc.Label).string = n;
|
|
|
+cc.tween(c).by(.8, {
|
|
|
+y: 100
|
|
|
+}).to(.4, {
|
|
|
+opacity: 0
|
|
|
+}).removeSelf().start();
|
|
|
+s.label = 4;
|
|
|
+
|
|
|
+case 4:
|
|
|
mk.ui.closePanel("HarvestPanel");
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -19289,7 +19363,7 @@ value: !0
|
|
|
a.ServerUrl = a.HttpData = void 0;
|
|
|
var o, n = function() {
|
|
|
function t() {
|
|
|
-this.serverType = 0;
|
|
|
+this.serverType = 1;
|
|
|
}
|
|
|
t.prototype.getServerUrl = function() {
|
|
|
switch (this.serverType) {
|
|
|
@@ -20634,7 +20708,7 @@ value: !0
|
|
|
a.LogTagColor = void 0;
|
|
|
var n, i = function() {
|
|
|
function t() {
|
|
|
-this.ifShowLog = !0;
|
|
|
+this.ifShowLog = !1;
|
|
|
this._tagChar = "...";
|
|
|
this._frontChar = " ";
|
|
|
this._keyValueChar = " = ";
|
|
|
@@ -20976,6 +21050,9 @@ console.log("==== tongdun set block");
|
|
|
} else if (-10003 == i.errcode || -20003 == i.errcode) {
|
|
|
console.log("restart errcode ", i.errcode);
|
|
|
this.reload();
|
|
|
+} else if (403 == i.errcode) {
|
|
|
+console.log("block 403");
|
|
|
+gData.warnTipData.setSolution(4);
|
|
|
}
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -24554,6 +24631,7 @@ e._state = -1;
|
|
|
e.data = null;
|
|
|
e.emptyClick = !1;
|
|
|
e.pastureData = null;
|
|
|
+e.isCanTouch = !0;
|
|
|
return e;
|
|
|
}
|
|
|
Object.defineProperty(e.prototype, "state", {
|
|
|
@@ -24688,8 +24766,9 @@ this.showGroup.removeAllChildren();
|
|
|
};
|
|
|
e.prototype.onTouch = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e;
|
|
|
+var t, e, a = this;
|
|
|
return s(this, function() {
|
|
|
+if (!this.isCanTouch) return [ 2 ];
|
|
|
switch (this.data.state) {
|
|
|
case c.PastureState.Lock:
|
|
|
if (2 == (t = gData.gameData.getProductMap(this.data.productID)).unlock) if (gData.gameData.playerProp.orderData) {
|
|
|
@@ -24713,7 +24792,11 @@ mk.ui.openPanel("module/speedUpUI/speedUp");
|
|
|
break;
|
|
|
|
|
|
case c.PastureState.Ripe:
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+a.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
break;
|
|
|
|
|
|
case c.PastureState.Sick:
|
|
|
@@ -24836,7 +24919,7 @@ return [ 2 ];
|
|
|
};
|
|
|
e.prototype.canHarvest = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
@@ -26195,6 +26278,7 @@ e.node_Uncomplete = null;
|
|
|
e.node_1 = null;
|
|
|
e.node_2 = null;
|
|
|
e.lbl_orderValue = null;
|
|
|
+e.lbl_rewardDes = null;
|
|
|
e.btnCanClick = !0;
|
|
|
return e;
|
|
|
}
|
|
|
@@ -26291,9 +26375,8 @@ var t = "<color=8A4312>再生产<color=ff0000>" + o + "</color>次，就可以
|
|
|
mk.guide.open(11, t);
|
|
|
}, .2);
|
|
|
}
|
|
|
+1 == gData.gameData.orderRewardType && (this.lbl_rewardDes.string = "领取" + a.redMoneyAddition / 100 + "红包币");
|
|
|
} else {
|
|
|
-var p = gData.gameData.playerProp.orderData.cashMoney;
|
|
|
-this.lbl_orderValue.string = "订单已完成，可提现" + (p / 100).toFixed(2) + "元";
|
|
|
this.sp_taskProgress.fillRange = 1;
|
|
|
this.lbl_progress.string = n + "/" + n;
|
|
|
this.node_Uncomplete.active = !1;
|
|
|
@@ -26353,7 +26436,7 @@ mk.audio.playEffect("button");
|
|
|
mk.ui.closePanel(this.node.name);
|
|
|
};
|
|
|
e.prototype.clickGetOrderRewardBtn = function() {
|
|
|
-gData.gameData.gameStyle.getOrderReward();
|
|
|
+gData.gameData.gameStyle.getOrderReward(!1);
|
|
|
};
|
|
|
i([ p({
|
|
|
type: cc.Label,
|
|
|
@@ -26395,6 +26478,10 @@ i([ p({
|
|
|
type: cc.Label,
|
|
|
displayName: "订单提现金额"
|
|
|
}) ], e.prototype, "lbl_orderValue", void 0);
|
|
|
+i([ p({
|
|
|
+type: cc.Label,
|
|
|
+displayName: "奖励类型描述"
|
|
|
+}) ], e.prototype, "lbl_rewardDes", void 0);
|
|
|
return i([ l ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = u;
|
|
|
@@ -34104,6 +34191,12 @@ s(t);
|
|
|
e.prototype.getCurOnPanel = function(t) {
|
|
|
return this.curOnPanelDic[t];
|
|
|
};
|
|
|
+e.prototype.isPopPanel = function(t) {
|
|
|
+void 0 === t && (t = [ "game" ]);
|
|
|
+var e = 0;
|
|
|
+for (var a in this.curOnPanelDic) -1 == t.indexOf(a) && ++e;
|
|
|
+return e > 0;
|
|
|
+};
|
|
|
e.prototype.closePanel = function(t, e) {
|
|
|
void 0 === e && (e = null);
|
|
|
if (-1 == this.isPanelClosingArr.indexOf(t) && this.getCurOnPanel(t)) {
|
