|
|
@@ -16259,17 +16259,18 @@ return [ 2 ];
|
|
|
});
|
|
|
};
|
|
|
e.prototype.doFlyOrderAni = function(t, e) {
|
|
|
+var a = this;
|
|
|
void 0 === e && (e = null);
|
|
|
-var a = gData.gameData.playerProp.orderData;
|
|
|
-if (a) {
|
|
|
-for (var o = !0, n = a.orderTaskList.length, i = 0; i != n; ++i) {
|
|
|
-var r = a.orderTaskList;
|
|
|
-if (r[i].completeCount < r[i].taskCount) {
|
|
|
-o = !1;
|
|
|
+var o = gData.gameData.playerProp.orderData;
|
|
|
+if (o) {
|
|
|
+for (var n = !0, i = o.orderTaskList.length, r = 0; r != i; ++r) {
|
|
|
+var s = o.orderTaskList;
|
|
|
+if (s[r].completeCount < s[r].taskCount) {
|
|
|
+n = !1;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-if (o) {
|
|
|
+if (n) {
|
|
|
this.isGray = !1;
|
|
|
this.node_getOrderReward.setGray(!1, !0);
|
|
|
this.node_getOrderReward.getComponent(cc.Animation).play();
|
|
|
@@ -16278,11 +16279,23 @@ mk.ui.closeAllUI();
|
|
|
"1" == gData.gameData.funOpenData[11] && mk.guide.open(12) || mk.tip.pop("订单已完成，快提现吧!");
|
|
|
}
|
|
|
if (e) {
|
|
|
-var s = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
|
|
|
-mk.fly.PlayCoinAnim(1, 5, e, s, function() {}, .8);
|
|
|
+var c = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
|
|
|
+mk.fly.PlayCoinAnim(1, 5, e, c, function() {
|
|
|
+1 == gData.gameData.orderRewardType && cc.tween(a.node_showRedMoney).to(.1, {
|
|
|
+scale: 1.3
|
|
|
+}).to(.1, {
|
|
|
+scale: 1
|
|
|
+}).start();
|
|
|
+}, .8);
|
|
|
} else {
|
|
|
-s = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
|
|
|
-mk.fly.PlayCoinAnim(1, 5, this.btn_product, s, function() {}, .8);
|
|
|
+c = this.node_orderHb.parent.convertToWorldSpaceAR(this.node_orderHb.getPosition());
|
|
|
+mk.fly.PlayCoinAnim(1, 5, this.btn_product, c, function() {
|
|
|
+1 == gData.gameData.orderRewardType && cc.tween(a.node_showRedMoney).to(.1, {
|
|
|
+scale: 1.3
|
|
|
+}).to(.1, {
|
|
|
+scale: 1
|
|
|
+}).start();
|
|
|
+}, .8);
|
|
|
}
|
|
|
this.refreshOrderUI(t);
|
|
|
}
|
|
|
@@ -17445,13 +17458,13 @@ Object.defineProperty(a, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
a.GuideData = void 0;
|
|
|
-var i = function() {
|
|
|
+var i = t("../../module/guide/GuideVO"), r = function() {
|
|
|
function t() {
|
|
|
this.crtID = null;
|
|
|
}
|
|
|
t.prototype.init = function() {
|
|
|
return o(this, void 0, void 0, function() {
|
|
|
-var t, e, a, o, i, r, s, c;
|
|
|
+var t, e, a, o, r, s, c, l;
|
|
|
return n(this, function(n) {
|
|
|
switch (n.label) {
|
|
|
case 0:
|
|
|
@@ -17466,33 +17479,33 @@ case 2:
|
|
|
this.data = new Map();
|
|
|
a = [];
|
|
|
o = 1;
|
|
|
-for (i = 0; i < t.length; i++) {
|
|
|
-r = {};
|
|
|
-s = t[i];
|
|
|
-c = s.id.split("_");
|
|
|
-r.id = parseInt(c[0]);
|
|
|
-r.step = parseInt(c[1]);
|
|
|
-r.trigger = s.trigger;
|
|
|
-r.tr_num = s.trNum;
|
|
|
-r.btnEnable = s.btnEnable;
|
|
|
-r.tr_form = s.trForm;
|
|
|
-r.dialog = s.dialog;
|
|
|
-r.dialog_pos = s.dialogPos;
|
|
|
-r.dialog_pos1 = s.dialogPos1;
|
|
|
-r.dialog_alignment = s.dialogAlignment;
|
|
|
-r.display_rect = s.displayRect;
|
|
|
-r.click_rect = s.clickRect;
|
|
|
-r.finger = s.finger;
|
|
|
-r.lag_next = parseFloat(s.lagNext);
|
|
|
-r.display_type = parseInt(s.trNum);
|
|
|
-r.continue = s.continue;
|
|
|
-r.isShowSkip = s.isShowSkip;
|
|
|
-if (o != r.id) {
|
|
|
+for (r = 0; r < t.length; r++) {
|
|
|
+s = new i.default();
|
|
|
+c = t[r];
|
|
|
+l = c.id.split("_");
|
|
|
+s.id = parseInt(l[0]);
|
|
|
+s.step = parseInt(l[1]);
|
|
|
+s.trigger = c.trigger;
|
|
|
+s.tr_num = c.trNum;
|
|
|
+s.btnEnable = c.btnEnable;
|
|
|
+s.tr_form = c.trForm;
|
|
|
+s.dialog = c.dialog;
|
|
|
+s.dialog_pos = c.dialogPos;
|
|
|
+s.dialog_pos1 = c.dialogPos1;
|
|
|
+s.dialog_alignment = c.dialogAlignment;
|
|
|
+s.display_rect = c.displayRect;
|
|
|
+s.click_rect = c.clickRect;
|
|
|
+s.finger = c.finger;
|
|
|
+s.lag_next = parseFloat(c.lagNext);
|
|
|
+s.display_type = parseInt(c.trNum);
|
|
|
+s.continue = c.continue;
|
|
|
+s.isShowSkip = c.isShowSkip;
|
|
|
+if (o != s.id) {
|
|
|
this.data.set(o, a);
|
|
|
a = [];
|
|
|
-o = r.id;
|
|
|
+o = s.id;
|
|
|
}
|
|
|
-a.push(r);
|
|
|
+a.push(s);
|
|
|
}
|
|
|
this.data.set(o, a);
|
|
|
return [ 2 ];
|
|
|
@@ -17505,9 +17518,11 @@ return this.data.get(t);
|
|
|
};
|
|
|
return t;
|
|
|
}();
|
|
|
-a.GuideData = i;
|
|
|
+a.GuideData = r;
|
|
|
cc._RF.pop();
|
|
|
-}, {} ],
|
|
|
+}, {
|
|
|
+"../../module/guide/GuideVO": "GuideVO"
|
|
|
+} ],
|
|
|
GuideSystem: [ function(t, e, a) {
|
|
|
"use strict";
|
|
|
cc._RF.push(e, "ccad7HVXppOw6s55udVONoH", "GuideSystem");
|
|
|
@@ -17576,7 +17591,7 @@ value: !0
|
|
|
a.default = function() {
|
|
|
this.display_type = 0;
|
|
|
this.continue = null;
|
|
|
-this.isShowSkip = null;
|
|
|
+this.isShowSkip = "true";
|
|
|
};
|
|
|
cc._RF.pop();
|
|
|
}, {} ],
|
|
|
@@ -17894,7 +17909,7 @@ this.crtStep++;
|
|
|
this.crtGuide = this.guides[this.crtStep];
|
|
|
mk.guide.curGuideIdStr = gData.guideData.crtID + "_" + this.crtStep;
|
|
|
this.updateGuide();
|
|
|
-"true" == this.crtGuide.isShowSkip ? this.node_skip.active = !0 : this.node_skip.active = !1;
|
|
|
+this.crtGuide && "true" == this.crtGuide.isShowSkip ? this.node_skip.active = !0 : this.node_skip.active = !1;
|
|
|
mk.data.sendDataEvent(c.DataEventId.guide, "新手引导第" + gData.guideData.crtID + "_" + this.crtStep + "步完成");
|
|
|
};
|
|
|
e.prototype.updateGuide = function() {
|
|
|
@@ -18926,7 +18941,7 @@ e.node_fly = null;
|
|
|
e.node_des = null;
|
|
|
e.node_hide = null;
|
|
|
e.callBack = null;
|
|
|
-e.node_describ = null;
|
|
|
+e.lbl_value = null;
|
|
|
e.node_icon_1 = null;
|
|
|
e.node_icon_2 = null;
|
|
|
e.iconPath = "game/coregame/texture/plant_icons/plantIcon_";
|
|
|
@@ -18958,12 +18973,14 @@ mk.event.register("flyOrderAni", this.doFlyAni.bind(this), this);
|
|
|
e.prototype.onEnable = function() {
|
|
|
var t = gData.gameData.playerProp.orderData, e = gData.gameData.configs.Product, a = t.orderTaskList[this.index];
|
|
|
this.realyPicture = e[a.Id - 1].picture;
|
|
|
+this.lbl_value && (this.lbl_value.string = t.redMoneyAddition / 100 + "");
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
if (this.delay <= 0 && !this.isFinish) {
|
|
|
-if (!this.isDoAct && this.node_describ) {
|
|
|
+if (!this.isDoAct && this.lbl_value) {
|
|
|
this.isDoAct = !0;
|
|
|
-cc.tween(this.node_describ).to(.3, {
|
|
|
+var t = this.lbl_value.node.parent;
|
|
|
+cc.tween(t).to(.3, {
|
|
|
scale: 1.4
|
|
|
}).to(.3, {
|
|
|
scale: 1
|
|
|
@@ -18974,8 +18991,8 @@ if (this.node_icon_1.position.y <= -this.distance) {
|
|
|
++this.times;
|
|
|
if (this.times > this.maxShowTimes) if (4 != this.speed) {
|
|
|
++this.sss;
|
|
|
-var t = 2 + .4 * this.sss;
|
|
|
-this.speed -= t;
|
|
|
+var e = 2 + .4 * this.sss;
|
|
|
+this.speed -= e;
|
|
|
if (this.speed < 4) {
|
|
|
this.speed = 4;
|
|
|
++this.slowSpeedRefreshTimes;
|
|
|
@@ -19124,8 +19141,8 @@ type: cc.Component.EventHandler
|
|
|
}) ], e.prototype, "callBack", void 0);
|
|
|
i([ u({
|
|
|
displayName: "文字节点",
|
|
|
-type: cc.Node
|
|
|
-}) ], e.prototype, "node_describ", void 0);
|
|
|
+type: cc.Label
|
|
|
+}) ], e.prototype, "lbl_value", void 0);
|
|
|
return i([ p ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = d;
|
|
|
@@ -19369,7 +19386,7 @@ value: !0
|
|
|
a.ServerUrl = a.HttpData = void 0;
|
|
|
var o, n = function() {
|
|
|
function t() {
|
|
|
-this.serverType = 0;
|
|
|
+this.serverType = 1;
|
|
|
}
|
|
|
t.prototype.getServerUrl = function() {
|
|
|
switch (this.serverType) {
|
|
|
@@ -20714,7 +20731,7 @@ value: !0
|
|
|
a.LogTagColor = void 0;
|
|
|
var n, i = function() {
|
|
|
function t() {
|
|
|
-this.ifShowLog = !0;
|
|
|
+this.ifShowLog = !1;
|
|
|
this._tagChar = "...";
|
|
|
this._frontChar = " ";
|
|
|
this._keyValueChar = " = ";
|
