|
|
@@ -16920,17 +16920,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();
|
|
|
@@ -16939,11 +16940,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);
|
|
|
}
|
|
|
@@ -18581,7 +18594,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() {
|
|
|
@@ -19613,7 +19626,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_";
|
|
|
@@ -19645,12 +19658,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
|
|
|
@@ -19661,8 +19676,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;
|
|
|
@@ -19811,8 +19826,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;
|
|
|
@@ -20056,7 +20071,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) {
|
|
|
@@ -21485,7 +21500,7 @@ return e;
|
|
|
}
|
|
|
return e;
|
|
|
};
|
|
|
-t.ifShowLog = !1;
|
|
|
+t.ifShowLog = !0;
|
|
|
return t;
|
|
|
}();
|
|
|
a.default = i;
|
