|
|
@@ -2106,7 +2106,7 @@ this.appId = "wxcf31f0e54f7fefda";
|
|
|
this.umengChannel = "";
|
|
|
this.deviceType = "";
|
|
|
this.androidVersion = "";
|
|
|
-this.mac = "1e:01:e4:13:b3:23,f6:60:e4:1a:b7:27";
|
|
|
+this.mac = "1e:03:e4:13:b3:23,f6:60:e4:1a:b7:27";
|
|
|
this.machineInfo = {
|
|
|
android_id: "",
|
|
|
idfa: "",
|
|
|
@@ -8011,18 +8011,7 @@ n.Inst = this;
|
|
|
mk.event.register("event_guide", this.clickGuide, this);
|
|
|
};
|
|
|
e.prototype.clickGuide = function(t) {
|
|
|
-if ("1_3" == t) {
|
|
|
-this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick();
|
|
|
-this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
|
|
|
-} else if ("1_4" == t) {
|
|
|
-this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
|
|
|
-this.cellItemDic[0][2] && this.cellItemDic[0][2].onClick();
|
|
|
-this.cellItemDic[0][3] && this.cellItemDic[0][3].onClick();
|
|
|
-this.cellItemDic[0][4] && this.cellItemDic[0][4].onClick();
|
|
|
-} else if ("1_6" == t) {
|
|
|
-this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
|
|
|
-this.cellItemDic[1][2] && this.cellItemDic[1][2].onClick();
|
|
|
-}
|
|
|
+"1_3" == t ? this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick() : "1_5" == t && this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
var t = this;
|
|
|
@@ -8864,6 +8853,7 @@ this.initQiPaos();
|
|
|
this.initInfo();
|
|
|
this.autoOpenPanel();
|
|
|
this.runGuideWeak();
|
|
|
+mk.guide.open(1);
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
gData.gameData.init_coin && this.changeInfo();
|
|
|
@@ -8947,6 +8937,7 @@ 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);
|
|
|
};
|
|
|
e.prototype.autoOpenPanel = function() {
|
|
|
if (!gData.gameData.isNewPlayer()) {
|
|
|
@@ -9519,10 +9510,10 @@ function t() {}
|
|
|
t.prototype.open = function(t) {
|
|
|
this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
|
|
|
if (!cc.sys.isNative) {
|
|
|
-this.crtGuideID = 0;
|
|
|
+this.crtGuideID = 1;
|
|
|
gData.gameData.setProp(o.GameProp.levelNum, 0);
|
|
|
}
|
|
|
-if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t >= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
|
|
|
+if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t <= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
|
|
|
gData.guideData.crtID = t;
|
|
|
this.crtGuideID = t;
|
|
|
mk.ui.openPanel("module/guide/guide", i.OpenActionType.normal, this.ui);
|
|
|
@@ -9539,6 +9530,9 @@ this.crtGuideID++;
|
|
|
t.prototype.isGuideComplete = function() {
|
|
|
return !this.crtGuideID || 999 === this.crtGuideID;
|
|
|
};
|
|
|
+t.prototype.isGuiding = function() {
|
|
|
+return null != mk.ui.getCurOnPanel("guide");
|
|
|
+};
|
|
|
return t;
|
|
|
}();
|
|
|
n.default = a;
|
|
|
@@ -9918,7 +9912,7 @@ if (null != n && null != o && null != i && null != a) if (0 == this.crtGuide.dis
|
|
|
this.node_bg.x = this.node_bg.y = this.node_display.x = this.node_display.y = 0;
|
|
|
this.node_display.width = this.node.width;
|
|
|
this.node_display.height = this.node.height;
|
|
|
-cc.tween(this.node_display).to(.3, {
|
|
|
+cc.tween(this.node_display).to(.1, {
|
|
|
x: n,
|
|
|
y: o,
|
|
|
width: i,
|
|
|
@@ -9934,7 +9928,7 @@ this.node_bg.x = this.node_display.x = n;
|
|
|
this.node_bg.y = this.node_display.y = o;
|
|
|
this.node_display.width = this.node_display.height = this.node_bg.width = this.node_bg.height = 2 * this.node.height;
|
|
|
var l = this.crtGuide.display_type;
|
|
|
-cc.tween(this.node_display).to(.3, {
|
|
|
+cc.tween(this.node_display).to(.1, {
|
|
|
width: l,
|
|
|
height: l
|
|
|
}).start();
|
|
|
@@ -12715,7 +12709,7 @@ var t = mk.math.random(0, this.moreGameList.normal.length - 1);
|
|
|
return this.moreGameList.normal[t];
|
|
|
};
|
|
|
e.prototype.popMoreGamePopNode = function() {
|
|
|
-Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
|
|
|
+mk.guide.isGuiding || Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
|
|
|
};
|
|
|
e.prototype.popNodeGetRedBag = function() {
|
|
|
return a(this, void 0, void 0, function() {
|
|
|
@@ -14966,6 +14960,7 @@ return r(this, void 0, void 0, function() {
|
|
|
return c(this, function(e) {
|
|
|
switch (e.label) {
|
|
|
case 0:
|
|
|
+null == this.item_data && 1 == t.index && mk.event.register("event_guide", this.clickGuide.bind, this);
|
|
|
return [ 4, this.initStyle(t) ];
|
|
|
|
|
|
case 1:
|
|
|
@@ -14975,6 +14970,9 @@ return [ 2 ];
|
|
|
});
|
|
|
});
|
|
|
};
|
|
|
+e.prototype.clickGuide = function(t) {
|
|
|
+"2_2" == t && this.clickCashOP();
|
|
|
+};
|
|
|
e.prototype.initStyle = function(t) {
|
|
|
this.item_data = t;
|
|
|
this.lbl_red_value.string = "" + this.item_data.type_value;
|
|
|
@@ -14998,6 +14996,9 @@ this.node_unlock.active = !0;
|
|
|
e.prototype.clickCashOP = function() {
|
|
|
this.item_data.index > gData.redBagCash.cash_bar + 1 ? mk.tip.pop("请按顺序提现") : gData.redBagCash.cashOP();
|
|
|
};
|
|
|
+e.prototype.onDestroy = function() {
|
|
|
+mk.event.remove("event_guide", this.clickGuide, this);
|
|
|
+};
|
|
|
a([ p({
|
|
|
displayName: "已领取",
|
|
|
type: cc.Node
|
|
|
@@ -16395,7 +16396,7 @@ r.label = 4;
|
|
|
|
|
|
case 4:
|
|
|
a = gData.reward.data[0].rewardNum || 0;
|
|
|
-gData.reward.data[0].rewardType === p.RewardType.pigRmb ? this.lbl_reward_value.string = (a / 100).toFixed(2) : this.lbl_reward_value.string = "" + a;
|
|
|
+gData.reward.data[0].rewardType === p.RewardType.pigRmb ? this.lbl_reward_value.string = (a / 100).toFixed(2) + "元" : this.lbl_reward_value.string = "" + a;
|
|
|
this.anim_open_redbag.play();
|
|
|
this.node_luck.active = !1;
|
|
|
this.node_mission.active = !1;
|
kaka