|
|
@@ -2112,7 +2112,7 @@ this.appId = "wxcf31f0e54f7fefda";
|
|
|
this.umengChannel = "";
|
|
|
this.deviceType = "";
|
|
|
this.androidVersion = "";
|
|
|
-this.mac = "1e:03:e4:13:b3:23,f6:60:e4:1a:b7:27";
|
|
|
+this.mac = "1e:06:e5:13:b3:23,f6:60:e4:1a:b7:27";
|
|
|
this.machineInfo = {
|
|
|
android_id: "",
|
|
|
idfa: "",
|
|
|
@@ -4331,6 +4331,7 @@ i(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
e.list_data = [];
|
|
|
+e.update_list = !1;
|
|
|
e.init_rmb_style = !0;
|
|
|
e._receip_total_rmb = 0;
|
|
|
e.cash_type = {
|
|
|
@@ -4370,6 +4371,7 @@ for (var e in t) "withdrawalCode" != e && (t[e] = parseInt(t[e]));
|
|
|
});
|
|
|
this.list_data = t.data;
|
|
|
this.initReceipTotalRMB();
|
|
|
+this.update_list = !0;
|
|
|
}
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -4638,9 +4640,8 @@ e.lbl_none = null;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.start = function() {
|
|
|
+gData.cashNormal.getRecord();
|
|
|
this.initTotal();
|
|
|
-this.initScrollView();
|
|
|
-this.initNoneItem();
|
|
|
};
|
|
|
e.prototype.initScrollView = function() {
|
|
|
this.scroll_view.node.emit("srollview-init", gData.cashNormal.list_data);
|
|
|
@@ -4652,6 +4653,13 @@ e.prototype.initNoneItem = function() {
|
|
|
var t = gData.cashNormal.list_data.length;
|
|
|
this.lbl_none.node.active = !t;
|
|
|
};
|
|
|
+e.prototype.update = function() {
|
|
|
+if (gData.cashNormal.update_list) {
|
|
|
+this.initScrollView();
|
|
|
+this.initNoneItem();
|
|
|
+gData.cashNormal.update_list = !1;
|
|
|
+}
|
|
|
+};
|
|
|
a([ s({
|
|
|
displayName: "滚动视图",
|
|
|
type: cc.ScrollView
|
|
|
@@ -9054,7 +9062,10 @@ this.nodeRedPoint.node_turnable.active = gData.turnable.redPoint();
|
|
|
this.nodeRedPoint.node_blessingBag.active = gData.blessingBag.redPoint();
|
|
|
this.nodeRedPoint.node_redeem.active = gData.redeem.redPoint();
|
|
|
gData.gameData.init_red_point = !1;
|
|
|
-this.nodeRedPoint.node_redbagCash.active && mk.guide.open(2);
|
|
|
+if (this.nodeRedPoint.node_redbagCash.active) {
|
|
|
+mk.ui.closeAllUI([ "game", "guide" ]);
|
|
|
+mk.guide.open(2);
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.autoOpenPanel = function() {
|
|
|
if (!gData.gameData.isNewPlayer()) {
|
|
|
@@ -11795,7 +11806,7 @@ gData.appData.fixDes = e.data.bugRestoreRemark;
|
|
|
gData.appData.needForceUpdate = 0;
|
|
|
console.error("[Login]无response.data 请检查.");
|
|
|
}
|
|
|
-mk.console.log("===[Login] gData.appData.needForceUpdate", e);
|
|
|
+mk.console.logSingle("===[Login] gData.appData.needForceUpdate", e);
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -14091,7 +14102,7 @@ this.lbl_deposit.string = t.toFixed(2) + "元";
|
|
|
};
|
|
|
e.prototype.clickCashOP = function() {
|
|
|
mk.audio.playEffect("button");
|
|
|
-if (gData.gameData.gameData.isWithdrawable) if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) mk.tip.pop("满" + gData.pigbank.cash_min_limit + "元可提现"); else if (gData.loginData.isAuth) {
|
|
|
+if (gData.gameData.gameData.isWithdrawable) if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) mk.tip.pop("满" + (gData.pigbank.cash_min_limit / 100).toFixed(2) + "元可提现"); else if (gData.loginData.isAuth) {
|
|
|
mk.data.sendDataEvent(l.DataEventId.jarWithDrawal, "存钱罐提现成功");
|
|
|
gData.pigbank.cashOP();
|
|
|
mk.ui.closePanel(this.node.name);
|
|
|
@@ -14865,6 +14876,7 @@ i(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
e.init_list = !1;
|
|
|
+e.update_list = !1;
|
|
|
e.c_data = [];
|
|
|
e._cash_bar = 1;
|
|
|
return e;
|
|
|
@@ -14894,9 +14906,9 @@ configurable: !0
|
|
|
});
|
|
|
e.prototype.cashOP = function() {
|
|
|
return a(this, void 0, void 0, function() {
|
|
|
-var t, e, n, o, i;
|
|
|
-return r(this, function(a) {
|
|
|
-switch (a.label) {
|
|
|
+var t, e, n, o, i, a, c;
|
|
|
+return r(this, function(r) {
|
|
|
+switch (r.label) {
|
|
|
case 0:
|
|
|
if (!gData.loginData.isAuth) {
|
|
|
s.default.WxAuth();
|
|
|
@@ -14909,7 +14921,7 @@ index: t
|
|
|
return [ 4, mk.http.sendData("cashUsual", e) ];
|
|
|
|
|
|
case 1:
|
|
|
-if (0 != (n = a.sent()).errcode) {
|
|
|
+if (0 != (n = r.sent()).errcode) {
|
|
|
mk.tip.pop(n.errmsg);
|
|
|
mk.console.logSingle("提现index", t);
|
|
|
mk.console.logSingle("提现错误内容：", n);
|
|
|
@@ -14918,10 +14930,16 @@ return [ 2 ];
|
|
|
cc.log("红包提现成功");
|
|
|
0 == (o = n.data).CashMode || o.CashMode;
|
|
|
this.cash_bar++;
|
|
|
+this.update_list = !0;
|
|
|
gData.gameData.gameData.cashIndex++;
|
|
|
i = this.getItemDataByIndex(t);
|
|
|
gData.gameData.gameData.redMoney -= i.type_value;
|
|
|
-gData.receiptNotice.receip_rmb = o.CashStatusList[0].amount;
|
|
|
+a = 0;
|
|
|
+for (c = 0; c < o.CashStatusList.length; c++) if (o.CashStatusList[c].index == t) {
|
|
|
+a = o.CashStatusList[c].amount;
|
|
|
+break;
|
|
|
+}
|
|
|
+gData.receiptNotice.receip_rmb = a;
|
|
|
gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
|
|
|
mk.ui.openPanel("module/receiptNotice/receiptNotice");
|
|
|
this.sortList();
|
|
|
@@ -15255,13 +15273,17 @@ gData.redBagCash.init_list = !0;
|
|
|
gData.redBagCash.initState();
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
-if (gData.redBagCash.init_list) {
|
|
|
+if (gData.redBagCash.update_list) {
|
|
|
+this.sroll_view.node.emit("srollview-init", gData.redBagCash.c_data);
|
|
|
+this.initMoney();
|
|
|
+} else if (gData.redBagCash.init_list) {
|
|
|
this.initScrollView();
|
|
|
this.initMoney();
|
|
|
}
|
|
|
};
|
|
|
e.prototype.lateUpdate = function() {
|
|
|
gData.redBagCash.init_list = !1;
|
|
|
+gData.redBagCash.update_list = !1;
|
|
|
};
|
|
|
e.prototype.initScrollView = function() {
|
|
|
var t = this;
|
|
|
@@ -15292,7 +15314,7 @@ gData.gameData.setProp(c.GameProp.isOpenBankOnCloseCash, 1);
|
|
|
}
|
|
|
};
|
|
|
e.prototype.onClickClose = function() {
|
|
|
-r.default.Inst.ifPass && r.default.Inst.gameCount();
|
|
|
+r.default.Inst && r.default.Inst.ifPass && r.default.Inst.gameCount();
|
|
|
};
|
|
|
a([ u({
|
|
|
displayName: "滚动视图",
|
|
|
@@ -15481,7 +15503,7 @@ return [ 2 ];
|
|
|
};
|
|
|
e.prototype.initItem = function(t) {
|
|
|
this.item_data = t;
|
|
|
-this.lbl_rmb.string = t.amount + "元";
|
|
|
+this.lbl_rmb.string = (t.amount / 100).toFixed(2) + "元";
|
|
|
this.lbl_time.string = mk.time.getNowDayString(1e3 * t.applyTime);
|
|
|
this.lbl_code.string = t.withdrawalCode ? "红包码：" + t.withdrawalCode : "";
|
|
|
};
|
|
|
@@ -20680,11 +20702,21 @@ mk.event.emit("close-panel", t);
|
|
|
}
|
|
|
};
|
|
|
e.prototype.destroyNode = function(t, e, n) {
|
|
|
+void 0 === n && (n = null);
|
|
|
t.destroy();
|
|
|
delete this.curOnPanelDic[e];
|
|
|
this.isPanelClosing = !1;
|
|
|
n && n();
|
|
|
};
|
|
|
+e.prototype.closeAllUI = function(t) {
|
|
|
+void 0 === t && (t = null);
|
|
|
+for (var e in this.curOnPanelDic) if (!(t && t.length > 0 && -1 != t.indexOf(e))) {
|
|
|
+var n = this.getCurOnPanel(e), o = n.getComponent("EffectOpenAndClose");
|
|
|
+o ? o.hideEffect(this.destroyNode.bind(this, n, e)) : this.destroyNode(n, e);
|
|
|
+mk.event.emit("close-panel", e);
|
|
|
+}
|
|
|
+this.isPanelClosing = !1;
|
|
|
+};
|
|
|
return a([ s ], e);
|
|
|
}(cc.Component));
|
|
|
n.default = l;
|
