|
|
@@ -3265,6 +3265,7 @@ mk.data.setTAEventUser(1, "video_time", 1);
|
|
|
mk.ui.scheduleOnce(function() {
|
|
|
gData.adData.checkAdMax() || e.videoAdcallBack(!0);
|
|
|
e.initLastTimeStamp();
|
|
|
+gData.gameData.uploadAverageEcpm();
|
|
|
}, 0);
|
|
|
};
|
|
|
t.prototype.showNative = function(t) {
|
|
|
@@ -5073,7 +5074,6 @@ mk.data.sendDataEvent(c.DataEventId.Sundry, "福利提现成功");
|
|
|
gData.gameData.doPointToXYLogic();
|
|
|
gData.receiptNotice.receip_rmb = gData.blessingBag.rbNum;
|
|
|
mk.ui.openPanel("module/newNotice/newNotice");
|
|
|
-gData.safeDepositBoxData.updateQipao();
|
|
|
gData.cashNormal.getRecord();
|
|
|
return [ 2, e ];
|
|
|
}
|
|
|
@@ -7299,6 +7299,7 @@ this.cashPro_money = 0;
|
|
|
this.init_success = !1;
|
|
|
this.init_fail = !1;
|
|
|
this.callBack = null;
|
|
|
+this.isOrderCashOut = !1;
|
|
|
}
|
|
|
t.prototype.openCashPro = function(t) {
|
|
|
this.cashPro_money = t;
|
|
|
@@ -7510,6 +7511,12 @@ gData.cashPro.callBack();
|
|
|
gData.cashPro.callBack = null;
|
|
|
}
|
|
|
};
|
|
|
+e.prototype.onDestroy = function() {
|
|
|
+if (gData.cashPro.isOrderCashOut) gData.cashPro.isOrderCashOut = !1; else {
|
|
|
+gData.gameData.richBankTeachTag = !0;
|
|
|
+gData.safeDepositBoxData.updateQipao();
|
|
|
+}
|
|
|
+};
|
|
|
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);
|
|
|
@@ -8910,6 +8917,7 @@ e.sortID = 0;
|
|
|
e.tab = c.ProductType.bmhc;
|
|
|
e._state = -1;
|
|
|
e.data = null;
|
|
|
+e.isCanTouch = !0;
|
|
|
return e;
|
|
|
}
|
|
|
Object.defineProperty(e.prototype, "state", {
|
|
|
@@ -8996,8 +9004,9 @@ this.showGroup.removeAllChildren();
|
|
|
};
|
|
|
e.prototype.onTouch = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e;
|
|
|
+var t, e, a = this;
|
|
|
return s(this, function() {
|
|
|
+if (!this.isCanTouch) return [ 2 ];
|
|
|
switch (this.data.state) {
|
|
|
case c.FactroyState.Lock:
|
|
|
t = gData.gameData.getProductArrByType(this.tab);
|
|
|
@@ -9018,7 +9027,11 @@ break;
|
|
|
|
|
|
case c.FactroyState.Ripe:
|
|
|
gData.factorySystem.currSelectFactory = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+a.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
break;
|
|
|
|
|
|
case c.FactroyState.Sick:
|
|
|
@@ -9111,7 +9124,7 @@ return [ 2 ];
|
|
|
e.prototype.canHarvest = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
gData.factorySystem.currSelectFactory = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 2);
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
@@ -10145,6 +10158,7 @@ e.sortID = 0;
|
|
|
e.plantID = 0;
|
|
|
e._state = -1;
|
|
|
e.data = null;
|
|
|
+e.isCanTouch = !0;
|
|
|
return e;
|
|
|
}
|
|
|
Object.defineProperty(e.prototype, "state", {
|
|
|
@@ -10268,7 +10282,9 @@ t && this.getComponent(l.MoveToCenter).move();
|
|
|
};
|
|
|
e.prototype.onTouch = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
+var t = this;
|
|
|
return s(this, function() {
|
|
|
+if (!this.isCanTouch) return [ 2 ];
|
|
|
switch (this.data.state) {
|
|
|
case c.FarmState.Lock:
|
|
|
mk.tip.pop("点击拓建即可解锁农田");
|
|
|
@@ -10290,7 +10306,11 @@ break;
|
|
|
|
|
|
case c.FarmState.Ripe:
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !0);
|
|
|
+gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+t.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
break;
|
|
|
|
|
|
case c.FarmState.Sick:
|
|
|
@@ -10367,8 +10387,20 @@ case 6:
|
|
|
return [ 2, o.sent() ];
|
|
|
|
|
|
case 7:
|
|
|
+gData.gameData.nextMake = null;
|
|
|
+gData.gameData.setNextProduct(!1);
|
|
|
+if (0 != gData.gameData.nextType) return [ 3, 8 ];
|
|
|
mk.tip.pop("农田已满，无法继续生产");
|
|
|
return [ 2, !1 ];
|
|
|
+
|
|
|
+case 8:
|
|
|
+return [ 4, gData.gameData.makeProduct() ];
|
|
|
+
|
|
|
+case 9:
|
|
|
+return [ 2, o.sent() ];
|
|
|
+
|
|
|
+case 10:
|
|
|
+return [ 2, !1 ];
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
@@ -10417,8 +10449,15 @@ e.prototype.novice_clean = function() {
|
|
|
this.process.cleanProcess();
|
|
|
};
|
|
|
e.prototype.canHarvest = function() {
|
|
|
+var t = this;
|
|
|
+if (this.isCanTouch) {
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
-gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !0);
|
|
|
+gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+t.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
gData.farmSystem.currSelectFarm = this;
|
|
|
@@ -10426,7 +10465,7 @@ mk.data.sendDataEvent(c.DataEventId.button_click, "生虫icon");
|
|
|
gData.adClearSickData.openPanel(c.ProductType.nzw, this.configID);
|
|
|
};
|
|
|
e.prototype.clickGuideBtn = function() {
|
|
|
-mk.guide.isGuiding() && gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, !0, !1, !0);
|
|
|
+mk.guide.isGuiding() && gData.harvestData.openPanel(this.configID, this.plantID, this.onHarvest.bind(this), this.node, 0, !1, !0);
|
|
|
};
|
|
|
i([ y({
|
|
|
type: cc.Node,
|
|
|
@@ -13805,13 +13844,10 @@ mk.console.logSingle("getInfoCrypt", e.data);
|
|
|
this.initPlayerProp(e.data);
|
|
|
this.initProps(e.data.gameUserData);
|
|
|
4 == gData.warnTipData.curSolution && 0 == e.data.isSystemRisk && gData.warnTipData.setSolution(0);
|
|
|
-t = {};
|
|
|
-return [ 4, mk.http.sendData("user/adShowConfig", t) ];
|
|
|
+return [ 4, this.uploadAverageEcpm() ];
|
|
|
|
|
|
case 3:
|
|
|
-if (0 != (e = a.sent()).errcode) return [ 2 ];
|
|
|
-this.adShowConfig = e.data;
|
|
|
-mk.console.logSingle("user/adShowConfig", e.data);
|
|
|
+a.sent();
|
|
|
gData.adData.initEcpmData();
|
|
|
gData.guideData.init();
|
|
|
gData.guideWeakData.init();
|
|
|
@@ -13824,6 +13860,24 @@ return [ 2 ];
|
|
|
});
|
|
|
});
|
|
|
};
|
|
|
+t.prototype.uploadAverageEcpm = function() {
|
|
|
+return o(this, void 0, void 0, function() {
|
|
|
+var t;
|
|
|
+return n(this, function(e) {
|
|
|
+switch (e.label) {
|
|
|
+case 0:
|
|
|
+return [ 4, mk.http.sendData("user/adShowConfig", {}) ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+if (0 != (t = e.sent()).errcode) return [ 2 ];
|
|
|
+this.adShowConfig = t.data;
|
|
|
+mk.data.setTAEventUser(0, "average_ecpm", this.adShowConfig.average_ecpm);
|
|
|
+mk.console.logSingle("user/adShowConfig", t.data);
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+});
|
|
|
+});
|
|
|
+};
|
|
|
t.prototype.initConfigs = function(t) {
|
|
|
this.configs = t;
|
|
|
this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
|
|
|
@@ -15801,6 +15855,10 @@ this.registerCallBack();
|
|
|
console.log("===[Jsbsystem 显示开屏广告================================");
|
|
|
mk.ad.ifShowAd && Math.random() <= gData.adData.getPerByEcpm(u.RateConfig.RC_splash) && l.default.showSplash();
|
|
|
this.initRefreshEvent();
|
|
|
+if (1 == gData.gameData.orderRewardType) {
|
|
|
+this.node_showCash.active = !1;
|
|
|
+this.node_showRedMoney.active = !0;
|
|
|
+}
|
|
|
gData.gameData.playerProp.orderData ? this.initOrderUI() : mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
@@ -15810,7 +15868,7 @@ this.initInfo();
|
|
|
this.runGuideWeak();
|
|
|
this.initLeftTimes();
|
|
|
this.initFarmExpUI();
|
|
|
-"1" == gData.gameData.funOpenData[11] && mk.guide.open(10) && mk.event.register("event_guide", this.initGuideEvent.bind(this), this);
|
|
|
+"1" == gData.gameData.funOpenData[11] && (mk.ui.isPopPanel() || mk.guide.open(10) && mk.event.register("event_guide", this.initGuideEvent.bind(this), this));
|
|
|
if (!mk.storage.getStorage("loadingFinish")) {
|
|
|
mk.storage.setStorage("loadingFinish", 1);
|
|
|
mk.data.sendDataEvent(d.DataEventId.loading, "loading结束");
|
|
|
@@ -16112,6 +16170,7 @@ a.destroy();
|
|
|
}
|
|
|
this.dpFlyRedAni();
|
|
|
}
|
|
|
+mk.data.sendDataEvent(d.DataEventId.button_click, "一键生产按钮");
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -16445,11 +16504,7 @@ this.orderPicIdArray = [];
|
|
|
this.isGray = !0;
|
|
|
t = gData.gameData.configs.Product;
|
|
|
if (!(e = gData.gameData.playerProp.orderData)) return [ 3, 6 ];
|
|
|
-if (1 == gData.gameData.orderRewardType) {
|
|
|
-this.node_showCash.active = !1;
|
|
|
-this.node_showRedMoney.active = !0;
|
|
|
-this.lbl_orderRedMoney.string = e.redMoneyAddition / 100 + "";
|
|
|
-} else this.lbl_addCash.string = (e.cashMoney / 100).toFixed(2);
|
|
|
+1 == gData.gameData.orderRewardType ? this.lbl_orderRedMoney.string = e.redMoneyAddition / 100 + "" : this.lbl_addCash.string = (e.cashMoney / 100).toFixed(2);
|
|
|
if (3 != (a = e.orderTaskList.length)) return [ 3, 6 ];
|
|
|
o = 0;
|
|
|
n = 0;
|
|
|
@@ -16545,6 +16600,7 @@ return [ 2, null ];
|
|
|
a = gData.gameData.playerProp.orderData.cashMoney;
|
|
|
gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
|
|
|
gData.safeDepositBoxData.setCashRecordDataLength();
|
|
|
+gData.cashPro.isOrderCashOut = !0;
|
|
|
gData.cashPro.callBack = this.getRewardCallBack.bind(this);
|
|
|
gData.receiptNotice.receip_rmb = a;
|
|
|
mk.ui.openPanel("module/newNotice/newNotice");
|
|
|
@@ -16608,8 +16664,10 @@ this.initOrderUI(!1);
|
|
|
this.showTips();
|
|
|
gData.gameData.init_order = !0;
|
|
|
gData.gameData.checkTaskFinishUnLock();
|
|
|
+if (2 == gData.gameData.orderRewardType) {
|
|
|
gData.gameData.richBankTeachTag = !0;
|
|
|
gData.safeDepositBoxData.updateQipao();
|
|
|
+}
|
|
|
gData.cashNormal.getRecord();
|
|
|
if (this.isStopFarm) {
|
|
|
this.isStopFarm = !1;
|
|
|
@@ -17271,7 +17329,6 @@ gData.gameData.playerProp.farmGradeData = a.data.userFarmGrageRewardInfo;
|
|
|
gData.receiptNotice.receip_rmb = a.data.userFarmGrageRewardInfo.farmGradeRewardList[this.cashId - 1].money;
|
|
|
mk.ui.openPanel("module/newNotice/newNotice");
|
|
|
gData.gameData.init_red_point = !0;
|
|
|
-gData.safeDepositBoxData.updateQipao();
|
|
|
gData.cashNormal.getRecord();
|
|
|
return [ 2, a ];
|
|
|
}
|
|
|
@@ -17996,7 +18053,8 @@ t.prototype.close = function() {
|
|
|
this.crtGuideID++;
|
|
|
};
|
|
|
t.prototype.isGuideComplete = function() {
|
|
|
-return !this.crtGuideID || 9999 === this.crtGuideID;
|
|
|
+var t = gData.gameData.getProp(o.GameProp.guideID);
|
|
|
+return !this.crtGuideID || 9999 === t;
|
|
|
};
|
|
|
t.prototype.isGuiding = function() {
|
|
|
return null != mk.ui.getCurOnPanel("guide");
|
|
|
@@ -18732,10 +18790,11 @@ e.init_reward = !1;
|
|
|
e.node_fly = null;
|
|
|
e.isMatchOrder = !1;
|
|
|
e.isTouchBtn = !1;
|
|
|
+e.isCrops_ = 0;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.openPanel = function(t, e, a, o, n, i, r) {
|
|
|
-void 0 === n && (n = !1);
|
|
|
+void 0 === n && (n = 0);
|
|
|
void 0 === i && (i = !1);
|
|
|
void 0 === r && (r = !1);
|
|
|
this.configID = t;
|
|
|
@@ -18743,8 +18802,9 @@ this.plantID = e;
|
|
|
this.call = a;
|
|
|
this.node_fly = o;
|
|
|
this.isTouchBtn = i;
|
|
|
+this.isCrops_ = n;
|
|
|
this.config = gData.gameData.getProductMap(this.plantID);
|
|
|
-if (r || n) this.getNormalReward(); else {
|
|
|
+if (r || 0 == n) this.getNormalReward(); else {
|
|
|
var s = mk.guide.isGuiding(), l = Math.random(), p = gData.adData.getPerByEcpm(c.RateConfig.RC_superDouble);
|
|
|
!s && l <= p && gData.gameData.playerProp.orderData && gData.gameData.playerProp.orderData.overTimes > 0 && "1" == gData.gameData.prohibiJBAd[gData.loginData.userChannel].split(",")[1 - gData.loginData.isMatched] ? mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel") : this.getNormalReward();
|
|
|
}
|
|
|
@@ -18757,6 +18817,7 @@ gData.reward.callback = gData.harvestData.call;
|
|
|
var a = this.node_fly.parent.convertToWorldSpaceAR(this.node_fly.getPosition());
|
|
|
gData.reward.getReward(a);
|
|
|
gData.harvestData.call = null;
|
|
|
+1 == this.isCrops_ ? mk.data.sendDataEvent(l.DataEventId.button_click, "动物超级加倍收获") : 2 == this.isCrops_ && mk.data.sendDataEvent(l.DataEventId.button_click, "商品超级加倍收获");
|
|
|
};
|
|
|
e.prototype.getNormalReward = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
@@ -18835,6 +18896,7 @@ if (!mk.guide.isGuiding() && gData.adData.checkShowFullInter(4)) {
|
|
|
gData.moreGame.openType = 0;
|
|
|
mk.data.sendDataEvent(l.DataEventId.htRedBag_scene, "点击可收获");
|
|
|
}
|
|
|
+0 == this.isCrops_ ? mk.data.sendDataEvent(l.DataEventId.button_click, "农作物普通收获") : 1 == this.isCrops_ ? mk.data.sendDataEvent(l.DataEventId.button_click, "动物普通收获") : 2 == this.isCrops_ && mk.data.sendDataEvent(l.DataEventId.button_click, "商品普通收获");
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
});
|
|
|
@@ -19013,9 +19075,9 @@ this.lbl_max.string = "最高获得</c><color=#ff0000>" + gData.harvestData.conf
|
|
|
};
|
|
|
e.prototype.clickNormalBtn = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e, a, o;
|
|
|
-return s(this, function(n) {
|
|
|
-switch (n.label) {
|
|
|
+var t, e, a, o, n, i, r, c;
|
|
|
+return s(this, function(s) {
|
|
|
+switch (s.label) {
|
|
|
case 0:
|
|
|
mk.audio.playEffect("button");
|
|
|
gData.adData.checkShowFullInter(1, l.InterFullAdType.interstitial2_init_2);
|
|
|
@@ -19025,8 +19087,12 @@ id: gData.harvestData.config.id
|
|
|
return [ 4, mk.http.sendData("redMoney/addRedMoneyByFarm", t) ];
|
|
|
|
|
|
case 1:
|
|
|
-if ((e = n.sent()) && 0 != e.errcode) return [ 2 ];
|
|
|
-if (e.data.redMoneyAddition <= 0) console.log("返回奖励为0"); else {
|
|
|
+if ((e = s.sent()) && 0 != e.errcode) return [ 2 ];
|
|
|
+if (!(e.data.redMoneyAddition <= 0)) return [ 3, 2 ];
|
|
|
+console.log("返回奖励为0");
|
|
|
+return [ 3, 4 ];
|
|
|
+
|
|
|
+case 2:
|
|
|
gData.harvestData.getType = 0;
|
|
|
a = [ {
|
|
|
rewardType: 1,
|
|
|
@@ -19036,7 +19102,24 @@ gData.reward.data = a;
|
|
|
gData.reward.callback = gData.harvestData.call;
|
|
|
o = gData.harvestData.node_fly.parent.convertToWorldSpaceAR(gData.harvestData.node_fly.getPosition());
|
|
|
gData.reward.getReward(o);
|
|
|
-}
|
|
|
+n = "+" + e.data.redMoneyAddition / 100;
|
|
|
+i = mk.fly.node.convertToNodeSpaceAR(o);
|
|
|
+return [ 4, mk.loader.load("game/prefab/flyHb", cc.Prefab) ];
|
|
|
+
|
|
|
+case 3:
|
|
|
+r = s.sent();
|
|
|
+(c = cc.instantiate(r)).zIndex = 1e3;
|
|
|
+c.parent = mk.fly.node;
|
|
|
+c.setPosition(i);
|
|
|
+c.getComponentInChildren(cc.Label).string = n;
|
|
|
+cc.tween(c).by(.8, {
|
|
|
+y: 100
|
|
|
+}).to(.4, {
|
|
|
+opacity: 0
|
|
|
+}).removeSelf().start();
|
|
|
+s.label = 4;
|
|
|
+
|
|
|
+case 4:
|
|
|
mk.ui.closePanel("HarvestPanel");
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -25047,6 +25130,7 @@ e._state = -1;
|
|
|
e.data = null;
|
|
|
e.emptyClick = !1;
|
|
|
e.pastureData = null;
|
|
|
+e.isCanTouch = !0;
|
|
|
return e;
|
|
|
}
|
|
|
Object.defineProperty(e.prototype, "state", {
|
|
|
@@ -25181,8 +25265,9 @@ this.showGroup.removeAllChildren();
|
|
|
};
|
|
|
e.prototype.onTouch = function() {
|
|
|
return r(this, void 0, void 0, function() {
|
|
|
-var t, e;
|
|
|
+var t, e, a = this;
|
|
|
return s(this, function() {
|
|
|
+if (!this.isCanTouch) return [ 2 ];
|
|
|
switch (this.data.state) {
|
|
|
case c.PastureState.Lock:
|
|
|
if (2 == (t = gData.gameData.getProductMap(this.data.productID)).unlock) if (gData.gameData.playerProp.orderData) {
|
|
|
@@ -25206,7 +25291,11 @@ mk.ui.openPanel("module/speedUpUI/speedUp");
|
|
|
break;
|
|
|
|
|
|
case c.PastureState.Ripe:
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
|
|
|
+this.isCanTouch = !1;
|
|
|
+setTimeout(function() {
|
|
|
+a.isCanTouch = !0;
|
|
|
+}, 1e3);
|
|
|
break;
|
|
|
|
|
|
case c.PastureState.Sick:
|
|
|
@@ -25329,7 +25418,7 @@ return [ 2 ];
|
|
|
};
|
|
|
e.prototype.canHarvest = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
-gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node);
|
|
|
+gData.harvestData.openPanel(this.configID, this.data.productID, this.onHarvest.bind(this), this.node, 1);
|
|
|
};
|
|
|
e.prototype.canClearSick = function() {
|
|
|
this.getComponent(l.MoveToCenter).move();
|
|
|
@@ -26730,6 +26819,7 @@ e.node_Uncomplete = null;
|
|
|
e.node_1 = null;
|
|
|
e.node_2 = null;
|
|
|
e.lbl_orderValue = null;
|
|
|
+e.lbl_rewardDes = null;
|
|
|
e.btnCanClick = !0;
|
|
|
return e;
|
|
|
}
|
|
|
@@ -26826,9 +26916,8 @@ var t = "<color=8A4312>再生产<color=ff0000>" + o + "</color>次，就可以
|
|
|
mk.guide.open(11, t);
|
|
|
}, .2);
|
|
|
}
|
|
|
+1 == gData.gameData.orderRewardType && (this.lbl_rewardDes.string = "领取" + a.redMoneyAddition / 100 + "红包币");
|
|
|
} else {
|
|
|
-var p = gData.gameData.playerProp.orderData.cashMoney;
|
|
|
-this.lbl_orderValue.string = "订单已完成，可提现" + (p / 100).toFixed(2) + "元";
|
|
|
this.sp_taskProgress.fillRange = 1;
|
|
|
this.lbl_progress.string = n + "/" + n;
|
|
|
this.node_Uncomplete.active = !1;
|
|
|
@@ -26930,6 +27019,10 @@ i([ p({
|
|
|
type: cc.Label,
|
|
|
displayName: "订单提现金额"
|
|
|
}) ], e.prototype, "lbl_orderValue", void 0);
|
|
|
+i([ p({
|
|
|
+type: cc.Label,
|
|
|
+displayName: "奖励类型描述"
|
|
|
+}) ], e.prototype, "lbl_rewardDes", void 0);
|
|
|
return i([ l ], e);
|
|
|
}(cc.Component);
|
|
|
a.default = u;
|
|
|
@@ -28049,7 +28142,6 @@ mk.data.sendXYEvent("guide_harvest", "首次领取任务红包");
|
|
|
}
|
|
|
gData.gameData.doPointToXYLogic();
|
|
|
gData.adData.checkPopCashFull();
|
|
|
-gData.safeDepositBoxData.updateQipao();
|
|
|
gData.cashNormal.getRecord();
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -29295,31 +29387,29 @@ if (i.index == a) return i;
|
|
|
};
|
|
|
t.prototype.updateQipao = function() {
|
|
|
return n(this, void 0, void 0, function() {
|
|
|
-var t, e, a;
|
|
|
-return i(this, function(o) {
|
|
|
-switch (o.label) {
|
|
|
+var t, e;
|
|
|
+return i(this, function(a) {
|
|
|
+switch (a.label) {
|
|
|
case 0:
|
|
|
return [ 4, mk.time.WaitForSeconds(1) ];
|
|
|
|
|
|
case 1:
|
|
|
-o.sent();
|
|
|
+a.sent();
|
|
|
return [ 4, mk.http.sendData("newrichbank/getCashRecord", {}) ];
|
|
|
|
|
|
case 2:
|
|
|
-if ((t = o.sent()) && 0 == t.errcode) {
|
|
|
+if ((t = a.sent()) && 0 == t.errcode) {
|
|
|
this.cashRecordData = t.data;
|
|
|
console.log("--------------");
|
|
|
this.freshQipao = !0;
|
|
|
}
|
|
|
if (gData.gameData.richBankTeachTag) {
|
|
|
gData.gameData.richBankTeachTag = !1;
|
|
|
-e = mk.ui.isPopPanel();
|
|
|
-a = gData.gameData.getProp(s.GameProp.cashTimes);
|
|
|
-console.log("=========" + e + "===" + a + "=====" + this.cashRecordData.length + "====" + this.cashRecordDataLength);
|
|
|
-if ("1" == gData.gameData.funOpenData[13] && !e && a >= gData.gameData.showRichBankIconLimit && this.cashRecordData.length >= this.cashRecordDataLength) {
|
|
|
-this.cashRecordDataLength = this.cashRecordData.length;
|
|
|
-this.isTeach = mk.guide.open(13);
|
|
|
-}
|
|
|
+if (mk.guide.isGuideComplete()) return [ 2 ];
|
|
|
+mk.ui.closeAllUI();
|
|
|
+e = gData.gameData.getProp(s.GameProp.cashTimes);
|
|
|
+console.log("=========" + e + "=====" + this.cashRecordData.length + "====" + this.cashRecordDataLength);
|
|
|
+"1" == gData.gameData.funOpenData[13] && e >= gData.gameData.showRichBankIconLimit && (this.isTeach = mk.guide.open(13));
|
|
|
}
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -30832,7 +30922,6 @@ return [ 2 ];
|
|
|
o = Math.round(100 * e.videoRedMoney.videoRewardList[0].rewardNum);
|
|
|
gData.receiptNotice.receip_rmb = o;
|
|
|
mk.ui.openPanel("module/newNotice/newNotice", c.OpenActionType.closeLast);
|
|
|
-gData.safeDepositBoxData.updateQipao();
|
|
|
gData.cashNormal.getRecord();
|
|
|
return [ 3, 4 ];
|
|
|
|
|
|
@@ -35398,7 +35487,6 @@ this.init_novice = !0;
|
|
|
gData.gameData.playerProp.userNoviceWeFareInfo = a.data.userNoviceWeFareInfo;
|
|
|
gData.receiptNotice.receip_rmb = t;
|
|
|
mk.ui.openPanel("module/newNotice/newNotice");
|
|
|
-gData.safeDepositBoxData.updateQipao();
|
|
|
gData.cashNormal.getRecord();
|
|
|
gData.gameData.doPointToXYLogic();
|
|
|
return [ 2 ];
|
|
|
@@ -35464,7 +35552,6 @@ gData.gameData.playerProp.redMoney -= o[t - 1].redMoney;
|
|
|
gData.receiptNotice.receip_rmb = o[t - 1].money;
|
|
|
mk.ui.openPanel("module/newNotice/newNotice");
|
|
|
}
|
|
|
-gData.safeDepositBoxData.updateQipao();
|
|
|
gData.cashNormal.getRecord();
|
|
|
mk.data.sendDataEvent(c.DataEventId.Sundry, "红包币提现成功");
|
|
|
gData.gameData.doPointToXYLogic();
|
