|
|
@@ -2009,6 +2009,7 @@ e.prototype.onRewardedVideoAdFailed = function() {
|
|
|
this.ifLoadShow = !1;
|
|
|
console.log("ATRewardVideo 失败 ", s[this.reawardAdState]);
|
|
|
this.reawardAdState = s.LoadFail;
|
|
|
+gData.gameData.getProp(c.GameProp.videoTimes) || gData.adData.getOrderTaskInfo(1);
|
|
|
};
|
|
|
e.prototype.onRewardedVideoAdPlayStart = function(t, e) {
|
|
|
var a = JSON.parse(e);
|
|
|
@@ -2808,6 +2809,7 @@ this.adsource_isheaderbidding = "";
|
|
|
this.publisher_revenue = "";
|
|
|
this.precision = "";
|
|
|
this.ecpm_level = "";
|
|
|
+this.request_id = "";
|
|
|
this._watchNumToday = 0;
|
|
|
this.ecpmLevel = 0;
|
|
|
this.AutoRedMoneyMap = new Map();
|
|
|
@@ -2871,6 +2873,8 @@ this.adsource_isheaderbidding = e.adsource_isheaderbidding;
|
|
|
this.publisher_revenue = e.publisher_revenue;
|
|
|
this.precision = e.precision;
|
|
|
this.ecpm_level = e.ecpm_level;
|
|
|
+this.request_id = "";
|
|
|
+e.ext_info && e.ext_info.request_id && (this.request_id = e.ext_info.request_id);
|
|
|
};
|
|
|
t.prototype.watchVideo = function(t, e) {
|
|
|
void 0 === e && (e = null);
|
|
|
@@ -2902,7 +2906,8 @@ precision_ecpm: this.precision,
|
|
|
ecpm_level: this.ecpm_level,
|
|
|
cfg_version: gData.appData.version,
|
|
|
adsource_ecpm: gData.gameData.adShowConfig.average_ecpm,
|
|
|
-ad_sbuType: this.ad_subType
|
|
|
+ad_sbuType: this.ad_subType,
|
|
|
+request_id: this.request_id
|
|
|
};
|
|
|
mk.console.logSingle("updateVideoData:", a);
|
|
|
return [ 4, mk.http.sendData("updateVideo", a) ];
|
|
|
@@ -2930,8 +2935,9 @@ var o, i;
|
|
|
return n(this, function(n) {
|
|
|
switch (n.label) {
|
|
|
case 0:
|
|
|
-null;
|
|
|
-o = a ? {
|
|
|
+o = null;
|
|
|
+if (a) {
|
|
|
+o = {
|
|
|
imei: gData.appData.machineInfo.imei,
|
|
|
idfa: gData.appData.machineInfo.idfa,
|
|
|
oaid: gData.appData.machineInfo.oaid,
|
|
|
@@ -2951,8 +2957,11 @@ adsource_isheaderbidding: a.adsource_isheaderbidding,
|
|
|
publisher_revenue: a.publisher_revenue,
|
|
|
precision: a.precision,
|
|
|
ecpm_level: a.ecpm_level,
|
|
|
-platformRisk: 1
|
|
|
-} : {
|
|
|
+platformRisk: 1,
|
|
|
+request_id: ""
|
|
|
+};
|
|
|
+a.ext_info && a.ext_info.request_id && (o.request_id = a.ext_info.request_id);
|
|
|
+} else o = {
|
|
|
imei: gData.appData.machineInfo.imei,
|
|
|
idfa: gData.appData.machineInfo.idfa,
|
|
|
oaid: gData.appData.machineInfo.oaid,
|
|
|
@@ -2972,7 +2981,8 @@ adsource_isheaderbidding: "",
|
|
|
publisher_revenue: "",
|
|
|
precision: "",
|
|
|
ecpm_level: "",
|
|
|
-platformRisk: 1
|
|
|
+platformRisk: 1,
|
|
|
+request_id: ""
|
|
|
};
|
|
|
return [ 4, mk.http.sendData("updateADLog", o) ];
|
|
|
|
|
|
@@ -3123,12 +3133,49 @@ if (gData.gameData.adShowConfig.average_ecpm <= parseInt(e[n].ecpmMax)) return p
|
|
|
return o;
|
|
|
};
|
|
|
t.prototype.savePreLoadEcpm = function(t) {
|
|
|
-var e = gData.gameData.getProp(c.GameProp.videoTimes);
|
|
|
+return o(this, void 0, void 0, function() {
|
|
|
+var e;
|
|
|
+return n(this, function(a) {
|
|
|
+switch (a.label) {
|
|
|
+case 0:
|
|
|
+e = gData.gameData.getProp(c.GameProp.videoTimes);
|
|
|
console.log("savePreLoadEcpm times ", e);
|
|
|
-if (!e) {
|
|
|
+if (e) return [ 3, 2 ];
|
|
|
console.log("savePreLoadEcpm data ", t.adsource_price);
|
|
|
-mk.http.sendData("user/savePreLoadEcpm", t);
|
|
|
+return [ 4, mk.http.sendData("user/savePreLoadEcpm", t) ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+if (0 != a.sent().errcode) return [ 2 ];
|
|
|
+this.getOrderTaskInfo(0);
|
|
|
+a.label = 2;
|
|
|
+
|
|
|
+case 2:
|
|
|
+return [ 2 ];
|
|
|
}
|
|
|
+});
|
|
|
+});
|
|
|
+};
|
|
|
+t.prototype.getOrderTaskInfo = function(t) {
|
|
|
+return o(this, void 0, void 0, function() {
|
|
|
+var e, a;
|
|
|
+return n(this, function(o) {
|
|
|
+switch (o.label) {
|
|
|
+case 0:
|
|
|
+if (gData.gameData.playerProp.orderData) return [ 3, 2 ];
|
|
|
+(e = {}).isDefault = t;
|
|
|
+return [ 4, mk.http.sendData("orderTask/getUserOrderTaskInfo", e) ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+if (0 != (a = o.sent()).errcode) return [ 2 ];
|
|
|
+gData.gameData.playerProp.orderData = a.data.userOrderTaskInfo;
|
|
|
+mk.event.emit("initOrderUi");
|
|
|
+o.label = 2;
|
|
|
+
|
|
|
+case 2:
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+});
|
|
|
+});
|
|
|
};
|
|
|
return t;
|
|
|
}();
|
|
|
@@ -8622,8 +8669,10 @@ return s(this, function() {
|
|
|
switch (this.data.state) {
|
|
|
case c.FactroyState.Lock:
|
|
|
t = gData.gameData.getProductArrByType(this.tab);
|
|
|
+if (gData.gameData.playerProp.orderData) {
|
|
|
e = t[0].value - gData.gameData.playerProp.orderData.overTimes;
|
|
|
mk.tip.pop("订单提现" + e + "次后解锁");
|
|
|
+} else mk.tip.pop("提现订单后解锁");
|
|
|
break;
|
|
|
|
|
|
case c.FactroyState.Empty:
|
|
|
@@ -8945,9 +8994,9 @@ return this.factoryIcons[p];
|
|
|
return null;
|
|
|
};
|
|
|
t.prototype.nextFactoryExtra = function() {
|
|
|
-var t = [], e = gData.gameData.playerProp.orderData, a = e.orderTaskList;
|
|
|
-if (e && a) {
|
|
|
-for (var o = gData.gameData.configs.Product, n = 0; n != a.length; ++n) {
|
|
|
+var t = [], e = gData.gameData.playerProp.orderData;
|
|
|
+if (e) {
|
|
|
+for (var a = e.orderTaskList, o = gData.gameData.configs.Product, n = 0; n != a.length; ++n) {
|
|
|
var i = a[n];
|
|
|
if (i.completeCount < i.taskCount && i.Id <= o.length) {
|
|
|
var s = o[i.Id - 1];
|
|
|
@@ -9290,7 +9339,7 @@ void 0 === t && (t = !0);
|
|
|
this.counting = !1;
|
|
|
this.normalGroup.active = !1;
|
|
|
var e = !1;
|
|
|
-if (gData.gameData.playerProp.orderData.overTimes >= 1 && Math.random() < parseFloat(gData.gameData.configs.ServerConfig.StopProduction)) if (this.productConfig.tab == l.ProductType.nzw) {
|
|
|
+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) {
|
|
|
if (gData.gameData.RawInsectCurArr[0] < parseInt(gData.gameData.RawInsectArr[0])) {
|
|
|
e = !0;
|
|
|
gData.gameData.RawInsectCurArr[0]++;
|
|
|
@@ -12696,6 +12745,7 @@ e.btn8 = null;
|
|
|
e.btn9 = null;
|
|
|
e.btn12 = null;
|
|
|
e.btn14 = null;
|
|
|
+e.addCount = 0;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.onLoad = function() {
|
|
|
@@ -12705,21 +12755,21 @@ e.prototype.start = function() {
|
|
|
this.init();
|
|
|
};
|
|
|
e.prototype.init = function() {
|
|
|
-for (var t = 0, e = gData.gameData.funOpenData, a = 0; a < e.length; a++) {
|
|
|
-var o = this["btn" + (a + 1)];
|
|
|
-if (o) {
|
|
|
-o.active = "1" == e[a];
|
|
|
-if (11 == a && "0" == e[a]) {
|
|
|
+for (var t = gData.gameData.funOpenData, e = 0; e < t.length; e++) {
|
|
|
+var a = this["btn" + (e + 1)];
|
|
|
+if (a) {
|
|
|
+a.active = "1" == t[e];
|
|
|
+if (11 == e && "0" == t[e]) {
|
|
|
this.btn5.y = this.btn5.y + 170;
|
|
|
-t += 1;
|
|
|
-} else 2 == a && "0" == e[a] ? this.btn4.y = this.btn4.y + 170 : 4 == a && "0" == e[a] && (t += 1);
|
|
|
+this.addCount += 1;
|
|
|
+} else 2 == e && "0" == t[e] ? this.btn4.y = this.btn4.y + 170 : 4 == e && "0" == t[e] && (this.addCount += 1);
|
|
|
}
|
|
|
}
|
|
|
-this.btn9.y = this.btn9.y + 130 * t;
|
|
|
+this.btn9.y = this.btn9.y + 130 * this.addCount;
|
|
|
if (this.btn8.active) {
|
|
|
-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);
|
|
|
+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);
|
|
|
}
|
|
|
};
|
|
|
e.prototype.refreshStatus = function() {
|
|
|
@@ -13289,8 +13339,12 @@ this.playerProp.redMoneyCashPayRecordList = t.redMoneyCashPayRecordList;
|
|
|
this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
|
|
|
this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
|
|
|
this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
|
|
|
+if (t.userOrderTaskInfo) {
|
|
|
this.playerProp.orderData = t.userOrderTaskInfo;
|
|
|
+console.log("============userOrderTaskInfo123");
|
|
|
+}
|
|
|
this.playerProp.lineRedMoney = t.lineRedMoney;
|
|
|
+this.playerProp.groupCode = parseInt(t.groupCode);
|
|
|
this.playerProp.curProductionAdTimes = t.dailyProductionTimes;
|
|
|
mk.data.setTAUserID(gData.loginData.uin);
|
|
|
mk.data.setTAEventUser(0, "logindays_total", this.playerProp.loginDays);
|
|
|
@@ -13299,6 +13353,7 @@ if (gData.loginData.isFirstIn) {
|
|
|
gData.loginData.isFirstIn = !1;
|
|
|
mk.data.setTAEventRegister();
|
|
|
mk.data.sendDataEvent("ABTest", "触发" + this.playerProp.groupCode + "方案");
|
|
|
+console.log("ABTest=====" + this.playerProp.groupCode);
|
|
|
mk.data.setTAEventUserStr(0, "regtime_app_id", gData.appData.appVersion);
|
|
|
mk.data.setTAEventUserStr(0, "xy_uid", gData.loginData.uin);
|
|
|
mk.data.setTAEventUser(0, "farm_lv", gData.gameData.playerProp.gradeLevel);
|
|
|
@@ -13500,9 +13555,9 @@ t.prototype.isNewPlayer = function() {
|
|
|
return 0 == this.getProp(i.newPlayer);
|
|
|
};
|
|
|
t.prototype.getRandomPlantConfig = function(t) {
|
|
|
-var e = 0, a = !0, o = !1, n = !1, i = !1, s = [], c = [], l = this.playerProp.orderData, p = l.orderTaskList;
|
|
|
-if (l && p) {
|
|
|
-for (var f = this.configs.Product, y = 0; y != p.length; ++y) {
|
|
|
+var e = 0, a = !0, o = !1, n = !1, i = !1, s = [], c = [], l = this.playerProp.orderData;
|
|
|
+if (l) {
|
|
|
+for (var p = l.orderTaskList, f = this.configs.Product, y = 0; y != p.length; ++y) {
|
|
|
var g = p[y];
|
|
|
if (g.completeCount < g.taskCount) {
|
|
|
if (!(g.Id <= f.length)) {
|
|
|
@@ -13557,13 +13612,13 @@ return this.getProductMap(e);
|
|
|
return this.getProductMap(e);
|
|
|
};
|
|
|
t.prototype.getRandomPlantConfigExtra = function() {
|
|
|
-var t = 0, e = [], a = [], o = [], n = this.playerProp.orderData, i = n.orderTaskList;
|
|
|
-if (!n || !i) {
|
|
|
+var t = 0, e = [], a = [], o = [], n = this.playerProp.orderData;
|
|
|
+if (!n) {
|
|
|
t = r.default.rnd(10001, this.getMaxProductExtra(d.nzw));
|
|
|
this.nextType = 1;
|
|
|
return this.getProductMap(t);
|
|
|
}
|
|
|
-for (var s = this.configs.Product, c = 0; c != i.length; ++c) {
|
|
|
+for (var i = n.orderTaskList, s = this.configs.Product, c = 0; c != i.length; ++c) {
|
|
|
var l = i[c];
|
|
|
if (l.completeCount < l.taskCount && l.Id <= s.length) {
|
|
|
var p = s[l.Id - 1];
|
|
|
@@ -13604,8 +13659,8 @@ return _;
|
|
|
}
|
|
|
};
|
|
|
t.prototype.doJudgeOrderLogic = function(t) {
|
|
|
-var e = this.playerProp.orderData, a = e.orderTaskList;
|
|
|
-if (e && a) for (var o = this.configs.Product, n = 0; n != a.length; ++n) {
|
|
|
+var e = this.playerProp.orderData;
|
|
|
+if (e) for (var a = e.orderTaskList, o = this.configs.Product, n = 0; n != a.length; ++n) {
|
|
|
var i = a[n];
|
|
|
if (i.completeCount < i.taskCount && i.Id <= o.length) {
|
|
|
var r = o[i.Id - 1];
|
|
|
@@ -14037,7 +14092,7 @@ this._pastureData || (this._pastureData = []);
|
|
|
var t = this._pastureData.length;
|
|
|
if (t < 3) {
|
|
|
for (var e = this.getProductArrByType(d.dw), a = e.length, o = 30001, n = null, r = 0; r < a; r++) {
|
|
|
-n = this.playerProp.orderData.overTimes < e[r].value ? {
|
|
|
+n = this.playerProp.orderData ? this.playerProp.orderData.overTimes < e[r].value ? {
|
|
|
id: o,
|
|
|
state: u.Lock,
|
|
|
productID: e[r].picture,
|
|
|
@@ -14047,6 +14102,11 @@ id: o,
|
|
|
state: u.Empty,
|
|
|
productID: e[r].picture,
|
|
|
growSpan: 0
|
|
|
+} : {
|
|
|
+id: o,
|
|
|
+state: u.Lock,
|
|
|
+productID: e[r].picture,
|
|
|
+growSpan: 0
|
|
|
};
|
|
|
this._pastureData.push(n);
|
|
|
this._pastureDataMap.set(o, n);
|
|
|
@@ -14085,7 +14145,7 @@ if (t < 6) {
|
|
|
for (var e = 30004, a = null, o = null, n = 0; n < 6; n++) {
|
|
|
o = this.getTabByConfigID(e);
|
|
|
var r = this.getProductArrByType(o);
|
|
|
-a = this.playerProp.orderData.overTimes < r[0].value ? {
|
|
|
+a = this.playerProp.orderData ? this.playerProp.orderData.overTimes < r[0].value ? {
|
|
|
id: e,
|
|
|
state: h.Lock,
|
|
|
productID: 0,
|
|
|
@@ -14095,6 +14155,11 @@ id: e,
|
|
|
state: h.Empty,
|
|
|
productID: 0,
|
|
|
growSpan: 0
|
|
|
+} : {
|
|
|
+id: e,
|
|
|
+state: h.Lock,
|
|
|
+productID: 0,
|
|
|
+growSpan: 0
|
|
|
};
|
|
|
this._factoryData.push(a);
|
|
|
this._factoryDataMap.set(e, a);
|
|
|
@@ -14108,7 +14173,6 @@ o = this.getTabByConfigID(e);
|
|
|
r = this.getProductArrByType(o);
|
|
|
this._factoryDataMap.set(this._factoryData[n].id, this._factoryData[n]);
|
|
|
this._factoryData[n].state == h.Sick && s++;
|
|
|
-this.playerProp.orderData.overTimes, r[0].value;
|
|
|
e++;
|
|
|
}
|
|
|
this.RawInsectCurArr[2] = s;
|
|
|
@@ -14274,7 +14338,7 @@ var c = 30001;
|
|
|
s = !1;
|
|
|
for (var l = 0, p = 0; p < n; p++) {
|
|
|
r = this.getPastureDataMap(c);
|
|
|
-if (this.playerProp.orderData.overTimes >= o[p].value) {
|
|
|
+if (this.playerProp.orderData && this.playerProp.orderData.overTimes >= o[p].value) {
|
|
|
if (r.state == u.Lock) {
|
|
|
r = {
|
|
|
id: c,
|
|
|
@@ -14304,7 +14368,7 @@ default:
|
|
|
s = !1;
|
|
|
var y = this.getConfigIDByTab(a);
|
|
|
r = this.getFactoryDataMap(y);
|
|
|
-if (this.playerProp.orderData.overTimes >= o[0].value) {
|
|
|
+if (this.playerProp.orderData && this.playerProp.orderData.overTimes >= o[0].value) {
|
|
|
if (r.state == h.Lock) {
|
|
|
r = {
|
|
|
id: c,
|
|
|
@@ -15086,7 +15150,7 @@ this.registerCallBack();
|
|
|
console.log("===[Jsbsystem 显示开屏广告================================");
|
|
|
mk.ad.ifShowAd && Math.random() <= gData.adData.getPerByEcpm(u.RateConfig.RC_splash) && l.default.showSplash();
|
|
|
this.initRefreshEvent();
|
|
|
-this.initOrderUI();
|
|
|
+gData.gameData.playerProp.orderData ? this.initOrderUI() : mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
this.initMusic();
|
|
|
@@ -15318,7 +15382,7 @@ e.prototype.onClickHuTui = function() {
|
|
|
mk.data.sendDataEvent(d.DataEventId.button_click, "互推icon");
|
|
|
};
|
|
|
e.prototype.onClickFuli = function() {
|
|
|
-if (gData.gameData.playerProp.orderData.overTimes >= gData.gameData.welfareOpenLimit) {
|
|
|
+if (gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= gData.gameData.welfareOpenLimit) {
|
|
|
mk.ui.openPanel("module/blessingBag/blessingBag");
|
|
|
mk.data.sendDataEvent(d.DataEventId.button_click, "福利icon");
|
|
|
} else mk.tip.pop("订单提现" + gData.gameData.welfareOpenLimit + "次后开启");
|
|
|
@@ -15851,7 +15915,7 @@ t.active = !0;
|
|
|
});
|
|
|
this.node_orderHbIcon.active = !0;
|
|
|
this.node_getOrderReward.node.active = !0;
|
|
|
-this.initOrderUI();
|
|
|
+this.initOrderUI(!1);
|
|
|
this.showTips();
|
|
|
gData.gameData.init_order = !0;
|
|
|
gData.gameData.checkTaskFinishUnLock();
|
|
|
@@ -15873,7 +15937,7 @@ var o, n, i;
|
|
|
return s(this, function(r) {
|
|
|
switch (r.label) {
|
|
|
case 0:
|
|
|
-if ("0" == gData.gameData.funOpenData[11]) return [ 2 ];
|
|
|
+if ("0" == gData.gameData.funOpenData[11] || !gData.gameData.playerProp.orderData) return [ 2 ];
|
|
|
o = function(o) {
|
|
|
var i, r;
|
|
|
return s(this, function(s) {
|
|
|
@@ -18973,7 +19037,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) {
|
|
|
@@ -19589,10 +19653,10 @@ this.pt = a;
|
|
|
};
|
|
|
e.prototype.clickLuckBtn = function() {
|
|
|
var t = gData.gameData.getProductArrByType(this.pt);
|
|
|
-if (t && t.length > 0 && 2 == t[0].unlock) {
|
|
|
+if (t && t.length > 0 && 2 == t[0].unlock) if (gData.gameData.playerProp.orderData) {
|
|
|
var e = t[0].value - gData.gameData.playerProp.orderData.overTimes;
|
|
|
mk.tip.pop("订单提现" + e + "次后解锁");
|
|
|
-}
|
|
|
+} else mk.tip.pop("提现订单后解锁");
|
|
|
};
|
|
|
i([ l({
|
|
|
displayName: "复选组件",
|
|
|
@@ -20318,7 +20382,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 = " = ";
|
|
|
@@ -20760,7 +20824,8 @@ uin: this.uin,
|
|
|
login_ticket: this.loginTicket,
|
|
|
szlm_did: mk.shuzilmM.szlm_did,
|
|
|
black_box: mk.tongdunM.tdEquipID,
|
|
|
-mac: gData.appData.machineInfo.mac
|
|
|
+mac: gData.appData.machineInfo.mac,
|
|
|
+appVersion: gData.appData.appVersion
|
|
|
};
|
|
|
a = {
|
|
|
uin: this.uin,
|
|
|
@@ -21050,6 +21115,7 @@ e.coreGame = null;
|
|
|
e.isLoadComplete = !1;
|
|
|
e.hasCheckChannel = !1;
|
|
|
e.initShuzilm = !1;
|
|
|
+e.initOrderInfo = !1;
|
|
|
e.addTime = 0;
|
|
|
e.cool = !1;
|
|
|
return e;
|
|
|
@@ -24347,10 +24413,10 @@ var t, e;
|
|
|
return s(this, function() {
|
|
|
switch (this.data.state) {
|
|
|
case c.PastureState.Lock:
|
|
|
-if (2 == (t = gData.gameData.getProductMap(this.data.productID)).unlock) {
|
|
|
+if (2 == (t = gData.gameData.getProductMap(this.data.productID)).unlock) if (gData.gameData.playerProp.orderData) {
|
|
|
e = t.value - gData.gameData.playerProp.orderData.overTimes;
|
|
|
mk.tip.pop("订单提现" + e + "次后解锁");
|
|
|
-} else 1 == t.unlock && mk.tip.pop("喂食" + t.name + t.value + "次解锁");
|
|
|
+} else mk.tip.pop("提现订单后解锁"); else 1 == t.unlock && mk.tip.pop("喂食" + t.name + t.value + "次解锁");
|
|
|
break;
|
|
|
|
|
|
case c.PastureState.Empty:
|
|
|
@@ -24693,9 +24759,9 @@ return 1 == t.state ? null : this.doSameCheckLogic(t);
|
|
|
return this.doSameCheckLogic(t);
|
|
|
};
|
|
|
t.prototype.nextPastureExtra = function() {
|
|
|
-var t = [], e = [], a = gData.gameData.playerProp.orderData, o = a.orderTaskList;
|
|
|
-if (a && o) {
|
|
|
-for (var n = gData.gameData.configs.Product, i = 0; i != o.length; ++i) {
|
|
|
+var t = [], e = [], a = gData.gameData.playerProp.orderData;
|
|
|
+if (a) {
|
|
|
+for (var o = a.orderTaskList, n = gData.gameData.configs.Product, i = 0; i != o.length; ++i) {
|
|
|
var s = o[i];
|
|
|
if (s.completeCount < s.taskCount && s.Id <= n.length) {
|
|
|
var c = n[s.Id - 1];
|
|
|
@@ -25053,7 +25119,7 @@ this.awardLabel.string = (t.menuRedBagCoin / 100).toString();
|
|
|
this.timeLabel.string = t.time;
|
|
|
i = !1;
|
|
|
r = 0;
|
|
|
-1 == t.unlock ? (i = gData.gameData.getProductUnlockById(this.data.tab, this.data.picture)) || (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && gData.gameData.playerProp.orderData.overTimes >= t.value && (i = !0);
|
|
|
+1 == t.unlock ? (i = gData.gameData.getProductUnlockById(this.data.tab, this.data.picture)) || (r = gData.gameData.getProductMakeTimesById(t.picture - 1)) >= t.value && (i = !0) : 2 == t.unlock && gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes >= t.value && (i = !0);
|
|
|
this.mainNode.active = i;
|
|
|
this.lockNode.active = !i;
|
|
|
if (!i) {
|
|
|
@@ -25918,32 +25984,32 @@ e.prototype.initUIByOrderData = function(t) {
|
|
|
var e = this;
|
|
|
void 0 === t && (t = !1);
|
|
|
if ("1" == gData.gameData.funOpenData[11]) {
|
|
|
-var a = gData.gameData.playerProp.orderData, o = a.orderTaskList;
|
|
|
-if (a && o) {
|
|
|
-for (var n = 0, i = 0, r = 0; r != o.length; ++r) {
|
|
|
-i += o[r].taskCount;
|
|
|
-n += o[r].taskCount - o[r].completeCount;
|
|
|
+var a = gData.gameData.playerProp.orderData;
|
|
|
+if (a) {
|
|
|
+for (var o = 0, n = 0, i = a.orderTaskList, r = 0; r != i.length; ++r) {
|
|
|
+n += i[r].taskCount;
|
|
|
+o += i[r].taskCount - i[r].completeCount;
|
|
|
}
|
|
|
-if (n > 0) {
|
|
|
+if (o > 0) {
|
|
|
this.node_Uncomplete.active = !0;
|
|
|
this.node_complete.active = !1;
|
|
|
-var c = i - n, l = c / i;
|
|
|
-this.lbl_taskTimes.string = n.toString();
|
|
|
+var c = n - o, l = c / n;
|
|
|
+this.lbl_taskTimes.string = o.toString();
|
|
|
cc.tween(this.sp_taskProgress).delay(.2).to(.3, {
|
|
|
fillRange: l
|
|
|
}, {
|
|
|
onUpdate: function() {
|
|
|
-var t = Math.round(e.sp_taskProgress.fillRange * i);
|
|
|
-e.lbl_progress.string = t + "/" + i;
|
|
|
+var t = Math.round(e.sp_taskProgress.fillRange * n);
|
|
|
+e.lbl_progress.string = t + "/" + n;
|
|
|
}
|
|
|
}).call(function() {
|
|
|
-e.lbl_progress.string = c + "/" + i;
|
|
|
+e.lbl_progress.string = c + "/" + n;
|
|
|
}).start();
|
|
|
if (gData.gameData.getProp(s.GameProp.guideID) >= 11) t || mk.ad.showNative(); else {
|
|
|
this.btnCanClick = !1;
|
|
|
this.scheduleOnce(function() {
|
|
|
e.btnCanClick = !0;
|
|
|
-var t = "<color=8A4312>再生产<color=ff0000>" + n + "</color>次，就可以完成\n订单立即<color=ff0000>提现</color>！</color>";
|
|
|
+var t = "<color=8A4312>再生产<color=ff0000>" + o + "</color>次，就可以完成\n订单立即<color=ff0000>提现</color>！</color>";
|
|
|
mk.guide.open(11, t);
|
|
|
}, .2);
|
|
|
}
|
|
|
@@ -25951,7 +26017,7 @@ mk.guide.open(11, t);
|
|
|
var p = gData.gameData.playerProp.orderData.cashMoney;
|
|
|
this.lbl_orderValue.string = "订单已完成，可提现" + (p / 100).toFixed(2) + "元";
|
|
|
this.sp_taskProgress.fillRange = 1;
|
|
|
-this.lbl_progress.string = i + "/" + i;
|
|
|
+this.lbl_progress.string = n + "/" + n;
|
|
|
this.node_Uncomplete.active = !1;
|
|
|
this.node_complete.active = !0;
|
|
|
t || mk.ad.showNative();
|
