|
|
@@ -258,7 +258,7 @@ return [ 2 ];
|
|
|
});
|
|
|
};
|
|
|
e.prototype.onEnable = function() {
|
|
|
-gData.adData.checkPopInter(s.InterAdType.interstitial1_click_3);
|
|
|
+gData.gameData.playerProp.completeFarmTaskTimes >= 1 && gData.adData.checkPopInter(s.InterAdType.interstitial1_click_3);
|
|
|
mk.ad.showBanner(s.BannerAdType.banner_click_8);
|
|
|
};
|
|
|
e.prototype.onDisable = function() {
|
|
|
@@ -886,7 +886,7 @@ gData.adData.updateADLog(7, t, o);
|
|
|
this.loadBanner();
|
|
|
};
|
|
|
e.prototype.onBannerAdClick = function() {
|
|
|
-mk.data.sendDataEvent(r.DataEventId.banner_click, mk.ad.bannerAdType);
|
|
|
+mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.bannerAdType);
|
|
|
};
|
|
|
e.prototype.onBannerAdAutoRefresh = function() {};
|
|
|
e.prototype.onBannerAdAutoRefreshFail = function() {};
|
|
|
@@ -1283,7 +1283,7 @@ gData.adData.updateADLog(a, t, n);
|
|
|
this.loadInter(o);
|
|
|
};
|
|
|
e.prototype.onInterstitialAdClick = function(t) {
|
|
|
-1 == this.checkPlacementIDType(t) ? mk.data.sendDataEvent(s.DataEventId.interstitial2_click, mk.ad.interFullAdType) : mk.data.sendDataEvent(s.DataEventId.interstitial1_click, mk.ad.interAdType);
|
|
|
+1 == this.checkPlacementIDType(t) ? mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interFullAdType) : mk.data.sendDataEvent(s.DataEventId.Ad_click, mk.ad.interAdType);
|
|
|
};
|
|
|
e.prototype.onInterstitialAdClose = function(t, e) {
|
|
|
var o = this.checkPlacementIDType(t);
|
|
|
@@ -1846,7 +1846,7 @@ this.canGet = !1;
|
|
|
this.loadAd();
|
|
|
};
|
|
|
e.prototype.onRewardedVideoAdPlayClicked = function() {
|
|
|
-mk.data.sendDataEvent(r.DataEventId.video_click, mk.ad.videoAdType);
|
|
|
+mk.data.sendDataEvent(r.DataEventId.Ad_click, mk.ad.videoAdType);
|
|
|
};
|
|
|
e.prototype.onReward = function() {
|
|
|
console.log("onReward ");
|
|
|
@@ -2558,7 +2558,7 @@ return [ 4, mk.http.sendData("updateVideo", e) ];
|
|
|
|
|
|
case 1:
|
|
|
if (0 != (o = a.sent()).errcode) return [ 2 ];
|
|
|
-n = gData.gameData.getProp(c.GameProp.videoTimes);
|
|
|
+(n = gData.gameData.getProp(c.GameProp.videoTimes)) || (n = 0);
|
|
|
gData.gameData.setProp(c.GameProp.videoTimes, ++n);
|
|
|
n < 5 && mk.data.sendXYEvent("video_end_" + n, "第" + n + "次看视频");
|
|
|
(i = this.adMap.get(this.ad_subType)) && i.setAdData(o.data);
|
|
|
@@ -3858,17 +3858,29 @@ 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 = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
|
|
|
a(e, t);
|
|
|
function e() {
|
|
|
-return null !== t && t.apply(this, arguments) || this;
|
|
|
+var e = null !== t && t.apply(this, arguments) || this;
|
|
|
+e.isFitSpecialNode = !1;
|
|
|
+return e;
|
|
|
}
|
|
|
e.prototype.onLoad = function() {
|
|
|
this._AdaptLeftAndRight();
|
|
|
};
|
|
|
+e.prototype.start = function() {};
|
|
|
e.prototype._AdaptLeftAndRight = function() {
|
|
|
var t = this.node.getComponent(cc.Widget);
|
|
|
-t && this.IsBigScreenRatio() && (t.top = 65);
|
|
|
+if (t && this.IsBigScreenRatio()) if (this.isFitSpecialNode) {
|
|
|
+if (t.isAlignTop) {
|
|
|
+var e = Math.round(80 * this.GetWinHeightWidthRatio() / 1.86);
|
|
|
+t.top = t.top + e;
|
|
|
+}
|
|
|
+if (t.isAlignBottom) {
|
|
|
+e = Math.round(80 * this.GetWinHeightWidthRatio() / 1.86);
|
|
|
+t.bottom = t.bottom + e;
|
|
|
+}
|
|
|
+} else t.top = 65;
|
|
|
};
|
|
|
e.prototype.IsBigScreenRatio = function() {
|
|
|
return this.GetWinHeightWidthRatio() >= 1.86;
|
|
|
@@ -3876,9 +3888,12 @@ return this.GetWinHeightWidthRatio() >= 1.86;
|
|
|
e.prototype.GetWinHeightWidthRatio = function() {
|
|
|
return cc.winSize.height >= cc.winSize.width ? cc.winSize.height / cc.winSize.width : cc.winSize.width / cc.winSize.height;
|
|
|
};
|
|
|
+i([ s({
|
|
|
+displayName: "是否适配特殊节点"
|
|
|
+}) ], e.prototype, "isFitSpecialNode", void 0);
|
|
|
return i([ c ], e);
|
|
|
-}(cc.Component));
|
|
|
-o.default = s;
|
|
|
+}(cc.Component);
|
|
|
+o.default = l;
|
|
|
cc._RF.pop();
|
|
|
}, {} ],
|
|
|
BitmapData: [ function(t, e, o) {
|
|
|
@@ -4695,7 +4710,7 @@ done: !0
|
|
|
Object.defineProperty(o, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
-var s = t("../../../mk/system/JsbSystem"), l = t("../../component/SetGray"), p = t("../../component/TableView"), u = t("../../data/GameData"), d = t("../../data/module/CashProData"), h = cc._decorator, f = h.ccclass, y = h.property, g = function(t) {
|
|
|
+var s = t("../../../mk/system/JsbSystem"), l = t("../../component/SetGray"), p = t("../../component/TableView"), u = t("../../data/GameData"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
|
|
|
a(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
@@ -4763,7 +4778,7 @@ if (o) {
|
|
|
this.video_btn.interactable = !1;
|
|
|
(a = this.video_btn.getComponent(l.default)) && a.setGray(!0);
|
|
|
}
|
|
|
-if (!this.video_btn.interactable) {
|
|
|
+if (!o && !this.video_btn.interactable) {
|
|
|
this.video_btn.interactable = !0;
|
|
|
var a;
|
|
|
(a = this.video_btn.getComponent(l.default)) && a.setGray(!1);
|
|
|
@@ -4897,7 +4912,7 @@ return c(this, function() {
|
|
|
mk.audio.playEffect("button");
|
|
|
if (!this.canOpen) return [ 2 ];
|
|
|
this.canOpen = !1;
|
|
|
-if (1 == this.rbPanelType) gData.cashPro.openCashPro(d.cashProType.blessing_bigCash, gData.blessingBag.bigRbNum); else {
|
|
|
+if (1 == this.rbPanelType) gData.cashPro.openCashPro(gData.blessingBag.bigRbNum); else {
|
|
|
this.rbOpenBtn.active = !1;
|
|
|
this.aniBtnAd.node.active = !0;
|
|
|
this.aniBtnAd.setCurrentTime(0);
|
|
|
@@ -4930,37 +4945,36 @@ e.prototype.onClickClose = function() {};
|
|
|
e.prototype.onDisable = function() {
|
|
|
gData.adData.checkShowFullInter(4);
|
|
|
};
|
|
|
-i([ y(cc.Label) ], e.prototype, "txtBigNum", void 0);
|
|
|
-i([ y(cc.Label) ], e.prototype, "txtAddEft", void 0);
|
|
|
-i([ y(cc.RichText) ], e.prototype, "txtTipAd", void 0);
|
|
|
-i([ y(cc.RichText) ], e.prototype, "txtBigDelta", void 0);
|
|
|
-i([ y(cc.RichText) ], e.prototype, "txtBigTask", void 0);
|
|
|
-i([ y(cc.RichText) ], e.prototype, "txtRemaindAdNum", void 0);
|
|
|
-i([ y(cc.Prefab) ], e.prototype, "blassingBagItem", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "itemContent", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "btnCash", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "btnAd", void 0);
|
|
|
-i([ y(cc.Animation) ], e.prototype, "aniBigAdBtn", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "adIcon", void 0);
|
|
|
-i([ y(cc.Animation) ], e.prototype, "aniBtnAd", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "rbOpenBtn", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "nodeRb", void 0);
|
|
|
-i([ y(cc.Label) ], e.prototype, "txtRbNum", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "testNode", void 0);
|
|
|
-i([ y(cc.EditBox) ], e.prototype, "inputBox", void 0);
|
|
|
-i([ y(cc.Node) ], e.prototype, "node_xiabiao", void 0);
|
|
|
-i([ y(p.default) ], e.prototype, "tableview", void 0);
|
|
|
-i([ y(cc.Button) ], e.prototype, "video_btn", void 0);
|
|
|
-return i([ f ], e);
|
|
|
+i([ f(cc.Label) ], e.prototype, "txtBigNum", void 0);
|
|
|
+i([ f(cc.Label) ], e.prototype, "txtAddEft", void 0);
|
|
|
+i([ f(cc.RichText) ], e.prototype, "txtTipAd", void 0);
|
|
|
+i([ f(cc.RichText) ], e.prototype, "txtBigDelta", void 0);
|
|
|
+i([ f(cc.RichText) ], e.prototype, "txtBigTask", void 0);
|
|
|
+i([ f(cc.RichText) ], e.prototype, "txtRemaindAdNum", void 0);
|
|
|
+i([ f(cc.Prefab) ], e.prototype, "blassingBagItem", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "itemContent", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "btnCash", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "btnAd", void 0);
|
|
|
+i([ f(cc.Animation) ], e.prototype, "aniBigAdBtn", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "adIcon", void 0);
|
|
|
+i([ f(cc.Animation) ], e.prototype, "aniBtnAd", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "rbOpenBtn", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "nodeRb", void 0);
|
|
|
+i([ f(cc.Label) ], e.prototype, "txtRbNum", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "testNode", void 0);
|
|
|
+i([ f(cc.EditBox) ], e.prototype, "inputBox", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "node_xiabiao", void 0);
|
|
|
+i([ f(p.default) ], e.prototype, "tableview", void 0);
|
|
|
+i([ f(cc.Button) ], e.prototype, "video_btn", void 0);
|
|
|
+return i([ h ], e);
|
|
|
}(cc.Component);
|
|
|
-o.default = g;
|
|
|
+o.default = y;
|
|
|
cc._RF.pop();
|
|
|
}, {
|
|
|
"../../../mk/system/JsbSystem": "JsbSystem",
|
|
|
"../../component/SetGray": "SetGray",
|
|
|
"../../component/TableView": "TableView",
|
|
|
-"../../data/GameData": "GameData",
|
|
|
-"../../data/module/CashProData": "CashProData"
|
|
|
+"../../data/GameData": "GameData"
|
|
|
} ],
|
|
|
BonusTip: [ function(t, e, o) {
|
|
|
"use strict";
|
|
|
@@ -6209,11 +6223,123 @@ t.prototype = null === e ? Object.create(e) : (o.prototype = e.prototype, new o(
|
|
|
var a, i = arguments.length, r = i < 3 ? e : null === n ? n = Object.getOwnPropertyDescriptor(e, o) : n;
|
|
|
if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(t, e, o, n); else for (var c = t.length - 1; c >= 0; c--) (a = t[c]) && (r = (i < 3 ? a(r) : i > 3 ? a(e, o, r) : a(e, o)) || r);
|
|
|
return i > 3 && r && Object.defineProperty(e, o, r), r;
|
|
|
+}, r = this && this.__awaiter || function(t, e, o, n) {
|
|
|
+return new (o || (o = Promise))(function(a, i) {
|
|
|
+function r(t) {
|
|
|
+try {
|
|
|
+s(n.next(t));
|
|
|
+} catch (t) {
|
|
|
+i(t);
|
|
|
+}
|
|
|
+}
|
|
|
+function c(t) {
|
|
|
+try {
|
|
|
+s(n.throw(t));
|
|
|
+} catch (t) {
|
|
|
+i(t);
|
|
|
+}
|
|
|
+}
|
|
|
+function s(t) {
|
|
|
+t.done ? a(t.value) : (e = t.value, e instanceof o ? e : new o(function(t) {
|
|
|
+t(e);
|
|
|
+})).then(r, c);
|
|
|
+var e;
|
|
|
+}
|
|
|
+s((n = n.apply(t, e || [])).next());
|
|
|
+});
|
|
|
+}, c = this && this.__generator || function(t, e) {
|
|
|
+var o, n, a, i, r = {
|
|
|
+label: 0,
|
|
|
+sent: function() {
|
|
|
+if (1 & a[0]) throw a[1];
|
|
|
+return a[1];
|
|
|
+},
|
|
|
+trys: [],
|
|
|
+ops: []
|
|
|
+};
|
|
|
+return i = {
|
|
|
+next: c(0),
|
|
|
+throw: c(1),
|
|
|
+return: c(2)
|
|
|
+}, "function" == typeof Symbol && (i[Symbol.iterator] = function() {
|
|
|
+return this;
|
|
|
+}), i;
|
|
|
+function c(t) {
|
|
|
+return function(e) {
|
|
|
+return s([ t, e ]);
|
|
|
+};
|
|
|
+}
|
|
|
+function s(i) {
|
|
|
+if (o) throw new TypeError("Generator is already executing.");
|
|
|
+for (;r; ) try {
|
|
|
+if (o = 1, n && (a = 2 & i[0] ? n.return : i[0] ? n.throw || ((a = n.return) && a.call(n),
|
|
|
+0) : n.next) && !(a = a.call(n, i[1])).done) return a;
|
|
|
+(n = 0, a) && (i = [ 2 & i[0], a.value ]);
|
|
|
+switch (i[0]) {
|
|
|
+case 0:
|
|
|
+case 1:
|
|
|
+a = i;
|
|
|
+break;
|
|
|
+
|
|
|
+case 4:
|
|
|
+r.label++;
|
|
|
+return {
|
|
|
+value: i[1],
|
|
|
+done: !1
|
|
|
+};
|
|
|
+
|
|
|
+case 5:
|
|
|
+r.label++;
|
|
|
+n = i[1];
|
|
|
+i = [ 0 ];
|
|
|
+continue;
|
|
|
+
|
|
|
+case 7:
|
|
|
+i = r.ops.pop();
|
|
|
+r.trys.pop();
|
|
|
+continue;
|
|
|
+
|
|
|
+default:
|
|
|
+if (!(a = r.trys, a = a.length > 0 && a[a.length - 1]) && (6 === i[0] || 2 === i[0])) {
|
|
|
+r = 0;
|
|
|
+continue;
|
|
|
+}
|
|
|
+if (3 === i[0] && (!a || i[1] > a[0] && i[1] < a[3])) {
|
|
|
+r.label = i[1];
|
|
|
+break;
|
|
|
+}
|
|
|
+if (6 === i[0] && r.label < a[1]) {
|
|
|
+r.label = a[1];
|
|
|
+a = i;
|
|
|
+break;
|
|
|
+}
|
|
|
+if (a && r.label < a[2]) {
|
|
|
+r.label = a[2];
|
|
|
+r.ops.push(i);
|
|
|
+break;
|
|
|
+}
|
|
|
+a[2] && r.ops.pop();
|
|
|
+r.trys.pop();
|
|
|
+continue;
|
|
|
+}
|
|
|
+i = e.call(t, r);
|
|
|
+} catch (t) {
|
|
|
+i = [ 6, t ];
|
|
|
+n = 0;
|
|
|
+} finally {
|
|
|
+o = a = 0;
|
|
|
+}
|
|
|
+if (5 & i[0]) throw i[1];
|
|
|
+return {
|
|
|
+value: i[0] ? i[1] : void 0,
|
|
|
+done: !0
|
|
|
+};
|
|
|
+}
|
|
|
};
|
|
|
Object.defineProperty(o, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
-var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
|
|
|
+var 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;
|
|
|
@@ -6238,6 +6364,14 @@ this.loadPart.active = !0;
|
|
|
this.loadAni.play("load", 0);
|
|
|
};
|
|
|
e.prototype.tixianSuccess = function() {
|
|
|
+return r(this, void 0, void 0, function() {
|
|
|
+return c(this, function(t) {
|
|
|
+switch (t.label) {
|
|
|
+case 0:
|
|
|
+return [ 4, mk.time.WaitForSeconds(1) ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+t.sent();
|
|
|
this.loadPart.active = !1;
|
|
|
this.cashPro.active = !0;
|
|
|
mk.tween.move(this.cashPro, .3, cc.v2(1e3, 0), cc.v2(0, 0), function() {
|
|
|
@@ -6246,19 +6380,23 @@ gData.adData.checkShowFullInter(1);
|
|
|
mk.data.setTAEventUser(1, "cash_time", 1);
|
|
|
mk.data.setTAEventUser(1, "cash_total", gData.cashPro.cashPro_money / 100);
|
|
|
this.labMoney.string = "¥" + (gData.cashPro.cashPro_money / 100).toFixed(2);
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+});
|
|
|
+});
|
|
|
};
|
|
|
e.prototype.tixianFail = function() {
|
|
|
console.log("tixianFail ");
|
|
|
this.loadPart.active = !1;
|
|
|
mk.ui.closePanel(this.node.name);
|
|
|
};
|
|
|
-i([ s(cc.Node) ], e.prototype, "loadPart", void 0);
|
|
|
-i([ s(cc.Animation) ], e.prototype, "loadAni", void 0);
|
|
|
-i([ s(cc.Node) ], e.prototype, "cashPro", void 0);
|
|
|
-i([ s(cc.Label) ], e.prototype, "labMoney", void 0);
|
|
|
-return i([ c ], e);
|
|
|
+i([ p(cc.Node) ], e.prototype, "loadPart", void 0);
|
|
|
+i([ p(cc.Animation) ], e.prototype, "loadAni", void 0);
|
|
|
+i([ p(cc.Node) ], e.prototype, "cashPro", void 0);
|
|
|
+i([ p(cc.Label) ], e.prototype, "labMoney", void 0);
|
|
|
+return i([ l ], e);
|
|
|
}(cc.Component);
|
|
|
-o.default = l;
|
|
|
+o.default = u;
|
|
|
cc._RF.pop();
|
|
|
}, {} ],
|
|
|
Certification: [ function(t, e, o) {
|
|
|
@@ -6980,9 +7118,12 @@ configurable: !0
|
|
|
e.prototype.onLoad = function() {};
|
|
|
e.prototype.start = function() {
|
|
|
var t = this;
|
|
|
-this.isDelayOneFrame ? cc.tween(this.effect_par).delay(.16).call(function() {
|
|
|
+if (this.isDelayOneFrame) {
|
|
|
+r.scale && (this.effect_par.opacity = 0);
|
|
|
+cc.tween(this.effect_par).delay(.16).call(function() {
|
|
|
t.showEffect();
|
|
|
-}).start() : this.showEffect();
|
|
|
+}).start();
|
|
|
+} else this.showEffect();
|
|
|
};
|
|
|
e.prototype.showEffect = function() {
|
|
|
if (this.effect_par) switch (this.open_effect) {
|
|
|
@@ -6991,6 +7132,7 @@ break;
|
|
|
|
|
|
case r.scale:
|
|
|
var t = this.effect_par.scale;
|
|
|
+this.effect_par.opacity = 255;
|
|
|
mk.tween.scale(this.effect_par, .3, void 0, t, void 0, "backOut");
|
|
|
break;
|
|
|
|
|
|
@@ -11281,7 +11423,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"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), T = t("./module/NewCashUIData"), R = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), j = 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"), P = t("./module/SettingData"), k = t("./module/GuideData"), O = t("./module/GuideWeakData"), I = t("./ConfigData"), T = t("./module/NewCashUIData"), R = t("../../before/view/data/ADUnlockData"), C = t("../../before/view/data/PlantData"), x = t("../../before/main/FarmSystem"), N = t("../../before/view/data/HarvestData"), F = t("../../before/view/data/ADClearSickData"), M = t("../../before/main/PastureSystem"), j = t("../../before/main/FactorySystem"), B = t("./module/FarmMapData"), L = t("./module/GradeRewardData"), E = t("./module/WalletCashOutData"), U = t("./module/LineUpUIData"), G = function() {
|
|
|
function t() {
|
|
|
this.init();
|
|
|
}
|
|
|
@@ -11316,8 +11458,8 @@ this.adUnlockData = new R.default();
|
|
|
this.plantData = new C.default();
|
|
|
this.harvestData = new N.default();
|
|
|
this.adClearSickData = new F.default();
|
|
|
-this.pastureSystem = new j.default();
|
|
|
-this.factorySystem = new M.default();
|
|
|
+this.pastureSystem = new M.default();
|
|
|
+this.factorySystem = new j.default();
|
|
|
this.farmSystem = new x.FarmSystem();
|
|
|
this.farmMapData = new B.FarmMapData();
|
|
|
this.farmGradeData = new L.GradeRewardData();
|
|
|
@@ -11774,6 +11916,8 @@ this.playerProp.userFarmTaskInfo = t.userFarmTaskInfo;
|
|
|
this.playerProp.speedUpLeftTimes = t.speedUpLeftTimes;
|
|
|
this.playerProp.completeFarmTaskTimes = t.completeFarmTaskTimes;
|
|
|
mk.data.setTAUserID(gData.loginData.uin);
|
|
|
+mk.data.setTAEventUser(0, "logindays_total", this.playerProp.loginDays);
|
|
|
+0 == this.playerProp.completeFarmTaskTimes && mk.data.setTAEventUser(0, "Cumulative_task", gData.gameData.playerProp.completeFarmTaskTimes);
|
|
|
if (gData.loginData.isFirstIn) {
|
|
|
gData.loginData.isFirstIn = !1;
|
|
|
mk.data.setTAEventRegister();
|
|
|
@@ -11941,37 +12085,70 @@ gData.gameData.setNextProduct(!1);
|
|
|
}
|
|
|
};
|
|
|
t.prototype.makeProduct = function() {
|
|
|
-var t = !0;
|
|
|
+return n(this, void 0, void 0, function() {
|
|
|
+var t;
|
|
|
+return a(this, function(e) {
|
|
|
+switch (e.label) {
|
|
|
+case 0:
|
|
|
+t = !0;
|
|
|
switch (this.nextType) {
|
|
|
case 0:
|
|
|
+return [ 3, 1 ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+return [ 3, 2 ];
|
|
|
+
|
|
|
+case 2:
|
|
|
+return [ 3, 4 ];
|
|
|
+
|
|
|
+case 3:
|
|
|
+return [ 3, 6 ];
|
|
|
+}
|
|
|
+return [ 3, 8 ];
|
|
|
+
|
|
|
+case 1:
|
|
|
mk.tip.pop("农场已满,无法继续生产");
|
|
|
t = !1;
|
|
|
-break;
|
|
|
+return [ 3, 8 ];
|
|
|
|
|
|
-case 1:
|
|
|
+case 2:
|
|
|
gData.farmSystem.btnMake();
|
|
|
this.nextMake = null;
|
|
|
this.setNextProduct(!1);
|
|
|
gData.adData.checkPopRed();
|
|
|
-this.updateNewTaskProgress();
|
|
|
-break;
|
|
|
+return [ 4, this.updateNewTaskProgress() ];
|
|
|
|
|
|
-case 2:
|
|
|
+case 3:
|
|
|
+e.sent();
|
|
|
+return [ 3, 8 ];
|
|
|
+
|
|
|
+case 4:
|
|
|
gData.pastureSystem.btnMake();
|
|
|
this.nextMake = null;
|
|
|
this.setNextProduct(!1);
|
|
|
gData.adData.checkPopRed();
|
|
|
-this.updateNewTaskProgress();
|
|
|
-break;
|
|
|
+return [ 4, this.updateNewTaskProgress() ];
|
|
|
|
|
|
-case 3:
|
|
|
+case 5:
|
|
|
+e.sent();
|
|
|
+return [ 3, 8 ];
|
|
|
+
|
|
|
+case 6:
|
|
|
gData.factorySystem.btnMake();
|
|
|
this.nextMake = null;
|
|
|
this.setNextProduct(!1);
|
|
|
gData.adData.checkPopRed();
|
|
|
-this.updateNewTaskProgress();
|
|
|
+return [ 4, this.updateNewTaskProgress() ];
|
|
|
+
|
|
|
+case 7:
|
|
|
+e.sent();
|
|
|
+return [ 3, 8 ];
|
|
|
+
|
|
|
+case 8:
|
|
|
+return [ 2, t ];
|
|
|
}
|
|
|
-return t;
|
|
|
+});
|
|
|
+});
|
|
|
};
|
|
|
t.prototype.updateNewTaskProgress = function(t) {
|
|
|
void 0 === t && (t = !1);
|
|
|
@@ -12426,6 +12603,7 @@ this._redMoney = t;
|
|
|
gData.gameData.init_coin = !0;
|
|
|
gData.gameData.init_wallet_redMoney = !0;
|
|
|
mk.ui.invokeRefreshEventByName("refreshCoin");
|
|
|
+mk.data.setTAEventUser(0, "current_redmoney_stock", this._redMoney);
|
|
|
},
|
|
|
enumerable: !1,
|
|
|
configurable: !0
|
|
|
@@ -12510,14 +12688,10 @@ 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.interstitial2_init = "interstitial2_init";
|
|
|
-t.interstitial2_click = "interstitial2_click";
|
|
|
+t.Ad_click = "Ad_click";
|
|
|
t.interstitial2_end = "interstitial2_end";
|
|
|
-t.interstitial1_click = "interstitial1_click";
|
|
|
-t.banner_click = "banner_click";
|
|
|
-t.splash_click = "splash_click";
|
|
|
t.fudaiFunction = "fudaiFunction";
|
|
|
t.hutuiFunction = "hutuiFunction";
|
|
|
t.ad_videoEcpm = "ad_video";
|
|
|
@@ -12930,7 +13104,6 @@ this.ani_add.node.active = !1;
|
|
|
gData.gameData.gameStyle = this;
|
|
|
this.span = 6e4 * gData.gameData.ProductionRecovery;
|
|
|
gData.gameData.checkGradeUpUnLock();
|
|
|
-this.loadMain();
|
|
|
this.registerCallBack();
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
@@ -13027,6 +13200,7 @@ if (gData.gameData.playerProp.userFarmTaskInfo) {
|
|
|
var t = gData.gameData.playerProp.userFarmTaskInfo.completeCount, e = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
|
|
|
this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#D73D25>(" + t + "/" + e + ")</color></b>";
|
|
|
this.node_hand.active = t >= e;
|
|
|
+gData.gameData.playerProp.completeFarmTaskTimes < 1 && mk.tip.pop("百元红包进度+1");
|
|
|
}
|
|
|
gData.gameData.init_task = !1;
|
|
|
};
|
|
|
@@ -13170,22 +13344,43 @@ e.prototype.onClickTask = function() {
|
|
|
mk.data.sendDataEvent(l.DataEventId.button_click, "任务红包icon");
|
|
|
};
|
|
|
e.prototype.onClickPlant = function() {
|
|
|
+return r(this, void 0, void 0, function() {
|
|
|
+var t, e;
|
|
|
+return c(this, function(o) {
|
|
|
+switch (o.label) {
|
|
|
+case 0:
|
|
|
mk.audio.playEffect("button");
|
|
|
-if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (gData.gameData.isProducting) mk.tip.pop("点击太快了"); else {
|
|
|
-var t = gData.gameData.makeProduct();
|
|
|
+if (gData.gameData.leftTimes <= 0) {
|
|
|
+mk.ui.openPanel("module/speedUpUI/productReward");
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+if (gData.gameData.isProducting) {
|
|
|
+mk.tip.pop("点击太快了");
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+return [ 4, gData.gameData.makeProduct() ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+t = o.sent();
|
|
|
gData.gameData.playerProp.gradeLevel < 2 && mk.tip.pop("生产次数+1");
|
|
|
if (t) {
|
|
|
-var e = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
|
|
|
+e = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
|
|
|
mk.fly.PlayCoinAnim(1, 3, this.btn_product, e, function() {
|
|
|
gData.gameData.init_task = !0;
|
|
|
}, .8);
|
|
|
}
|
|
|
+return [ 2 ];
|
|
|
}
|
|
|
+});
|
|
|
+});
|
|
|
};
|
|
|
e.prototype.doFlyExpAni = function(t, e, o) {
|
|
|
var n = this, a = this.lbl_farmLevel.node.parent.convertToWorldSpaceAR(this.lbl_farmLevel.node.getPosition());
|
|
|
mk.fly.PlayCoinAnim(2, 3, e, a, function() {
|
|
|
-gData.gameData.playerProp.gradeLevel < o.farmLevel && (gData.gameData.playerProp.gradeLevel = o.farmLevel);
|
|
|
+if (gData.gameData.playerProp.gradeLevel < o.farmLevel) {
|
|
|
+gData.gameData.playerProp.gradeLevel = o.farmLevel;
|
|
|
+mk.data.setTAEventUser(0, "farm_lv", gData.gameData.playerProp.gradeLevel);
|
|
|
+}
|
|
|
gData.gameData.playerProp.farmExpValue = o.userExp;
|
|
|
gData.gameData.playerProp.farmGradeData = o.userFarmGrageRewardInfo;
|
|
|
gData.gameData.init_red_point = !0;
|
|
|
@@ -16231,7 +16426,7 @@ mk.storage.setStorage("ad_openEcpm", n);
|
|
|
n <= 300 && (n <= 50 ? mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price) : n % 10 == 0 && mk.data.sendDataEventValue(a.DataEventId.ad_openEcpm, "ad_video_ecpm" + n, o.adsource_price));
|
|
|
};
|
|
|
t.clickSplash = function() {
|
|
|
-mk.data.sendDataEvent(a.DataEventId.splash_click, "splash_click");
|
|
|
+mk.data.sendDataEvent(a.DataEventId.Ad_click, "splash_click");
|
|
|
};
|
|
|
t.getAliRiskDeviceToken = function() {
|
|
|
var t = "";
|
|
|
@@ -16378,11 +16573,14 @@ t ? n(t) : o(e);
|
|
|
});
|
|
|
});
|
|
|
};
|
|
|
-t.prototype.load = function(t, e) {
|
|
|
-return new Promise(function(o, n) {
|
|
|
-cc.resources.load(t, e, function() {}, function(t, e) {
|
|
|
+t.prototype.load = function(t, e, o) {
|
|
|
+void 0 === o && (o = null);
|
|
|
+return new Promise(function(n, a) {
|
|
|
+cc.resources.load(t, e, function(t, e) {
|
|
|
+o && o(t / e * 100);
|
|
|
+}, function(t, e) {
|
|
|
void 0 === t && (t = null);
|
|
|
-t ? n(t) : o(e);
|
|
|
+t ? a(t) : n(e);
|
|
|
});
|
|
|
});
|
|
|
};
|
|
|
@@ -17113,24 +17311,43 @@ e.lbl_progress = null;
|
|
|
e.node_load = null;
|
|
|
e.lbl_server = null;
|
|
|
e.lbl_privacy = null;
|
|
|
+e.node_loadPart = null;
|
|
|
+e.node_btnLogin = null;
|
|
|
e.process = 0;
|
|
|
e.hotUpdatePanel = null;
|
|
|
e.hasDeviceBackInit = !1;
|
|
|
e.hasCheckAnti = !1;
|
|
|
e.hasCheckPermission = !1;
|
|
|
e.hasCheckPrivacy = !1;
|
|
|
+e.loadSceneState = !1;
|
|
|
+e.coreGame = null;
|
|
|
+e.cool = !1;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.onLoad = function() {
|
|
|
this.lbl_progress.node.active = !1;
|
|
|
this.node_load.active = !0;
|
|
|
+this.node_loadPart.active = !0;
|
|
|
+this.node_btnLogin.active = !1;
|
|
|
this.setProgress(0);
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
-if (1 != mk.storage.getStorage("alifengkong")) {
|
|
|
+return r(this, void 0, void 0, function() {
|
|
|
+var t;
|
|
|
+return c(this, function(e) {
|
|
|
+switch (e.label) {
|
|
|
+case 0:
|
|
|
+if (1 == mk.storage.getStorage("alifengkong")) return [ 2 ];
|
|
|
mk.aliRiskManager.init();
|
|
|
-mk.loader.preload("game/coregame/coregame", cc.Prefab);
|
|
|
+t = this;
|
|
|
+return [ 4, mk.loader.load("game/coregame/coregame", cc.Prefab) ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+t.coreGame = e.sent();
|
|
|
+return [ 2 ];
|
|
|
}
|
|
|
+});
|
|
|
+});
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
if (!this.hasDeviceBackInit) {
|
|
|
@@ -17160,19 +17377,23 @@ this.checkShowIdentification();
|
|
|
}
|
|
|
if (!gData.loginData.passAnti) return;
|
|
|
}
|
|
|
-if (this.process < 100) {
|
|
|
-this.process += 2;
|
|
|
-this.setProgress(this.process);
|
|
|
+if (!this.loadSceneState) {
|
|
|
+this.loadSceneState = !0;
|
|
|
+this.loadMain();
|
|
|
}
|
|
|
if (gData.loginData.loadResCompelete) {
|
|
|
if (mk.aliRiskManager.getRiskCode) {
|
|
|
mk.aliRiskManager.getRiskCode = !1;
|
|
|
this.login();
|
|
|
-} else if (gData.gameData.dataFinish) {
|
|
|
-var t = cc.find("Canvas/主界面层");
|
|
|
-mk.ui.openPanel("game/prefab/game", p.OpenActionType.closeOther, t);
|
|
|
+} else if (gData.gameData.dataFinish && this.coreGame) {
|
|
|
+if (gData.loginData.isAuth) {
|
|
|
+this.addToScene();
|
|
|
console.log("===[Jsbsystem 显示开屏广告================================");
|
|
|
mk.ad.ifShowAd && l.default.showSplash();
|
|
|
+} else {
|
|
|
+this.node_loadPart.active = !1;
|
|
|
+this.node_btnLogin.active = !0;
|
|
|
+}
|
|
|
gData.gameData.dataFinish = !1;
|
|
|
}
|
|
|
} else gData.loginData.loadLocalRes();
|
|
|
@@ -17185,12 +17406,36 @@ this.node_load.active = !1;
|
|
|
this.setProgress(100 * gData.appData.updatePercent);
|
|
|
}
|
|
|
};
|
|
|
+e.prototype.loadMain = function() {
|
|
|
+return r(this, void 0, void 0, function() {
|
|
|
+var t;
|
|
|
+return c(this, function(e) {
|
|
|
+switch (e.label) {
|
|
|
+case 0:
|
|
|
+t = this;
|
|
|
+return [ 4, mk.loader.load("game/coregame/coregame", cc.Prefab, this.setProgress.bind(this)) ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+t.coreGame = e.sent();
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+});
|
|
|
+});
|
|
|
+};
|
|
|
+e.prototype.addToScene = function() {
|
|
|
+var t = cc.find("Canvas/主容器"), e = cc.find("Canvas/主界面层");
|
|
|
+mk.ui.openPanel("game/prefab/game", p.OpenActionType.closeOther, e);
|
|
|
+t.addChild(cc.instantiate(this.coreGame));
|
|
|
+};
|
|
|
e.prototype.checkPrivacy = function() {
|
|
|
1 != mk.storage.getStorage("agreementTip") ? mk.ui.openPanel("module/login/agreementTip") : gData.loginData.passPrivacy = !0;
|
|
|
};
|
|
|
e.prototype.setProgress = function(t) {
|
|
|
-this.bar.fillRange = t / 100;
|
|
|
+var e = t / 100;
|
|
|
+if (e > this.bar.fillRange) {
|
|
|
+this.bar.fillRange = e;
|
|
|
this.lbl_progress.string = "加载中 " + t + "%";
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.getDeviceInfoBack = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
@@ -17324,6 +17569,17 @@ return [ 2 ];
|
|
|
e.prototype.checkShowIdentification = function() {
|
|
|
1 == mk.storage.getStorage("identification") ? gData.loginData.passAnti = !0 : mk.ui.openPanel("module/certification/CertificationNode");
|
|
|
};
|
|
|
+e.prototype.clickLogin = function() {
|
|
|
+var t = this;
|
|
|
+mk.audio.playEffect("button");
|
|
|
+if (!this.cool) {
|
|
|
+this.cool = !0;
|
|
|
+this.scheduleOnce(function() {
|
|
|
+t.cool = !1;
|
|
|
+}, 2);
|
|
|
+l.default.WxAuth();
|
|
|
+}
|
|
|
+};
|
|
|
i([ y(cc.Sprite) ], e.prototype, "bar", void 0);
|
|
|
i([ y({
|
|
|
displayName: "更新文本",
|
|
|
@@ -17341,6 +17597,14 @@ i([ y({
|
|
|
displayName: "隐私协议",
|
|
|
type: cc.Label
|
|
|
}) ], e.prototype, "lbl_privacy", void 0);
|
|
|
+i([ y({
|
|
|
+displayName: "加载部分",
|
|
|
+type: cc.Node
|
|
|
+}) ], e.prototype, "node_loadPart", void 0);
|
|
|
+i([ y({
|
|
|
+displayName: "登录按钮",
|
|
|
+type: cc.Node
|
|
|
+}) ], e.prototype, "node_btnLogin", void 0);
|
|
|
return i([ f ], e);
|
|
|
}(cc.Component);
|
|
|
o.default = g;
|
|
|
@@ -17769,6 +18033,7 @@ function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
e.map = null;
|
|
|
e.canvas = null;
|
|
|
+e.onScale = !1;
|
|
|
e.tarScale = 1.5;
|
|
|
e.isDoubleTouch = !1;
|
|
|
return e;
|
|
|
@@ -17779,6 +18044,12 @@ this.node.on(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
|
|
|
this.map.scale = 1.2;
|
|
|
this.node.setPosition(cc.v2(72, 348));
|
|
|
};
|
|
|
+e.prototype.onEnable = function() {
|
|
|
+var t = this;
|
|
|
+this.scheduleOnce(function() {
|
|
|
+t.onScale = !0;
|
|
|
+}, .3);
|
|
|
+};
|
|
|
e.prototype.onDestroy = function() {
|
|
|
this.node.off(cc.Node.EventType.TOUCH_START, this.onMapTouchBegin, this);
|
|
|
};
|
|
|
@@ -17810,9 +18081,11 @@ this.node.off(cc.Node.EventType.TOUCH_CANCEL, this.onTouchEnd, this);
|
|
|
this.isDoubleTouch = !1;
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
+if (this.onScale) {
|
|
|
var t = this.map.scale;
|
|
|
t < this.tarScale ? (t += .005) >= this.tarScale && (t = this.tarScale) : (t -= .005) <= this.tarScale && (t = this.tarScale);
|
|
|
this.map.scale = t;
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.move = function(t) {
|
|
|
this.startPoint = cc.Vec2.ZERO;
|
|
|
@@ -23220,7 +23493,7 @@ done: !0
|
|
|
Object.defineProperty(o, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
-var s = t("../../../before/util/Util"), l = t("../../component/SetGray"), p = t("../../data/GameData"), u = cc._decorator, d = u.ccclass, h = u.property, f = function(t) {
|
|
|
+var s = t("../../../before/util/Util"), l = t("../../../mk/system/JsbSystem"), p = t("../../component/SetGray"), u = t("../../data/GameData"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
|
|
|
a(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
@@ -23268,7 +23541,7 @@ this.lbl_Ani.node.active = !0;
|
|
|
gData.gameData.init_task = !0;
|
|
|
};
|
|
|
e.prototype.onEnable = function() {
|
|
|
-mk.ad.showBanner(p.BannerAdType.banner_click_2);
|
|
|
+mk.ad.showBanner(u.BannerAdType.banner_click_2);
|
|
|
};
|
|
|
e.prototype.onDisable = function() {
|
|
|
mk.ui.removeRefreshEvent(this);
|
|
|
@@ -23351,7 +23624,7 @@ t.lbl_taskProgress.string = e + "/" + o;
|
|
|
t.lbl_taskProgress.string = e + "/" + o;
|
|
|
}).start();
|
|
|
this.lbl_taskNum.string = o.toString();
|
|
|
-var a = this.openBtn_ani.getComponent(l.default);
|
|
|
+var a = this.openBtn_ani.getComponent(p.default);
|
|
|
if (a && e < o) {
|
|
|
a.setGray(!0);
|
|
|
this.openBtn_ani.getComponent(cc.Button).interactable = !1;
|
|
|
@@ -23389,7 +23662,13 @@ t >= o.redMoney ? this.node_cash.play() : this.node_cash.stop();
|
|
|
e.prototype.clickVideoBtn = function() {};
|
|
|
e.prototype.clickGetRewardBtn = function() {
|
|
|
mk.audio.playEffect("button");
|
|
|
-this.isCanCash && this.httpCashOut();
|
|
|
+if (this.isCanCash) {
|
|
|
+if (cc.sys.isNative && !gData.loginData.isAuth) {
|
|
|
+l.default.WxAuth();
|
|
|
+return;
|
|
|
+}
|
|
|
+this.httpCashOut();
|
|
|
+} else mk.tip.pop("完成任务即可提现");
|
|
|
};
|
|
|
e.prototype.httpCashOut = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
@@ -23410,15 +23689,17 @@ return [ 2, null ];
|
|
|
}
|
|
|
gData.gameData.playerProp.userFarmTaskInfo = e.data.userFarmTaskInfo;
|
|
|
gData.gameData.playerProp.completeFarmTaskTimes = e.data.completeFarmTaskTimes;
|
|
|
+mk.data.setTAEventUser(0, "Cumulative_task", gData.gameData.playerProp.completeFarmTaskTimes);
|
|
|
gData.gameData.checkGradeUpUnLock();
|
|
|
gData.gameData.init_task = !0;
|
|
|
this.maxNum = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
|
|
|
this.num = 0;
|
|
|
this.delayTime = 0;
|
|
|
this.times = 0;
|
|
|
+mk.ui.closePanel(this.node.name);
|
|
|
gData.cashPro.cashPro_money = e.data.cashMoney;
|
|
|
gData.cashPro.init_success = !0;
|
|
|
-mk.data.sendDataEvent(p.DataEventId.Sundry, "任务红包提现成功");
|
|
|
+mk.data.sendDataEvent(u.DataEventId.Sundry, "任务红包提现成功");
|
|
|
gData.adData.checkPopCashFull();
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -23433,50 +23714,51 @@ mk.ui.openPanel("module/newCashUI/walletCashOut");
|
|
|
e.prototype.clickCloseBtn = function() {
|
|
|
mk.audio.playEffect("closeButton");
|
|
|
};
|
|
|
-i([ h({
|
|
|
+i([ f({
|
|
|
displayName: "数字组",
|
|
|
type: cc.Label
|
|
|
}) ], e.prototype, "lbl_value", void 0);
|
|
|
-i([ h({
|
|
|
+i([ f({
|
|
|
displayName: "任务进度条",
|
|
|
type: cc.Sprite
|
|
|
}) ], e.prototype, "sp_taskProgress", void 0);
|
|
|
-i([ h({
|
|
|
+i([ f({
|
|
|
displayName: "任务进度文本",
|
|
|
type: cc.Label
|
|
|
}) ], e.prototype, "lbl_taskProgress", void 0);
|
|
|
-i([ h({
|
|
|
+i([ f({
|
|
|
displayName: "按钮动画",
|
|
|
type: cc.Animation
|
|
|
}) ], e.prototype, "openBtn_ani", void 0);
|
|
|
-i([ h(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
|
|
|
-i([ h(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
|
|
|
-i([ h(cc.Label) ], e.prototype, "lbl_progress", void 0);
|
|
|
-i([ h(cc.Animation) ], e.prototype, "node_cash", void 0);
|
|
|
-i([ h({
|
|
|
+i([ f(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
|
|
|
+i([ f(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
|
|
|
+i([ f(cc.Label) ], e.prototype, "lbl_progress", void 0);
|
|
|
+i([ f(cc.Animation) ], e.prototype, "node_cash", void 0);
|
|
|
+i([ f({
|
|
|
type: cc.Node,
|
|
|
displayName: "显示金额节点"
|
|
|
}) ], e.prototype, "node_value", void 0);
|
|
|
-i([ h({
|
|
|
+i([ f({
|
|
|
type: cc.Node,
|
|
|
displayName: "任务节点"
|
|
|
}) ], e.prototype, "node_task", void 0);
|
|
|
-i([ h({
|
|
|
+i([ f({
|
|
|
type: cc.Label,
|
|
|
displayName: "动画显示文字"
|
|
|
}) ], e.prototype, "lbl_Ani", void 0);
|
|
|
-i([ h({
|
|
|
+i([ f({
|
|
|
type: cc.Label,
|
|
|
displayName: "任务数量"
|
|
|
}) ], e.prototype, "lbl_taskNum", void 0);
|
|
|
-i([ h(cc.Node) ], e.prototype, "node_videoIcon", void 0);
|
|
|
-i([ h(cc.Node) ], e.prototype, "node_hand", void 0);
|
|
|
-return i([ d ], e);
|
|
|
+i([ f(cc.Node) ], e.prototype, "node_videoIcon", void 0);
|
|
|
+i([ f(cc.Node) ], e.prototype, "node_hand", void 0);
|
|
|
+return i([ h ], e);
|
|
|
}(cc.Component);
|
|
|
-o.default = f;
|
|
|
+o.default = y;
|
|
|
cc._RF.pop();
|
|
|
}, {
|
|
|
"../../../before/util/Util": "Util",
|
|
|
+"../../../mk/system/JsbSystem": "JsbSystem",
|
|
|
"../../component/SetGray": "SetGray",
|
|
|
"../../data/GameData": "GameData"
|
|
|
} ],
|
|
|
@@ -24455,6 +24737,7 @@ e.node_cash = null;
|
|
|
e.node_newRedBag = null;
|
|
|
e.lbl_reward_num = null;
|
|
|
e.node_hb = null;
|
|
|
+e.lbl_des = null;
|
|
|
e.cur_stage = s.none;
|
|
|
return e;
|
|
|
}
|
|
|
@@ -24520,8 +24803,11 @@ n.spriteFrame = i.sent();
|
|
|
gData.reward.data[0].rewardType === l.RewardType.productTimes ? this.node_hb.node.scale = .5 : this.node_hb.node.scale = 1;
|
|
|
a = gData.reward.data[0].rewardNum || 0;
|
|
|
if (gData.reward.data[0].rewardType === l.RewardType.pigRmb) ; else {
|
|
|
-gData.reward.data[0].rewardType != l.RewardType.productTimes && (a /= 100);
|
|
|
-this.lbl_reward_num.string = "x" + a;
|
|
|
+if (gData.reward.data[0].rewardType != l.RewardType.productTimes) {
|
|
|
+a = Math.round(a / 100);
|
|
|
+this.lbl_des.string = "红包币";
|
|
|
+} else this.lbl_des.string = "生产次数";
|
|
|
+this.lbl_reward_num.string = "+" + a;
|
|
|
}
|
|
|
gData.reward.data[0].rewardType === l.RewardType.redBag && (gData.reward.add_redbag_value = gData.reward.data[0].rewardNum);
|
|
|
return [ 2 ];
|
|
|
@@ -24538,7 +24824,6 @@ gData.reward.callback();
|
|
|
gData.reward.callback = null;
|
|
|
}
|
|
|
this.onClickClose();
|
|
|
-0 == gData.gameData.getProp(l.GameProp.videoTimes) && mk.data.sendXYEvent("guide_receive", "新手引导领取2500红包币");
|
|
|
};
|
|
|
e.prototype.clickCashOut = function() {
|
|
|
gData.reward.addReward();
|
|
|
@@ -24579,6 +24864,10 @@ i([ d({
|
|
|
displayName: "红包节点",
|
|
|
type: cc.Sprite
|
|
|
}) ], e.prototype, "node_hb", void 0);
|
|
|
+i([ d({
|
|
|
+displayName: "描述",
|
|
|
+type: cc.Label
|
|
|
+}) ], e.prototype, "lbl_des", void 0);
|
|
|
return i([ u ], e);
|
|
|
}(cc.Component);
|
|
|
o.default = h;
|
|
|
@@ -25516,6 +25805,7 @@ case 0:
|
|
|
cc.log("签到奖励", gData.sign.adData);
|
|
|
gData.gameData.playerProp.signInDay++;
|
|
|
gData.gameData.playerProp.isSignInToday = 1;
|
|
|
+mk.data.setTAEventUser(0, "sign_total", gData.gameData.playerProp.signInDay);
|
|
|
if ((t = this.c_sign[gData.gameData.playerProp.signInDay - 1]).rewardType !== l.RewardType.redBag) return [ 3, 1 ];
|
|
|
gData.reward.adData = gData.sign.adData;
|
|
|
mk.ui.openPanel("module/reward/reward", s.OpenActionType.closeLast);
|
|
|
@@ -28712,7 +29002,7 @@ e.perMinus = 0;
|
|
|
e.act_rotate = null;
|
|
|
return e;
|
|
|
}
|
|
|
-e.prototype.onLoad = function() {
|
|
|
+e.prototype.start = function() {
|
|
|
this.baozhaAni.node.active = !1;
|
|
|
this.node_point.active = !1;
|
|
|
this.initData();
|
|
|
@@ -28793,6 +29083,7 @@ return [ 4, mk.time.WaitForSeconds(.7) ];
|
|
|
case 1:
|
|
|
t.sent();
|
|
|
mk.ui.openPanel("module/reward/reward");
|
|
|
+mk.data.setTAEventUser(1, "turntable_total", 1);
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -31200,6 +31491,7 @@ return [ 2 ];
|
|
|
e.prototype.clickAgree = function() {
|
|
|
mk.storage.setStorage("agreementTip", 1);
|
|
|
gData.loginData.passPrivacy = !0;
|
|
|
+mk.ui.closePanel(this.node.name);
|
|
|
};
|
|
|
return i([ l ], e);
|
|
|
}(cc.Component));
|