|
|
@@ -646,7 +646,10 @@ e.prototype.init = function() {
|
|
|
this.ATInterstitialJS = cc.ATInterstitialJS;
|
|
|
this.ATInterstitialJS.proxy = this;
|
|
|
this.ATInterstitialJS.init();
|
|
|
-this.interAdState == a.Unload && this.loadInter(0);
|
|
|
+if (this.interAdState == a.Unload) {
|
|
|
+this.loadInter(0);
|
|
|
+this.loadInter(1);
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.placementID = function() {
|
|
|
if (0 == this.interAdType) {
|
|
|
@@ -1427,7 +1430,7 @@ return cc.sys.os === cc.sys.OS_IOS ? n.topon_rewardVideo_placementId : cc.sys.os
|
|
|
};
|
|
|
e.prototype.getAdvertiseChannel = function() {
|
|
|
var t = c.default.getAdvertisingChannel();
|
|
|
-t || (t = "1,a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313");
|
|
|
+t || (t = "1,a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313,b60cac0e524313");
|
|
|
console.log("getAdvertiseChannel..." + t);
|
|
|
var e = t.split(",");
|
|
|
e[0];
|
|
|
@@ -1436,8 +1439,8 @@ n.topon_android_appSecret = e[2];
|
|
|
n.topon_rewardVideo_placementId = e[3];
|
|
|
n.topon_inter_placementId = e[4];
|
|
|
n.topon_native_placementId = e[5];
|
|
|
-n.topon_fullinter_placementId = e[6];
|
|
|
n.topon_banner_placementId = e[7];
|
|
|
+n.topon_fullinter_placementId = e[8];
|
|
|
};
|
|
|
e.prototype.showVideo = function() {
|
|
|
console.log("===[ShowVideoAd] ", d.ATRewardVideo.getInstance().hasAdReady());
|
|
|
@@ -1850,8 +1853,8 @@ this.adsource_isheaderbidding = "";
|
|
|
this.publisher_revenue = "";
|
|
|
this.precision = "";
|
|
|
this.ecpm_level = "";
|
|
|
-this.adType = 1;
|
|
|
this._watchNumToday = 0;
|
|
|
+this.fullInterShowStr = "";
|
|
|
}
|
|
|
Object.defineProperty(t.prototype, "watchNumToday", {
|
|
|
get: function() {
|
|
|
@@ -1988,6 +1991,21 @@ ecpm_level: ""
|
|
|
};
|
|
|
mk.http.sendData("updateADLog", o);
|
|
|
};
|
|
|
+t.prototype.setFullInterShowStr = function() {
|
|
|
+for (var t = gData.gameData.configs.GlobalCfg.fullInterShowStrArr, e = 0; e < t.length; e++) if (gData.gameData.adShowConfig.average_ecpm <= t[e].ecpmmax) {
|
|
|
+this.fullInterShowStr = t[e].proStr;
|
|
|
+break;
|
|
|
+}
|
|
|
+};
|
|
|
+t.prototype.checkShowFullInter = function(t) {
|
|
|
+if ("1" == gData.gameData.configs.GlobalCfg.popFullInter) if (1 == t) gData.gameData.adShowConfig.average_ecpm <= gData.gameData.configs.GlobalCfg.popFullEcpmAfterCash && mk.ad.showInterAd(1); else if (2 == t && this.fullInterShowStr) {
|
|
|
+var e = mk.storage.getStorage("popFullIndex");
|
|
|
+null == e ? e = 0 : e++;
|
|
|
+mk.storage.setStorage("popFullIndex", e);
|
|
|
+var n = e % this.fullInterShowStr.length;
|
|
|
+"1" == this.fullInterShowStr[n] && mk.ad.showInterAd(1);
|
|
|
+}
|
|
|
+};
|
|
|
return t;
|
|
|
}();
|
|
|
n.AdData = c;
|
|
|
@@ -2019,7 +2037,7 @@ this.last_time_stamp = 0;
|
|
|
this.adSdk = t;
|
|
|
}
|
|
|
t.prototype.init = function() {
|
|
|
-cc.sys.os == cc.sys.OS_ANDROID ? this.ifShowAd = !0 : this.ifShowAd = !1;
|
|
|
+cc.sys.os, cc.sys.OS_ANDROID, this.ifShowAd = "1" == gData.gameData.configs.ServerConfig.ifShowAd;
|
|
|
this.adSdk.initSDK();
|
|
|
};
|
|
|
t.prototype.watchAd = function(t) {
|
|
|
@@ -5127,7 +5145,9 @@ this.showCashPro();
|
|
|
};
|
|
|
e.prototype.showCashPro = function() {
|
|
|
this.cashPro.active = !0;
|
|
|
-mk.tween.move(this.cashPro, .3, cc.v2(1e3, 0), cc.v2(0, 0), null, "elasticIn");
|
|
|
+mk.tween.move(this.cashPro, .3, cc.v2(1e3, 0), cc.v2(0, 0), function() {
|
|
|
+gData.adData.checkShowFullInter(1);
|
|
|
+}, "elasticIn");
|
|
|
this.labMoney.string = "¥" + this.money;
|
|
|
};
|
|
|
e.prototype.tixianFail = function() {
|
|
|
@@ -7086,22 +7106,26 @@ e.btn5 = null;
|
|
|
e.btn6 = null;
|
|
|
e.btn7 = null;
|
|
|
e.btn8 = null;
|
|
|
-e.btn_redeem = null;
|
|
|
+e.btn9 = null;
|
|
|
+e.btn_pigbank = null;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.onLoad = function() {
|
|
|
gData.gameData.funBtns = this;
|
|
|
};
|
|
|
-e.prototype.start = function() {};
|
|
|
+e.prototype.start = function() {
|
|
|
+this.init();
|
|
|
+};
|
|
|
e.prototype.init = function() {
|
|
|
for (var t = gData.gameData.funOpenData, e = 0; e < t.length; e++) {
|
|
|
var n = this["btn" + (e + 1)];
|
|
|
n && (n.active = "1" == t[e]);
|
|
|
}
|
|
|
+this.btn_pigbank && (this.btn_pigbank.active = "1" == t[3]);
|
|
|
this.updateRedeem();
|
|
|
};
|
|
|
e.prototype.updateRedeem = function() {
|
|
|
-this.btn_redeem.active = gData.redeem.showBtn;
|
|
|
+this.btn9 && (this.btn9.active = gData.redeem.showBtn && "1" == gData.gameData.funOpenData[8]);
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
if (gData.redeem.init_btnChange) {
|
|
|
@@ -7144,7 +7168,11 @@ displayName: "气泡红包组"
|
|
|
a([ s({
|
|
|
type: cc.Node,
|
|
|
displayName: "福利礼包"
|
|
|
-}) ], e.prototype, "btn_redeem", void 0);
|
|
|
+}) ], e.prototype, "btn9", void 0);
|
|
|
+a([ s({
|
|
|
+type: cc.Node,
|
|
|
+displayName: "金猪币按钮"
|
|
|
+}) ], e.prototype, "btn_pigbank", void 0);
|
|
|
return a([ c ], e);
|
|
|
}(cc.Component);
|
|
|
n.default = l;
|
|
|
@@ -7453,6 +7481,7 @@ return [ 2 ];
|
|
|
}
|
|
|
mk.console.logSingle("getAllConfigInfo", e.data);
|
|
|
this.initConfigs(e.data);
|
|
|
+mk.ad.init();
|
|
|
t = {};
|
|
|
return [ 4, mk.http.sendData("getInfoCrypt", t) ];
|
|
|
|
|
|
@@ -7473,6 +7502,7 @@ case 3:
|
|
|
if (0 != (e = n.sent()).errcode) return [ 2 ];
|
|
|
this.adShowConfig = e.data;
|
|
|
mk.console.logSingle("user/adShowConfig", e.data);
|
|
|
+gData.adData.setFullInterShowStr();
|
|
|
this.dataFinish = !0;
|
|
|
return [ 2 ];
|
|
|
}
|
|
|
@@ -8268,7 +8298,7 @@ this.spr_progress.fillRange = t;
|
|
|
if (t >= 1) {
|
|
|
gData.reward.subType = 2;
|
|
|
mk.ad.videoAdType = f.VideoAdType.LevelScoreRedBag;
|
|
|
-mk.ui.getCurOnPanel("rewardLuck") || mk.ui.openPanel("module/reward/rewardLuck");
|
|
|
+mk.ui.getCurOnPanel("rewardLuck") || "1" != gData.gameData.funOpenData[6] || mk.ui.openPanel("module/reward/rewardLuck");
|
|
|
}
|
|
|
};
|
|
|
e.prototype.initPropNum = function() {
|
|
|
@@ -8599,7 +8629,11 @@ var t = gData.gameData.getProp(f.GameProp.levelNum);
|
|
|
mk.console.log("[Game]pass passLevelNum", t);
|
|
|
n.Inst.ifGetPass = !0;
|
|
|
gData.gameData.setProp(f.GameProp.levelNum, ++t);
|
|
|
-if (!(mk.ui.getCurOnPanel("rewardLuck") || this.finalGetScore >= this.targetScore)) {
|
|
|
+if ("1" == gData.gameData.funOpenData[6]) {
|
|
|
+if (mk.ui.getCurOnPanel("rewardLuck") || this.finalGetScore >= this.targetScore) return;
|
|
|
+this.gameCount();
|
|
|
+console.log("gData.gameData.getProp(GameProp.levelNum)", gData.gameData.getProp(f.GameProp.levelNum));
|
|
|
+} else {
|
|
|
this.gameCount();
|
|
|
console.log("gData.gameData.getProp(GameProp.levelNum)", gData.gameData.getProp(f.GameProp.levelNum));
|
|
|
}
|
|
|
@@ -9008,7 +9042,7 @@ e.prototype.initMusic = function() {
|
|
|
mk.audio.playMusic("bgm");
|
|
|
};
|
|
|
e.prototype.initBtns = function() {
|
|
|
-this.node_btn.getComponent(p.default).init();
|
|
|
+this.node_btn.getComponent(p.default);
|
|
|
};
|
|
|
e.prototype.initQiPaos = function() {
|
|
|
mk.tween.scale(this.btn_getRed1, .6, 0, 1, null, "backOut");
|
|
|
@@ -9778,7 +9812,7 @@ break;
|
|
|
};
|
|
|
t.prototype.openPanelByBtn = function() {
|
|
|
var t = gData.guideWeakData.cur_guide_id;
|
|
|
-gData.gameData.funBtns["btn" + t] && gData.gameData.funBtns["btn" + t].emit("click");
|
|
|
+gData.gameData.funBtns["btn" + t] && "1" == gData.gameData.funOpenData["" + t] && gData.gameData.funBtns["btn" + t].emit("click");
|
|
|
};
|
|
|
return t;
|
|
|
}();
|
|
|
@@ -10574,7 +10608,7 @@ value: !0
|
|
|
n.ServerUrl = n.HttpData = void 0;
|
|
|
var o, i = function() {
|
|
|
function t() {
|
|
|
-this.serverType = 1;
|
|
|
+this.serverType = 0;
|
|
|
}
|
|
|
t.prototype.getServerUrl = function() {
|
|
|
switch (this.serverType) {
|
|
|
@@ -11526,7 +11560,6 @@ return i(this, function(i) {
|
|
|
switch (i.label) {
|
|
|
case 0:
|
|
|
console.log("uin ", gData.loginData.uin);
|
|
|
-mk.ad.init();
|
|
|
mk.console.logSingle("machineInfo", gData.appData.machineInfo);
|
|
|
return [ 4, mk.http.sendData("user/machine", gData.appData.machineInfo) ];
|
|
|
|
|
|
@@ -14767,6 +14800,7 @@ e.prototype.update = function() {
|
|
|
if (gData.receiptNotice.init_style) {
|
|
|
gData.receiptNotice.init_style = !1;
|
|
|
this.initStyle();
|
|
|
+gData.adData.checkShowFullInter(1);
|
|
|
}
|
|
|
};
|
|
|
e.prototype.initStyle = function() {
|
|
|
@@ -15821,7 +15855,10 @@ this.labOfficial.string = "“" + this.officialStr + "”";
|
|
|
this.labRed.string = "“" + this.redCodeStr + "”";
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
-gData.redCodeData.init_data && this.init(gData.redCodeData.money, gData.redCodeData.code);
|
|
|
+if (gData.redCodeData.init_data) {
|
|
|
+this.init(gData.redCodeData.money, gData.redCodeData.code);
|
|
|
+gData.adData.checkShowFullInter(1);
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.lateUpdate = function() {
|
|
|
gData.redCodeData.init_data = !1;
|
|
|
@@ -16598,10 +16635,12 @@ e.lbl_cash_out = null;
|
|
|
e.lbl_cash = null;
|
|
|
e.node_cash = null;
|
|
|
e.cur_stage = s.none;
|
|
|
+e.hasWatchVideo = !1;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.onLoad = function() {
|
|
|
this.hb_star.active = !1;
|
|
|
+this.hasWatchVideo = !1;
|
|
|
this.lbl_reward_value.string = "0";
|
|
|
};
|
|
|
e.prototype.start = function() {
|
|
|
@@ -16612,7 +16651,10 @@ this.initCashOutStyle(gData.gameData.gameData.redMoney);
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
gData.reward.add_redbag_value && this.initCashOutStyle(gData.gameData.gameData.redMoney + gData.reward.add_redbag_value);
|
|
|
-gData.reward.adData && this.watchVideoCall();
|
|
|
+if (gData.reward.adData) {
|
|
|
+this.watchVideoCall();
|
|
|
+this.hasWatchVideo = !0;
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.lateUpdate = function() {
|
|
|
gData.reward.add_redbag_value = 0;
|
|
|
@@ -16772,6 +16814,7 @@ l.default.Inst.finalGetScore = 0;
|
|
|
l.default.Inst.initScore();
|
|
|
}
|
|
|
l.default.Inst && l.default.Inst.ifPass ? l.default.Inst.gameCount() : mk.ad.checkShowInterByChance();
|
|
|
+this.hasWatchVideo || gData.adData.checkShowFullInter(2);
|
|
|
};
|
|
|
a([ f({
|
|
|
displayName: "红包类型",
|
|
|
@@ -20453,7 +20496,10 @@ e = mk.math.randomByWeight(this.weights, 100, !1);
|
|
|
return "<outline color=#000000 width=1><color=#19F7FF>" + n + "</color>成功提现了<color=#FCE300>" + this.moneys[e] + "元</color></outline>";
|
|
|
};
|
|
|
e.prototype.onLoad = function() {
|
|
|
+if ("1" == gData.gameData.funOpenData[6]) {
|
|
|
+this.node.active = !0;
|
|
|
this.play();
|
|
|
+} else this.node.active = !1;
|
|
|
};
|
|
|
e.prototype.play = function() {
|
|
|
this.reset();
|
kaka