|
|
@@ -2801,7 +2801,7 @@ var t = gData.gameData.configs.ServerConfig.ClickProduction.split(",");
|
|
|
this.popClickTimes = c.default.rnd(parseInt(t[0]), parseInt(t[1]));
|
|
|
};
|
|
|
t.prototype.checkPopRed = function() {
|
|
|
-if (-1 != this.ProductionButtonArr.indexOf(this.ecpmLevel.toString())) {
|
|
|
+if (-1 != this.ProductionButtonArr.indexOf(this.ecpmLevel.toString()) && !mk.guide.isGuiding()) {
|
|
|
this.clickTimesAdd++;
|
|
|
if (this.clickTimesAdd >= this.popClickTimes) {
|
|
|
this.clickTimesAdd = 0;
|
|
|
@@ -2817,52 +2817,25 @@ t.prototype.getPerByEcpm = function(t) {
|
|
|
void 0 === t && (t = r.RC_fullScreen);
|
|
|
for (var e = gData.gameData.configs.ForceAd, a = e.length, o = 0, n = 0; n < a; n++) switch (t) {
|
|
|
case r.RC_fullScreen:
|
|
|
-if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) {
|
|
|
-o = parseFloat(e[n].qpPercent);
|
|
|
-break;
|
|
|
-}
|
|
|
-break;
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return parseFloat(e[n].qpPercent);
|
|
|
|
|
|
case r.RC_tableScreen:
|
|
|
-if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) {
|
|
|
-o = parseFloat(e[n].cpPercent);
|
|
|
-break;
|
|
|
-}
|
|
|
-break;
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return parseFloat(e[n].cpPercent);
|
|
|
|
|
|
case r.RC_banner:
|
|
|
-if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) {
|
|
|
-o = parseFloat(e[n].baPercent);
|
|
|
-break;
|
|
|
-}
|
|
|
-break;
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return parseFloat(e[n].baPercent);
|
|
|
|
|
|
case r.RC_infrormationFlow:
|
|
|
-if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) {
|
|
|
-o = parseFloat(e[n].xxPercent);
|
|
|
-break;
|
|
|
-}
|
|
|
-break;
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return parseFloat(e[n].xxPercent);
|
|
|
|
|
|
case r.RC_splash:
|
|
|
-if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) {
|
|
|
-o = parseFloat(e[n].kpPercent);
|
|
|
-break;
|
|
|
-}
|
|
|
-break;
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return parseFloat(e[n].kpPercent);
|
|
|
|
|
|
case r.RC_superDouble:
|
|
|
-if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) {
|
|
|
-o = parseFloat(e[n].jbPercent);
|
|
|
-break;
|
|
|
-}
|
|
|
-break;
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return parseFloat(e[n].jbPercent);
|
|
|
|
|
|
case r.RC_moreGameRedBag:
|
|
|
-if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) {
|
|
|
-o = parseFloat(e[n].htPercent);
|
|
|
-break;
|
|
|
-}
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return parseFloat(e[n].htPercent);
|
|
|
}
|
|
|
return o;
|
|
|
};
|
|
|
@@ -8422,7 +8395,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, !0);
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
@@ -9654,10 +9627,15 @@ return c(this, function() {
|
|
|
this.plantIcon.getComponent(cc.Animation).off(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
|
|
|
this.plantIcon.node.active = !1;
|
|
|
t = gData.gameData.getProductMap(this.plantID);
|
|
|
+if ("10_2" == mk.guide.getCurGuideIdString()) {
|
|
|
+this.data.growSpan = 0;
|
|
|
+this.data.state = s.FarmState.Ripe;
|
|
|
+} else {
|
|
|
e = Date.now() + 1e3 * t.time;
|
|
|
+this.data.growSpan = e;
|
|
|
this.data.state = s.FarmState.Growing;
|
|
|
+}
|
|
|
this.data.productID = this.plantID;
|
|
|
-this.data.growSpan = e;
|
|
|
gData.gameData.setFarmDataMap(this.configID, this.data);
|
|
|
gData.gameData.isProducting = !1;
|
|
|
return [ 2 ];
|
|
|
@@ -9672,13 +9650,16 @@ this.process.cleanProcess();
|
|
|
};
|
|
|
e.prototype.canHarvest = function() {
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !0);
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
mk.data.sendDataEvent(s.DataEventId.button_click, "生虫icon");
|
|
|
gData.adClearSickData.openPanel(s.ProductType.nzw, this.configID);
|
|
|
};
|
|
|
+e.prototype.clickGuideBtn = function() {
|
|
|
+mk.guide.isGuiding() && gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !1, !0);
|
|
|
+};
|
|
|
i([ y({
|
|
|
type: cc.Node,
|
|
|
tooltip: "未解锁时显示节点"
|
|
|
@@ -12325,6 +12306,7 @@ e.btn6 = null;
|
|
|
e.btn7 = null;
|
|
|
e.btn8 = null;
|
|
|
e.btn9 = null;
|
|
|
+e.btn12 = null;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.onLoad = function() {
|
|
|
@@ -12336,7 +12318,13 @@ this.init();
|
|
|
e.prototype.init = function() {
|
|
|
for (var t = gData.gameData.funOpenData, e = 0; e < t.length; e++) {
|
|
|
var a = this["btn" + (e + 1)];
|
|
|
-a && (a.active = "1" == t[e]);
|
|
|
+if (a) {
|
|
|
+a.active = "1" == t[e];
|
|
|
+if (11 == e && "0" == t[e]) {
|
|
|
+this.btn5.y = this.btn5.y + 170;
|
|
|
+this.btn9.y = this.btn9.y + 170;
|
|
|
+}
|
|
|
+}
|
|
|
}
|
|
|
if (this.btn8.active) {
|
|
|
var o = gData.gameData.playerProp.completeFarmTaskTimes >= parseInt(gData.gameData.configs.ServerConfig.FlyRedMoney);
|
|
|
@@ -12383,6 +12371,10 @@ i([ s({
|
|
|
type: cc.Node,
|
|
|
displayName: "互推"
|
|
|
}) ], e.prototype, "btn9", void 0);
|
|
|
+i([ s({
|
|
|
+type: cc.Node,
|
|
|
+displayName: "订单"
|
|
|
+}) ], e.prototype, "btn12", void 0);
|
|
|
return i([ c ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = l;
|
|
|
@@ -12888,7 +12880,7 @@ this.playerProp.redMoneyCashPayRecordList = t.redMoneyCashPayRecordList;
|
|
|
mk.console.logSingle("userNoviceWeFareInfo==>", t.userNoviceWeFareInfo);
|
|
|
this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
|
|
|
this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
|
|
|
-this.playerProp.completeFarmTaskTimes = 3;
|
|
|
+this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
|
|
|
this.playerProp.orderData = t.userOrderTaskInfo;
|
|
|
console.log("==============initPlayerProp");
|
|
|
console.log(t.userOrderTaskInfo);
|
|
|
@@ -13024,13 +13016,14 @@ this.setProp(i.leftTimes, this.leftTimes);
|
|
|
this.maxTimes = parseInt(this.configs.ServerConfig.ProductionMax);
|
|
|
this.ProductionRecovery = parseInt(this.configs.ServerConfig.ProductionRecovery);
|
|
|
};
|
|
|
-t.prototype.changeLeftTimes = function(t, e) {
|
|
|
+t.prototype.changeLeftTimes = function(t, e, a) {
|
|
|
void 0 === e && (e = !1);
|
|
|
+void 0 === a && (a = !0);
|
|
|
gData.gameData.leftTimes += t;
|
|
|
t > 0 && !e && (gData.gameData.leftTimes = gData.gameData.leftTimes > gData.gameData.maxTimes ? gData.gameData.maxTimes : gData.gameData.leftTimes);
|
|
|
gData.gameData.leftTimes < 0 && (gData.gameData.leftTimes = 0);
|
|
|
gData.gameData.setProp(i.leftTimes, gData.gameData.leftTimes);
|
|
|
-gData.gameData.init_leftTimes = !0;
|
|
|
+a && (gData.gameData.init_leftTimes = !0);
|
|
|
};
|
|
|
t.prototype.getFarmMapRewardState = function(t) {
|
|
|
return t.i < this._farmMapRewardData.length && t.j < this._farmMapRewardData[t.i].length ? this._farmMapRewardData[t.i][t.j] : 1;
|
|
|
@@ -13283,7 +13276,7 @@ if (this.playerProp.userFarmTaskInfo) {
|
|
|
t = this.playerProp.userFarmTaskInfo.completeCount;
|
|
|
e = this.playerProp.userFarmTaskInfo.taskCount;
|
|
|
if (t >= e) {
|
|
|
-this.gameStyle.getIsCanGetOrderReward() || mk.tip.pop("任务红包进度已满，快去提现");
|
|
|
+this.gameStyle.getIsCanGetOrderReward() ? mk.tip.pop("订单已完成，快领奖吧!") : mk.tip.pop("任务红包进度已满，快去提现");
|
|
|
return [ 2, !1 ];
|
|
|
}
|
|
|
}
|
|
|
@@ -13645,7 +13638,10 @@ void 0 === e && (e = !1);
|
|
|
var a = this.getProductMap(t);
|
|
|
this._maxProduct || (this._maxProduct = []);
|
|
|
for (var o = this._maxProduct.length, n = null, i = !1, r = 0; r < o; r++) if ((n = this._maxProduct[r]).tab == a.tab) {
|
|
|
-n.productID < t && (n.productID = t);
|
|
|
+if (n.productID < t) {
|
|
|
+n.productID = t;
|
|
|
+n.id = a.id;
|
|
|
+}
|
|
|
i = !0;
|
|
|
break;
|
|
|
}
|
|
|
@@ -13765,6 +13761,7 @@ if (!this.maxProductToServer) return [ 3, 2 ];
|
|
|
t = {
|
|
|
unLockProductList: this._maxProduct
|
|
|
};
|
|
|
+mk.console.logSingle("updateMaxProduct", t);
|
|
|
return [ 4, mk.http.sendData("orderTask/updateUnlockProduct", t) ];
|
|
|
|
|
|
case 1:
|
|
|
@@ -14397,6 +14394,8 @@ e.sp_mark = [];
|
|
|
e.lbl_redMoneyValue = [];
|
|
|
e.node_getOrderReward = null;
|
|
|
e.node_orderHand = null;
|
|
|
+e.ani_add4 = null;
|
|
|
+e.lbl_addRedMoney = null;
|
|
|
e.posY = 0;
|
|
|
e.lastTimeSpan = 0;
|
|
|
e.span = 0;
|
|
|
@@ -14433,7 +14432,7 @@ this.initInfo();
|
|
|
this.runGuideWeak();
|
|
|
this.initLeftTimes();
|
|
|
this.initFarmExpUI();
|
|
|
-mk.guide.open(1);
|
|
|
+"1" == gData.gameData.funOpenData[11] && mk.guide.open(10) && mk.event.register("event_guide", this.initGuideEvent.bind(this), this);
|
|
|
if (!mk.storage.getStorage("loadingFinish")) {
|
|
|
mk.storage.setStorage("loadingFinish", 1);
|
|
|
mk.data.sendDataEvent(d.DataEventId.loading, "loading结束");
|
|
|
@@ -14449,21 +14448,20 @@ gData.gameData.init_task && this.changeTaskUI();
|
|
|
gData.gameData.init_expLevel && this.initFarmExpUI();
|
|
|
gData.adData.startPopRed(t);
|
|
|
gData.gameData.firstCheckNext();
|
|
|
-var e = 0;
|
|
|
+var e = 0, a = 0;
|
|
|
if (gData.gameData.leftTimes < gData.gameData.maxTimes && 0 != this.lastTimeSpan) {
|
|
|
-var a = Date.now() - this.lastTimeSpan;
|
|
|
-if (a >= this.span) {
|
|
|
-e = Math.floor(a / this.span);
|
|
|
+var o = Date.now() - this.lastTimeSpan;
|
|
|
+if (o >= this.span) {
|
|
|
+e = Math.floor(o / this.span);
|
|
|
this.lastTimeSpan += e * this.span;
|
|
|
mk.storage.setStorage("lastTimeSpan", this.lastTimeSpan);
|
|
|
-gData.gameData.changeLeftTimes(e);
|
|
|
-gData.gameData.init_leftTimes = !0;
|
|
|
+a = gData.gameData.maxTimes - gData.gameData.leftTimes;
|
|
|
+gData.gameData.changeLeftTimes(e, !1, this.isShowAddProductTimesUI);
|
|
|
}
|
|
|
}
|
|
|
if (!this.isShowAddProductTimesUI) {
|
|
|
this.isShowAddProductTimesUI = !0;
|
|
|
-if (e > 0) {
|
|
|
-e = e > gData.gameData.maxTimes ? gData.gameData.maxTimes : e;
|
|
|
+if (e > 0 && (e = e > a ? a : e) > 0) {
|
|
|
gData.gameData.restoreProductTimes = e;
|
|
|
mk.ui.openPanel("module/speedUpUI/restoreProductTimes");
|
|
|
}
|
|
|
@@ -14744,8 +14742,9 @@ console.log("dpFlyRedAni delay2-----");
|
|
|
} else console.log("dpFlyRedAni2-----");
|
|
|
};
|
|
|
e.prototype.doFlyExpAni = function(t, e, a) {
|
|
|
-var o = this, n = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
|
|
|
-mk.fly.PlayCoinAnim(2, 3, e, n, function() {
|
|
|
+var o = this, n = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition()), i = 3;
|
|
|
+gData.harvestData.isMatchOrder && (i = 1);
|
|
|
+mk.fly.PlayCoinAnim(2, i, e, n, function() {
|
|
|
if (gData.gameData.playerProp.gradeLevel < a.farmLevel) {
|
|
|
gData.gameData.playerProp.gradeLevel = a.farmLevel;
|
|
|
mk.data.setTAEventUser(0, "farm_lv", gData.gameData.playerProp.gradeLevel);
|
|
|
@@ -14805,16 +14804,50 @@ y: 240
|
|
|
}).start();
|
|
|
};
|
|
|
e.prototype.clickFarmMapUIBtn = function() {
|
|
|
+mk.audio.playEffect("button");
|
|
|
+mk.data.sendDataEvent(d.DataEventId.button_click, "图鉴浮窗icon");
|
|
|
+if (this.productType == d.ProductType.nzw) if (gData.farmSystem.currSelectFarm) {
|
|
|
+if (gData.farmSystem.currSelectFarm.data.state != d.FarmState.Empty) {
|
|
|
+gData.farmSystem.currSelectFarm = null;
|
|
|
+for (var t = gData.farmSystem.farms, e = 0; e < t.length; e++) if (t[e].data.state == d.FarmState.Empty) {
|
|
|
+gData.farmSystem.currSelectFarm = t[e];
|
|
|
+break;
|
|
|
+}
|
|
|
+gData.farmSystem.currSelectFarm || (gData.farmSystem.currSelectFarm = t[0]);
|
|
|
+}
|
|
|
+} else {
|
|
|
+for (t = gData.farmSystem.farms, e = 0; e < t.length; e++) if (t[e].data.state == d.FarmState.Empty) {
|
|
|
+gData.farmSystem.currSelectFarm = t[e];
|
|
|
+break;
|
|
|
+}
|
|
|
+gData.farmSystem.currSelectFarm || (gData.farmSystem.currSelectFarm = t[0]);
|
|
|
+} else {
|
|
|
+var a = -1, o = gData.factorySystem.factoryIcons;
|
|
|
+for (e = 0; e != o.length; ++e) if (o[e].tab == this.productType && o[e].data.state == d.FarmState.Empty) {
|
|
|
+-1 != a && (a = e);
|
|
|
+gData.factorySystem.currSelectFactory = o[e];
|
|
|
+break;
|
|
|
+}
|
|
|
+gData.factorySystem.currSelectFactory || (gData.factorySystem.currSelectFactory = o[a]);
|
|
|
+}
|
|
|
gData.plantData.openPanel(this.productType, 1, this.productIndex - 1);
|
|
|
};
|
|
|
e.prototype.initFarmMapUi = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e, a, o, n, i, r, s;
|
|
|
+var t, e, a, o, n, i, r, s, l, p;
|
|
|
return c(this, function() {
|
|
|
+if ("0" == gData.gameData.funOpenData[12]) {
|
|
|
+this.node_farmMapUI.active = !1;
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
this.uiShowType = 3;
|
|
|
for (t in d.ProductType) if (e = gData.gameData.getMaxProduct(d.ProductType[t])) {
|
|
|
a = gData.gameData.getProductArrByType(d.ProductType[t]);
|
|
|
-for (o = 0; o != a.length; ++o) if ((n = a[o]).picture <= e) {
|
|
|
+for (o = 0; o != a.length; ++o) {
|
|
|
+n = a[o];
|
|
|
+i = !0;
|
|
|
+d.ProductType[t] == d.ProductType.nzw && (i = n.picture > 10003);
|
|
|
+if (i && n.picture <= e) {
|
|
|
if (0 == gData.gameData.getFarmMapRewardState(this.getIndex(n))) {
|
|
|
this.uiShowType = 1;
|
|
|
this.productType = d.ProductType[t];
|
|
|
@@ -14822,6 +14855,7 @@ this.productIndex = o;
|
|
|
this.node_farmMapGetReward.active = !0;
|
|
|
this.node_farmMapProduct.active = !1;
|
|
|
this.node_farmMapUI.active = !0;
|
|
|
+this.node_farmMapUI.width = 320;
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
} else if (n.picture - 1 == e && 1 == n.unlock) {
|
|
|
@@ -14831,13 +14865,16 @@ this.productIndex = o;
|
|
|
this.node_farmMapGetReward.active = !1;
|
|
|
this.node_farmMapProduct.active = !0;
|
|
|
this.node_farmMapUI.active = !0;
|
|
|
-i = gData.gameData.getProductMakeTimesById(n.picture - 1);
|
|
|
-r = gData.gameData.getProductMap(n.picture - 1).name;
|
|
|
-s = this.getDesByType(n);
|
|
|
-this.lbl_farmMapDes.string = "<color=#7E411F>" + s + "<color=#FF0000>" + n.value + "</c>次" + r + " <color=#FF0000>" + i + "</c>/" + n.value + "</color>";
|
|
|
+r = gData.gameData.getProductMakeTimesById(n.picture - 1);
|
|
|
+s = gData.gameData.getProductMap(n.picture - 1).name;
|
|
|
+l = this.getDesByType(n);
|
|
|
+p = s.length;
|
|
|
+this.node_farmMapUI.width = 300 + 20 * (p - 2) + 5 * (p - 2);
|
|
|
+this.lbl_farmMapDes.string = "<color=#7E411F>" + l + "<color=#FF0000>" + n.value + "</c>次" + s + " <color=#FF0000>" + r + "</c>/" + n.value + "</color>";
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
}
|
|
|
+}
|
|
|
3 == this.uiShowType && (this.node_farmMapUI.active = !1);
|
|
|
return [ 2 ];
|
|
|
});
|
|
|
@@ -14851,9 +14888,11 @@ this.lbl_farmMapDes.string = "<color=#7E411F>" + o + "<color=#FF0000>" + t.value
|
|
|
};
|
|
|
e.prototype.clickGetFarmMapRewardBtn = function() {
|
|
|
var t = this;
|
|
|
+mk.audio.playEffect("button");
|
|
|
if (!this.startTimes) {
|
|
|
this.startTimes = !0;
|
|
|
this.btnCD = 0;
|
|
|
+mk.data.sendDataEvent(d.DataEventId.button_click, "图鉴浮窗icon");
|
|
|
mk.audio.playEffect("button");
|
|
|
mk.ad.videoAdType = d.VideoAdType.video_init_6;
|
|
|
mk.ad.watchAd(function(e) {
|
|
|
@@ -14887,15 +14926,12 @@ return [ 2 ];
|
|
|
}
|
|
|
};
|
|
|
e.prototype.showChangePart = function() {
|
|
|
-var t = this, e = this.lbl_value.length, a = this.lbl_redMoneyValue.length;
|
|
|
+var t = this, e = this.lbl_value.length;
|
|
|
+this.lbl_redMoneyValue.length;
|
|
|
this.schedule(function() {
|
|
|
-for (var o = 0; o < e; o++) {
|
|
|
-var n = s.default.rnd(0, 9);
|
|
|
-t.lbl_value[o].string = "" + n;
|
|
|
-}
|
|
|
-for (o = 0; o < a; o++) {
|
|
|
-n = s.default.rnd(0, 9);
|
|
|
-t.lbl_redMoneyValue[o].string = "" + n;
|
|
|
+for (var a = 0; a < e; a++) {
|
|
|
+var o = s.default.rnd(0, 9);
|
|
|
+t.lbl_value[a].string = "" + o;
|
|
|
}
|
|
|
}, .1);
|
|
|
};
|
|
|
@@ -15024,6 +15060,7 @@ this.orderPicIdArray = [];
|
|
|
this.isGray = !0;
|
|
|
t = gData.gameData.configs.Product;
|
|
|
if (!(e = gData.gameData.playerProp.orderData)) return [ 3, 8 ];
|
|
|
+this.lbl_addRedMoney.string = e.redMoneyAddition / 100 + "";
|
|
|
if (3 != (a = e.orderTaskList.length)) return [ 3, 6 ];
|
|
|
o = 0;
|
|
|
n = 0;
|
|
|
@@ -15073,6 +15110,7 @@ this.node_orderHand.active = !0;
|
|
|
} else {
|
|
|
this.isGray = !0;
|
|
|
this.node_getOrderReward.setGray(!0, !0);
|
|
|
+this.node_getOrderReward.getComponent(cc.Animation).setCurrentTime(0);
|
|
|
this.node_getOrderReward.getComponent(cc.Animation).stop();
|
|
|
this.node_orderHand.active = !1;
|
|
|
}
|
|
|
@@ -15096,6 +15134,7 @@ return [ 2 ];
|
|
|
});
|
|
|
};
|
|
|
e.prototype.clickGetOrderRewardBtn = function() {
|
|
|
+mk.audio.playEffect("button");
|
|
|
this.isGray ? mk.tip.pop("订单未完成") : this.getOrderReward();
|
|
|
};
|
|
|
e.prototype.getIsCanGetOrderReward = function() {
|
|
|
@@ -15103,15 +15142,16 @@ return !this.isGray;
|
|
|
};
|
|
|
e.prototype.getOrderReward = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e;
|
|
|
-return c(this, function(a) {
|
|
|
-switch (a.label) {
|
|
|
+var t, e, a;
|
|
|
+return c(this, function(o) {
|
|
|
+switch (o.label) {
|
|
|
case 0:
|
|
|
t = {};
|
|
|
return [ 4, mk.http.sendData("orderTask/receiveReward", t) ];
|
|
|
|
|
|
case 1:
|
|
|
-if (0 != (e = a.sent()).errcode) return [ 2, null ];
|
|
|
+if (0 != (e = o.sent()).errcode) return [ 2, null ];
|
|
|
+a = gData.gameData.playerProp.orderData.redMoneyAddition;
|
|
|
gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
|
|
|
gData.gameData.cloneOrderData(!0);
|
|
|
gData.reward.adData = {
|
|
|
@@ -15121,7 +15161,7 @@ videoRewardList: null
|
|
|
};
|
|
|
gData.reward.adData.videoRedMoney.videoRewardList = [ {
|
|
|
rewardType: 1,
|
|
|
-rewardNum: e.data.redMoneyAddition
|
|
|
+rewardNum: a
|
|
|
} ];
|
|
|
mk.ui.openPanel("module/reward/reward");
|
|
|
this.initOrderUI();
|
|
|
@@ -15138,18 +15178,18 @@ return c(this, function(s) {
|
|
|
switch (s.label) {
|
|
|
case 0:
|
|
|
o = function(o) {
|
|
|
-var i, s, l, p;
|
|
|
-return c(this, function(u) {
|
|
|
-switch (u.label) {
|
|
|
+var i, s, l, p, u;
|
|
|
+return c(this, function(d) {
|
|
|
+switch (d.label) {
|
|
|
case 0:
|
|
|
-if (t != n.orderPicIdArray[o].picID) return [ 3, 6 ];
|
|
|
-if (!((i = gData.gameData.playerProp.orderData.orderTaskList[o]).completeCount < i.taskCount)) return [ 3, 5 ];
|
|
|
+if (t != n.orderPicIdArray[o].picID) return [ 3, 7 ];
|
|
|
+if (!((i = gData.gameData.playerProp.orderData.orderTaskList[o]).completeCount < i.taskCount)) return [ 3, 6 ];
|
|
|
s = "";
|
|
|
s = a ? "game/coregame/texture/plant_icons/plantIcon_" : "game/coregame/texture/factory_icons/factory_";
|
|
|
return [ 4, n.updataOrderProgress(n.orderPicIdArray[o].ID) ];
|
|
|
|
|
|
case 1:
|
|
|
-u.sent();
|
|
|
+d.sent();
|
|
|
l = function(a) {
|
|
|
var i, l;
|
|
|
return c(this, function(c) {
|
|
|
@@ -15172,23 +15212,37 @@ return [ 2 ];
|
|
|
});
|
|
|
};
|
|
|
p = 0;
|
|
|
-u.label = 2;
|
|
|
+d.label = 2;
|
|
|
|
|
|
case 2:
|
|
|
return 3 == p ? [ 3, 5 ] : [ 5, l(p) ];
|
|
|
|
|
|
case 3:
|
|
|
-u.sent();
|
|
|
-u.label = 4;
|
|
|
+d.sent();
|
|
|
+d.label = 4;
|
|
|
|
|
|
case 4:
|
|
|
++p;
|
|
|
return [ 3, 2 ];
|
|
|
|
|
|
case 5:
|
|
|
-return [ 2, "break" ];
|
|
|
+(u = cc.instantiate(n.ani_add4)).parent = e;
|
|
|
+u.setPosition(cc.Vec2.ZERO);
|
|
|
+cc.tween(u).delay(.8).call(function() {
|
|
|
+u.opacity = 255;
|
|
|
+}).by(.8, {
|
|
|
+y: 100
|
|
|
+}).to(.4, {
|
|
|
+opacity: 0
|
|
|
+}).call(function() {
|
|
|
+u.destroy();
|
|
|
+}).start();
|
|
|
+d.label = 6;
|
|
|
|
|
|
case 6:
|
|
|
+return [ 2, "break" ];
|
|
|
+
|
|
|
+case 7:
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -15230,7 +15284,7 @@ this.node_getOrderReward.setGray(!1, !0);
|
|
|
this.node_getOrderReward.getComponent(cc.Animation).play();
|
|
|
this.node_orderHand.active = !0;
|
|
|
mk.ui.closeAllUI();
|
|
|
-mk.guide.open(3) || mk.tip.pop("订单已完成，快领奖吧!");
|
|
|
+"1" == gData.gameData.funOpenData[11] && mk.guide.open(12) || mk.tip.pop("订单已完成，快领奖吧!");
|
|
|
}
|
|
|
if (i = e.orderTaskList[t]) if (i.completeCount == i.taskCount) {
|
|
|
this.lbl_progress[t].node.active = !1;
|
|
|
@@ -15266,11 +15320,19 @@ return [ 2 ];
|
|
|
});
|
|
|
};
|
|
|
e.prototype.clickOrderUIBtn = function() {
|
|
|
-var t = gData.gameData.playerProp.orderData, e = t.orderTaskList, a = gData.gameData.playerProp.copyOrderData;
|
|
|
-if (t && e && a) {
|
|
|
-for (var o = 0, n = 0; n != e.length; ++n) o += e[n].taskCount - a[n];
|
|
|
-mk.guide.curDes = "<color=8A4312>继续生产" + o + "次，很快就\n可以提现了！</color>";
|
|
|
+mk.audio.playEffect("button");
|
|
|
+mk.guide.isGuiding() || mk.tip.pop("收获相应物品即可领奖");
|
|
|
+};
|
|
|
+e.prototype.judgeContinueTeach = function() {
|
|
|
+var t = gData.gameData.leftTimes;
|
|
|
+if (t > 0) {
|
|
|
+mk.guide.curDes = "<color=8A4312><color=ff0000>继续生产" + t + "次</c>，很快就\n可以完成订单了！</color>";
|
|
|
+return !0;
|
|
|
}
|
|
|
+return !1;
|
|
|
+};
|
|
|
+e.prototype.initGuideEvent = function() {
|
|
|
+gData.farmSystem._lastSeletFarm && gData.farmSystem._lastSeletFarm.clickGuideBtn();
|
|
|
};
|
|
|
i([ y({
|
|
|
type: cc.Node,
|
|
|
@@ -15420,6 +15482,14 @@ i([ y({
|
|
|
displayName: "手指",
|
|
|
type: cc.Node
|
|
|
}) ], e.prototype, "node_orderHand", void 0);
|
|
|
+i([ y({
|
|
|
+type: cc.Node,
|
|
|
+displayName: "增加效果文本2"
|
|
|
+}) ], e.prototype, "ani_add4", void 0);
|
|
|
+i([ y({
|
|
|
+displayName: "红包币",
|
|
|
+type: cc.Label
|
|
|
+}) ], e.prototype, "lbl_addRedMoney", void 0);
|
|
|
return i([ f ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = m;
|
|
|
@@ -16369,6 +16439,7 @@ r.click_rect = c.clickRect;
|
|
|
r.finger = c.finger;
|
|
|
r.lag_next = parseFloat(c.lagNext);
|
|
|
r.display_type = parseInt(c.trNum);
|
|
|
+r.continue = c.continue;
|
|
|
if (o != r.id) {
|
|
|
this.data.set(o, a);
|
|
|
a = [];
|
|
|
@@ -16399,6 +16470,8 @@ value: !0
|
|
|
var o = t("../../game/data/GameData"), n = t("./UISystem"), i = function() {
|
|
|
function t() {
|
|
|
this.curDes = "";
|
|
|
+this.curGuideIdStr = null;
|
|
|
+this.continueCallBack = null;
|
|
|
}
|
|
|
t.prototype.open = function(t, e) {
|
|
|
void 0 === e && (e = "");
|
|
|
@@ -16421,7 +16494,7 @@ this.setGuideID(this.crtGuideID++);
|
|
|
return !0;
|
|
|
};
|
|
|
t.prototype.setGuideID = function(t) {
|
|
|
-if (4 == t) {
|
|
|
+if (12 == t) {
|
|
|
t = 9999;
|
|
|
mk.data.sendXYEvent("guide_end", "新手引导结束");
|
|
|
}
|
|
|
@@ -16436,6 +16509,9 @@ return !this.crtGuideID || 9999 === this.crtGuideID;
|
|
|
t.prototype.isGuiding = function() {
|
|
|
return null != mk.ui.getCurOnPanel("guide");
|
|
|
};
|
|
|
+t.prototype.getCurGuideIdString = function() {
|
|
|
+return this.curGuideIdStr;
|
|
|
+};
|
|
|
return t;
|
|
|
}();
|
|
|
a.default = i;
|
|
|
@@ -16452,6 +16528,7 @@ value: !0
|
|
|
});
|
|
|
a.default = function() {
|
|
|
this.display_type = 0;
|
|
|
+this.continue = null;
|
|
|
};
|
|
|
cc._RF.pop();
|
|
|
}, {} ],
|
|
|
@@ -16766,6 +16843,7 @@ this.nextStep();
|
|
|
e.prototype.nextStep = function() {
|
|
|
this.crtStep++;
|
|
|
this.crtGuide = this.guides[this.crtStep];
|
|
|
+mk.guide.curGuideIdStr = gData.guideData.crtID + "_" + this.crtStep;
|
|
|
mk.data.sendDataEvent(s.DataEventId.guide, "新手引导第" + gData.guideData.crtID + "_" + this.crtStep + "步完成");
|
|
|
this.updateGuide();
|
|
|
};
|
|
|
@@ -16933,6 +17011,7 @@ t.sent();
|
|
|
t.label = 2;
|
|
|
|
|
|
case 2:
|
|
|
+"true" == this.crtGuide.continue && mk.guide.continueCallBack && mk.guide.continueCallBack() && --this.crtStep;
|
|
|
this.nextStep();
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -16954,6 +17033,8 @@ this.node_dialog.opacity = 0;
|
|
|
};
|
|
|
e.prototype.close = function() {
|
|
|
mk.guide.close();
|
|
|
+mk.guide.curGuideIdStr = null;
|
|
|
+mk.guide.continueCallBack = null;
|
|
|
mk.ui.closePanel(this.node.name);
|
|
|
};
|
|
|
e.prototype.clickSkip = function() {
|
|
|
@@ -17157,17 +17238,38 @@ e.getType = 0;
|
|
|
e.init_reward = !1;
|
|
|
e.node_fly = null;
|
|
|
e.isMatchOrder = !1;
|
|
|
+e.isTouchBtn = !1;
|
|
|
+e.isCdOver = !0;
|
|
|
return e;
|
|
|
}
|
|
|
-e.prototype.openPanel = function(t, e, a, o) {
|
|
|
+e.prototype.openPanel = function(t, e, a, o, n, i) {
|
|
|
+void 0 === n && (n = !1);
|
|
|
+void 0 === i && (i = !1);
|
|
|
+if (this.isCdOver) {
|
|
|
this.configID = t;
|
|
|
this.plantID = e;
|
|
|
this.call = a;
|
|
|
this.node_fly = o;
|
|
|
+this.isTouchBtn = n;
|
|
|
this.config = gData.gameData.getProductMap(this.plantID);
|
|
|
this.judgeIsMatchOrder();
|
|
|
-var n = mk.guide.isGuiding(), i = Math.random(), r = gData.adData.getPerByEcpm(s.RateConfig.RC_superDouble);
|
|
|
-!n && i <= r ? mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel") : this.getNormalReward();
|
|
|
+if (i) {
|
|
|
+this.isCdOver = !1;
|
|
|
+this.getNormalReward();
|
|
|
+} else {
|
|
|
+var r = mk.guide.isGuiding(), c = Math.random(), l = gData.adData.getPerByEcpm(s.RateConfig.RC_superDouble);
|
|
|
+if (!r && c <= l) if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0) {
|
|
|
+this.isTouchBtn = !1;
|
|
|
+mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel");
|
|
|
+} else {
|
|
|
+this.isCdOver = !1;
|
|
|
+this.getNormalReward();
|
|
|
+} else {
|
|
|
+this.isCdOver = !1;
|
|
|
+this.getNormalReward();
|
|
|
+}
|
|
|
+}
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.setAdData = function(e) {
|
|
|
mk.console.logSingle("HarvestData addata ", this.adData);
|
|
|
@@ -17180,32 +17282,68 @@ gData.harvestData.call = null;
|
|
|
};
|
|
|
e.prototype.getNormalReward = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e, a, o;
|
|
|
-return c(this, function(n) {
|
|
|
-switch (n.label) {
|
|
|
+var t, e, a, o, n, i, r, s, l = this;
|
|
|
+return c(this, function(c) {
|
|
|
+switch (c.label) {
|
|
|
case 0:
|
|
|
-return [ 4, mk.time.WaitForSeconds(.5) ];
|
|
|
+return this.isTouchBtn ? [ 4, mk.time.WaitForSeconds(.5) ] : [ 3, 2 ];
|
|
|
|
|
|
case 1:
|
|
|
-n.sent();
|
|
|
+c.sent();
|
|
|
+c.label = 2;
|
|
|
+
|
|
|
+case 2:
|
|
|
t = {
|
|
|
id: this.config.id
|
|
|
};
|
|
|
return [ 4, mk.http.sendData("redMoney/addRedMoneyByFarm", t) ];
|
|
|
|
|
|
-case 2:
|
|
|
-if ((e = n.sent()) && 0 != e.errcode) return [ 2 ];
|
|
|
-if (e.data.redMoneyAddition <= 0) console.log("返回奖励为0"); else {
|
|
|
+case 3:
|
|
|
+if ((e = c.sent()) && 0 != e.errcode) return [ 2 ];
|
|
|
+if (!(e.data.redMoneyAddition <= 0)) return [ 3, 4 ];
|
|
|
+this.isCdOver = !0;
|
|
|
+console.log("返回奖励为0");
|
|
|
+return [ 3, 7 ];
|
|
|
+
|
|
|
+case 4:
|
|
|
+if (!this.isTouchBtn) return [ 3, 6 ];
|
|
|
+a = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
|
|
|
+o = mk.fly.node.convertToNodeSpaceAR(a);
|
|
|
+return [ 4, mk.loader.load("module/guide/hand", cc.Prefab) ];
|
|
|
+
|
|
|
+case 5:
|
|
|
+n = c.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() {
|
|
|
+l.isCdOver = !0;
|
|
|
+l.getType = 0;
|
|
|
+var t = [ {
|
|
|
+rewardType: 1,
|
|
|
+rewardNum: e.data.redMoneyAddition
|
|
|
+} ];
|
|
|
+gData.reward.data = t;
|
|
|
+gData.reward.callback = l.call;
|
|
|
+gData.reward.getReward(a, l.isMatchOrder);
|
|
|
+}).removeSelf().start();
|
|
|
+return [ 3, 7 ];
|
|
|
+
|
|
|
+case 6:
|
|
|
+this.isCdOver = !0;
|
|
|
this.getType = 0;
|
|
|
-a = [ {
|
|
|
+r = [ {
|
|
|
rewardType: 1,
|
|
|
rewardNum: e.data.redMoneyAddition
|
|
|
} ];
|
|
|
-gData.reward.data = a;
|
|
|
+gData.reward.data = r;
|
|
|
gData.reward.callback = this.call;
|
|
|
-o = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
|
|
|
-gData.reward.getReward(o, this.isMatchOrder);
|
|
|
-}
|
|
|
+s = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
|
|
|
+gData.reward.getReward(s, this.isMatchOrder);
|
|
|
+c.label = 7;
|
|
|
+
|
|
|
+case 7:
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -17405,7 +17543,7 @@ rewardNum: e.data.redMoneyAddition
|
|
|
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);
|
|
|
+gData.reward.getReward(o, gData.harvestData.isMatchOrder);
|
|
|
}
|
|
|
mk.ui.closePanel("HarvestPanel");
|
|
|
return [ 2 ];
|
|
|
@@ -18641,7 +18779,7 @@ var t = "";
|
|
|
cc.sys.os == cc.sys.OS_ANDROID ? t = this.callStaticMethod(this._JSB_ANDROID_PATH, "getAliDeviceToken", "()Ljava/lang/String;") : cc.sys.os == cc.sys.OS_IOS && (t = this.callStaticMethod("AppController", "openWx", ""));
|
|
|
return t;
|
|
|
};
|
|
|
-t.closePanelFromHome = function() {
|
|
|
+t.backKeyCallBack = function() {
|
|
|
this.callBack && this.callBack();
|
|
|
};
|
|
|
t.systemExit = function() {
|
|
|
@@ -18721,7 +18859,8 @@ return e;
|
|
|
e.prototype.showTips = function() {
|
|
|
var t = this;
|
|
|
cc.tween(this).delay(.5).call(function() {
|
|
|
-mk.tip.pop("插队成功,并获得" + t.redMoney + "红包币");
|
|
|
+var e = Math.round(t.redMoney / 100);
|
|
|
+mk.tip.pop("插队成功,并获得" + e + "红包币");
|
|
|
}).start();
|
|
|
};
|
|
|
e.prototype.setAdData = function(e) {
|
|
|
@@ -22966,7 +23105,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, !0);
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
@@ -23677,7 +23816,7 @@ var t = this;
|
|
|
this.list_data = gData.plantData.productArr;
|
|
|
this.tableView.node.emit("srollview-init", this.list_data);
|
|
|
gData.plantData.productIndex > 1 && cc.tween(this).delay(.2).call(function() {
|
|
|
-t.tableView.contentMoveByIndex(gData.plantData.productIndex - 1, .1);
|
|
|
+t.list_data.length > 4 && (gData.plantData.productIndex <= t.list_data.length - 4 ? t.tableView.contentMoveByIndex(gData.plantData.productIndex - 1, .1) : t.tableView.contentMoveByIndex(t.list_data.length - 4, .1));
|
|
|
}).start();
|
|
|
};
|
|
|
e.prototype.onDestroy = function() {};
|
|
|
@@ -24297,8 +24436,10 @@ this.scheduleOnce(function() {
|
|
|
var t = gData.gameData.playerProp.orderData, e = t.orderTaskList, a = gData.gameData.playerProp.copyOrderData;
|
|
|
if (t && e && a) {
|
|
|
for (var o = 0, n = 0; n != e.length; ++n) o += e[n].taskCount - a[n];
|
|
|
-var i = "<color=8A4312>再收获" + o + "次，就可以完成\n订单，提现仅一步之遥！</color>";
|
|
|
-mk.guide.open(2, i);
|
|
|
+if ("1" == gData.gameData.funOpenData[11]) {
|
|
|
+var i = "<color=8A4312>再生产" + o + "次，就可以收获\n啦，完成订单立即<color=ff0000>提现</color>！</color>";
|
|
|
+mk.guide.open(11, i);
|
|
|
+}
|
|
|
}
|
|
|
}, .5);
|
|
|
} else {
|
|
|
@@ -24321,7 +24462,7 @@ this.node_1.active = !1;
|
|
|
this.node_2.active = !0;
|
|
|
}
|
|
|
}
|
|
|
-e ? gData.gameData.getProp(r.GameProp.guideID) >= 2 && mk.ad.showNative() : mk.ad.showNative();
|
|
|
+e ? gData.gameData.getProp(r.GameProp.guideID) >= 11 && mk.ad.showNative() : mk.ad.showNative();
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
if (gData.gameData.init_productTask) {
|
|
|
@@ -25890,10 +26031,15 @@ n(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
e.lbl_times = null;
|
|
|
+e.lbl_double = null;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.start = function() {
|
|
|
this.lbl_times.string = r.default.format(this.lbl_times.string, gData.gameData.restoreProductTimes.toString());
|
|
|
+this.lbl_double.string = r.default.format(this.lbl_double.string, gData.gameData.restoreProductTimes.toString());
|
|
|
+};
|
|
|
+e.prototype.onEnable = function() {
|
|
|
+mk.ad.showNative();
|
|
|
};
|
|
|
e.prototype.clickVideoBtn = function() {
|
|
|
var t = this;
|
|
|
@@ -25905,23 +26051,46 @@ if (e) {
|
|
|
gData.adData.watchVideo(null);
|
|
|
var a = [ {
|
|
|
rewardType: 4,
|
|
|
-rewardNum: gData.gameData.restoreProductTimes
|
|
|
+rewardNum: 2 * gData.gameData.restoreProductTimes
|
|
|
} ];
|
|
|
gData.reward.data = a;
|
|
|
-gData.reward.callback = t.addTimes;
|
|
|
+gData.reward.callback = t.addDoubleTimes;
|
|
|
mk.ui.openPanel("module/reward/reward");
|
|
|
}
|
|
|
});
|
|
|
};
|
|
|
+e.prototype.addDoubleTimes = function() {
|
|
|
+var t = gData.gameData.restoreProductTimes;
|
|
|
+gData.gameData.changeLeftTimes(t, !0);
|
|
|
+gData.gameData.gameStyle.playAdd(2 * t, 2);
|
|
|
+};
|
|
|
+e.prototype.clickCloseBtn = function() {
|
|
|
+mk.audio.playEffect("button");
|
|
|
+mk.ui.closePanel(this.node.name);
|
|
|
+var t = [ {
|
|
|
+rewardType: 4,
|
|
|
+rewardNum: gData.gameData.restoreProductTimes
|
|
|
+} ];
|
|
|
+gData.reward.data = t;
|
|
|
+gData.reward.callback = this.addTimes;
|
|
|
+mk.ui.openPanel("module/reward/reward");
|
|
|
+};
|
|
|
e.prototype.addTimes = function() {
|
|
|
var t = gData.gameData.restoreProductTimes;
|
|
|
-gData.gameData.changeLeftTimes(t);
|
|
|
+gData.gameData.init_leftTimes = !0;
|
|
|
gData.gameData.gameStyle.playAdd(t, 2);
|
|
|
};
|
|
|
+e.prototype.onDisable = function() {
|
|
|
+mk.ad.destroyNativeAd();
|
|
|
+};
|
|
|
i([ p({
|
|
|
type: cc.RichText,
|
|
|
displayName: "文本"
|
|
|
}) ], e.prototype, "lbl_times", void 0);
|
|
|
+i([ p({
|
|
|
+type: cc.Label,
|
|
|
+displayName: "按钮文本"
|
|
|
+}) ], e.prototype, "lbl_double", void 0);
|
|
|
return i([ l ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = u;
|
|
|
@@ -25988,7 +26157,7 @@ void 0 === e && (e = !1);
|
|
|
if (gData.reward.data && gData.reward.data.length) for (var o = gData.reward.data.length, n = 0; n < o; n++) if (gData.reward.data[n].rewardType !== r.RewardType.rmb && 0 != gData.reward.data[n].rewardNum) {
|
|
|
mk.audio.playEffect("redmoney");
|
|
|
var i = "", c = 10;
|
|
|
-e && (c = 4);
|
|
|
+e && (c = 1);
|
|
|
var s = -1;
|
|
|
if (gData.reward.data[n].rewardType === r.RewardType.productTimes) {
|
|
|
i = "Canvas/主界面层/game/功能按钮/底部按钮/中间按钮";
|
|
|
@@ -28732,6 +28901,10 @@ void 0 === e && (e = .5);
|
|
|
var a = this.itemPosMap.get(t).startPos;
|
|
|
this.direction == r.vertical ? this.scrollView.scrollToOffset(new cc.Vec2(this.content.x, a), e) : this.scrollView.scrollToOffset(new cc.Vec2(a, this.content.y), e);
|
|
|
};
|
|
|
+e.prototype.moveButtom = function() {
|
|
|
+var t = this.scrollView.getMaxScrollOffset();
|
|
|
+this.scrollView.scrollToOffset(t, .1);
|
|
|
+};
|
|
|
e.prototype.getItemByIndexAndCount = function(t, e) {
|
|
|
for (var a = [], o = 0; o != this.itemArr.length; ++o) for (var n = t; n != t + e; ++n) if (this.itemArr[o].index == n) {
|
|
|
a.push(this.itemArr[o]);
|
|
|
@@ -31092,7 +31265,7 @@ if (!(t && t.length > 0 && -1 != t.indexOf(e))) {
|
|
|
var a = this.getCurOnPanel(e);
|
|
|
if (a) {
|
|
|
var o = a.getComponent("EffectOpenAndClose");
|
|
|
-o ? o.hideEffect(this.destroyNode.bind(this, a, e)) : this.destroyNode(a, e);
|
|
|
+o && o.isOpenCloseEffect ? o.hideEffect(this.destroyNode.bind(this, a, e)) : this.destroyNode(a, e);
|
|
|
mk.event.emit("close-panel", e);
|
|
|
}
|
|
|
}
|
