|
|
@@ -595,7 +595,9 @@ null != this.proxy && this.proxy.onInterstitialAdShow(t, e);
|
|
|
},
|
|
|
onInterstitialAdStartPlayingVideo: function() {},
|
|
|
onInterstitialAdEndPlayingVideo: function() {},
|
|
|
-onInterstitialAdFailedToPlayVideo: function() {},
|
|
|
+onInterstitialAdFailedToPlayVideo: function(t, e) {
|
|
|
+null != this.proxy && this.proxy.onInterstitialAdFailedToPlayVideo(t, e);
|
|
|
+},
|
|
|
onInterstitialAdFailedToShow: function() {},
|
|
|
onInterstitialAdClose: function(t, e) {
|
|
|
null != this.proxy && this.proxy.onInterstitialAdClose(t, e);
|
|
|
@@ -637,7 +639,7 @@ var a, r = t("../../zgSingleton"), c = t("./ATSDKMgr"), s = function(t) {
|
|
|
i(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
-e.interAdType = 0;
|
|
|
+e.interAdType = -1;
|
|
|
e.interAdState = 0;
|
|
|
e.ifLoadShow = !1;
|
|
|
return e;
|
|
|
@@ -646,7 +648,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) {
|
|
|
@@ -657,48 +662,64 @@ if (cc.sys.os === cc.sys.OS_IOS) return c.default.topon_fullinter_placementId;
|
|
|
if (cc.sys.os === cc.sys.OS_ANDROID) return c.default.topon_fullinter_placementId;
|
|
|
}
|
|
|
};
|
|
|
+e.prototype.checkPlacementIDType = function(t) {
|
|
|
+if (cc.sys.os === cc.sys.OS_IOS) {
|
|
|
+if (t == c.default.topon_inter_placementId) return 0;
|
|
|
+if (t == c.default.topon_fullinter_placementId) return 1;
|
|
|
+} else if (cc.sys.os === cc.sys.OS_ANDROID) {
|
|
|
+if (t == c.default.topon_inter_placementId) return 0;
|
|
|
+if (t == c.default.topon_fullinter_placementId) return 1;
|
|
|
+}
|
|
|
+};
|
|
|
e.prototype.hasAdReady = function() {
|
|
|
return this.ATInterstitialJS.hasAdReady();
|
|
|
};
|
|
|
e.prototype.loadInter = function(t, e) {
|
|
|
void 0 === e && (e = !1);
|
|
|
-this.interAdType = t;
|
|
|
this.ifLoadShow = e;
|
|
|
this.interAdState = a.Loading;
|
|
|
this.ATInterstitialJS.loadInter(t);
|
|
|
};
|
|
|
e.prototype.showInter = function(t) {
|
|
|
+if (this.interAdState == a.Show && t == this.interAdType) console.log("当前插屏类型正在展示"); else {
|
|
|
this.interAdType = t;
|
|
|
-if (this.interAdState == a.Show) ; else if (this.hasAdReady()) {
|
|
|
+if (this.hasAdReady()) {
|
|
|
this.interAdState = a.Show;
|
|
|
this.ATInterstitialJS.showInter(t);
|
|
|
} else this.interAdState == a.Loading ? this.ifLoadShow = !0 : this.loadInter(t, !0);
|
|
|
+}
|
|
|
};
|
|
|
-e.prototype.onInterstitialAdLoaded = function() {
|
|
|
+e.prototype.onInterstitialAdLoaded = function(t) {
|
|
|
this.interAdState = a.LoadSuccess;
|
|
|
-this.ifLoadShow && this.showInter(this.interAdType);
|
|
|
+if (this.ifLoadShow) {
|
|
|
+var e = this.checkPlacementIDType(t);
|
|
|
+this.showInter(e);
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.onInterstitialAdLoadFail = function(t) {
|
|
|
this.interAdState = a.LoadFail;
|
|
|
-if (1 == this.interAdType) {
|
|
|
-mk.tip.pop("拉取全屏视频失败，请稍后再试");
|
|
|
-gData.adData.updateADLog(10, t);
|
|
|
-} else 0 == this.interAdType && gData.adData.updateADLog(11, t);
|
|
|
+var e = 11, n = this.checkPlacementIDType(t);
|
|
|
+0 == n ? e = 11 : 1 == n && (e = 10);
|
|
|
+gData.adData.updateADLog(e, t);
|
|
|
};
|
|
|
e.prototype.onInterstitialAdShow = function(t, e) {
|
|
|
this.interAdState = a.Show;
|
|
|
-var n = JSON.parse(e), o = 2;
|
|
|
-0 == this.interAdType ? o = 2 : 1 == this.interAdType && (o = 9);
|
|
|
+var n = JSON.parse(e), o = 2, i = this.checkPlacementIDType(t);
|
|
|
+0 == i ? o = 2 : 1 == i && (o = 9);
|
|
|
gData.adData.updateADLog(o, t, n);
|
|
|
};
|
|
|
e.prototype.onInterstitialAdClick = function() {};
|
|
|
e.prototype.onInterstitialAdClose = function(t, e) {
|
|
|
this.interAdState = a.Close;
|
|
|
-this.loadInter(this.interAdType);
|
|
|
-if (1 == this.interAdType) {
|
|
|
+if (1 == this.checkPlacementIDType(t)) {
|
|
|
var n = JSON.parse(e);
|
|
|
gData.adData.updateADLog(8, t, n);
|
|
|
-}
|
|
|
+this.loadInter(1);
|
|
|
+} else this.loadInter(0);
|
|
|
+};
|
|
|
+e.prototype.onInterstitialAdFailedToPlayVideo = function(t, e) {
|
|
|
+mk.console.logSingle("onInterstitialAdFailedToPlayVideo placementId >> ", t);
|
|
|
+mk.console.logSingle("onInterstitialAdFailedToPlayVideo ", e);
|
|
|
};
|
|
|
return e;
|
|
|
}(r.zgSingleton);
|
|
|
@@ -1229,6 +1250,9 @@ e.prototype.onRewardedVideoAdPlayEnd = function() {
|
|
|
this.ifWatchEnd = !0;
|
|
|
};
|
|
|
e.prototype.onRewardedVideoAdPlayFailed = function(t, e, n) {
|
|
|
+mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed placementId >> ", t);
|
|
|
+mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed errorInfo ", e);
|
|
|
+mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed callbackInfo ", n);
|
|
|
var o = JSON.parse(n);
|
|
|
gData.adData.updateADLog(5, t, o);
|
|
|
s.default.getInstance().watchVideoAdCallBack(s.AdPlayStateType.PlayFail);
|
|
|
@@ -1427,7 +1451,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 +1460,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];
|
|
|
+e[8] && (n.topon_fullinter_placementId = e[8]);
|
|
|
};
|
|
|
e.prototype.showVideo = function() {
|
|
|
console.log("===[ShowVideoAd] ", d.ATRewardVideo.getInstance().hasAdReady());
|
|
|
@@ -1484,7 +1508,7 @@ e.topon_android_appSecret = "66b742dd0e502b64d783d9c66a9d30c4";
|
|
|
e.topon_rewardVideo_placementId = "b5f8fa6673e180";
|
|
|
e.topon_inter_placementId = "b5f8fa77aa5262";
|
|
|
e.topon_native_placementId = "b5f8fa77aa5262";
|
|
|
-e.topon_fullinter_placementId = "b5f8fa77aa5262";
|
|
|
+e.topon_fullinter_placementId = "b6113813b876a1";
|
|
|
e.topon_banner_placementId = "b5f8fa77aa5262";
|
|
|
return n = a([ f ], e);
|
|
|
}(s.zgSingleton));
|
|
|
@@ -1850,8 +1874,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 +2012,29 @@ ecpm_level: ""
|
|
|
};
|
|
|
mk.http.sendData("updateADLog", o);
|
|
|
};
|
|
|
+t.prototype.setFullInterShowStr = function() {
|
|
|
+for (var t = gData.gameData.configs.GlobalCfg.fullInterShowStrArr.split(";"), e = 0; e < t.length; e++) {
|
|
|
+var n = t[e].split(",");
|
|
|
+if (gData.gameData.adShowConfig.average_ecpm <= n[1]) {
|
|
|
+this.fullInterShowStr = n[2];
|
|
|
+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;
|
|
|
+mk.console.log("checkShowFullInter this.fullInterShowStr ", this.fullInterShowStr);
|
|
|
+mk.console.log("checkShowFullInter index", n);
|
|
|
+if ("1" == this.fullInterShowStr[n]) {
|
|
|
+mk.console.log("checkShowFullInter showInterAd");
|
|
|
+mk.ad.showInterAd(1);
|
|
|
+}
|
|
|
+}
|
|
|
+};
|
|
|
return t;
|
|
|
}();
|
|
|
n.AdData = c;
|
|
|
@@ -2040,6 +2087,7 @@ t.prototype.wacthAdSuccess = function(t) {
|
|
|
var e = this;
|
|
|
void 0 === t && (t = "");
|
|
|
mk.console.log("=== wacthAdSuccess");
|
|
|
+mk.data.setTAEventUser(1, "video_time", 1);
|
|
|
mk.ui.scheduleOnce(function() {
|
|
|
gData.adData.checkAdMax() || e.videoAdcallBack(!0);
|
|
|
e.initLastTimeStamp();
|
|
|
@@ -2077,10 +2125,15 @@ t.prototype.showInterAd = function(t) {
|
|
|
this.ifShowAd && this.adSdk.showInter(t);
|
|
|
};
|
|
|
t.prototype.checkShowInterByChance = function() {
|
|
|
+var t = this;
|
|
|
if (this.ifShowAd && gData.gameData.adShowConfig) {
|
|
|
-var t = gData.gameData.configs.ServerConfig.interOpenChance;
|
|
|
-t || (t = .4);
|
|
|
-Math.random() <= t ? this.showInterAd(0) : gData.moreGame.popMoreGamePopNode();
|
|
|
+var e = gData.gameData.configs.ServerConfig.interOpenChance;
|
|
|
+if (Math.random() <= e) {
|
|
|
+var n = Number(gData.gameData.configs.ServerConfig.interOpenDelayMin) + Math.random() * (Number(gData.gameData.configs.ServerConfig.interOpenDelayMax) - Number(gData.gameData.configs.ServerConfig.interOpenDelayMin));
|
|
|
+setTimeout(function() {
|
|
|
+t.showInterAd(0);
|
|
|
+}, 1e3 * n);
|
|
|
+} else gData.moreGame.popMoreGamePopNode();
|
|
|
}
|
|
|
};
|
|
|
return t;
|
|
|
@@ -5127,7 +5180,11 @@ 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");
|
|
|
+mk.data.setTAEventUser(1, "cash_time", 1);
|
|
|
+mk.data.setTAEventUser(1, "cash_total", this.money);
|
|
|
this.labMoney.string = "¥" + this.money;
|
|
|
};
|
|
|
e.prototype.tixianFail = function() {
|
|
|
@@ -5645,6 +5702,12 @@ t.prototype.sendDataEvent = function(t, e) {
|
|
|
console.log("===[DataSystem", t, e);
|
|
|
t && e && o.default.sendEvent(t, e);
|
|
|
};
|
|
|
+t.prototype.setTAEventUser = function(t, e, n) {
|
|
|
+o.default.setTAEventUser(t, e, n);
|
|
|
+};
|
|
|
+t.prototype.setTAEventUserStr = function(t, e, n) {
|
|
|
+o.default.setTAEventUserStr(t, e, n);
|
|
|
+};
|
|
|
t.prototype.sendXYEvent = function(t, e) {
|
|
|
if (t && e) {
|
|
|
var n = {
|
|
|
@@ -7482,6 +7545,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 ];
|
|
|
}
|
|
|
@@ -7510,7 +7574,17 @@ this.gameData.turntableTimes = t.turntableTimes;
|
|
|
this.gameData.userTuCaoInfo = t.userTuCaoInfo;
|
|
|
this.gameData.versioncfg = t.versioncfg;
|
|
|
this.gameData.isFirstRedMoney = t.isFirstRedMoney;
|
|
|
+t.groupCode && (this.gameData.groupCode = t.groupCode);
|
|
|
+console.log("ABTest ", t.groupCode);
|
|
|
gData.adData.watchNumToday = null == t.dayVideoTimesForRedMoney ? 0 : t.dayVideoTimesForRedMoney;
|
|
|
+if (gData.loginData.isFirstIn) {
|
|
|
+gData.loginData.isFirstIn = !1;
|
|
|
+mk.data.sendDataEvent("ABTest", "触发" + this.gameData.groupCode + "方案");
|
|
|
+mk.data.setTAEventUserStr(0, "xy_uid", gData.loginData.uin);
|
|
|
+mk.data.setTAEventUserStr(0, "regtime_app_id", gData.appData.appVersion);
|
|
|
+}
|
|
|
+mk.data.setTAEventUserStr(0, "now_app_id", gData.appData.appVersion);
|
|
|
+mk.data.setTAEventUserStr(0, "channel_id", gData.appData.umengChannel);
|
|
|
};
|
|
|
t.prototype.setProp = function(t, e) {
|
|
|
return o(this, void 0, void 0, function() {
|
|
|
@@ -7641,6 +7715,7 @@ this.hammerPropNum = 0;
|
|
|
this.resetPropNum = 0;
|
|
|
this.changePropNum = 0;
|
|
|
this.isFirstRedMoney = 0;
|
|
|
+this.groupCode = 0;
|
|
|
}
|
|
|
Object.defineProperty(t.prototype, "isSignInToday", {
|
|
|
get: function() {
|
|
|
@@ -7694,6 +7769,7 @@ set: function(t) {
|
|
|
this._redMoney = t;
|
|
|
gData.gameData.init_coin = !0;
|
|
|
gData.gameData.init_red_point = !0;
|
|
|
+mk.data.setTAEventUser(0, "red_money_num", this._redMoney);
|
|
|
},
|
|
|
enumerable: !1,
|
|
|
configurable: !0
|
|
|
@@ -8623,6 +8699,7 @@ mk.ui.getCurOnPanel("GetPropUI") && mk.ui.closePanel("GetPropUI");
|
|
|
this.gameOver();
|
|
|
};
|
|
|
e.prototype.gameOver = function() {
|
|
|
+mk.data.setTAEventUser(1, "video_play_time", 1);
|
|
|
mk.ui.openPanel("game/prefab/uiPanel/GameOverUI");
|
|
|
};
|
|
|
e.prototype.checkBonusNum = function(t) {
|
|
|
@@ -9690,10 +9767,7 @@ value: !0
|
|
|
var o = t("../../game/data/GameData"), i = t("./UISystem"), a = function() {
|
|
|
function t() {}
|
|
|
t.prototype.open = function(t) {
|
|
|
-if (1 != gData.gameData.funOpenData[6]) {
|
|
|
-this.crtGuideID = 9999;
|
|
|
-gData.gameData.setProp(o.GameProp.guideID, this.crtGuideID);
|
|
|
-} else this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
|
|
|
+this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
|
|
|
if (!cc.sys.isNative) {
|
|
|
this.crtGuideID = 1;
|
|
|
gData.gameData.setProp(o.GameProp.levelNum, 0);
|
|
|
@@ -10954,6 +11028,14 @@ t.sendEvent = function(t, e) {
|
|
|
cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "sendEvent", "(Ljava/lang/String;Ljava/lang/String;)V", t, e) : (cc.sys.os,
|
|
|
cc.sys.OS_IOS);
|
|
|
};
|
|
|
+t.setTAEventUser = function(t, e, n) {
|
|
|
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUser", "(ILjava/lang/String;F)V", t, e, n) : (cc.sys.os,
|
|
|
+cc.sys.OS_IOS);
|
|
|
+};
|
|
|
+t.setTAEventUserStr = function(t, e, n) {
|
|
|
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "setTAEventUserStr", "(ILjava/lang/String;Ljava/lang/String;)V", t, e, n) : (cc.sys.os,
|
|
|
+cc.sys.OS_IOS);
|
|
|
+};
|
|
|
t.WxAuth = function() {
|
|
|
cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "WxAuth", "()V") : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WxAuth", "");
|
|
|
};
|
|
|
@@ -11360,6 +11442,7 @@ this.randomKey = "abcdefghijklopqrstuvwxyzabcdefgh";
|
|
|
this.uin = "";
|
|
|
this.tempUin = "";
|
|
|
this.loginTicket = "";
|
|
|
+this.isFirstIn = !1;
|
|
|
}
|
|
|
t.prototype.loadLocalRes = function() {
|
|
|
return o(this, void 0, void 0, function() {
|
|
|
@@ -11763,6 +11846,7 @@ e.lbl_server = null;
|
|
|
e.lbl_privacy = null;
|
|
|
e.process = 0;
|
|
|
e.hotUpdatePanel = null;
|
|
|
+e.hasDeviceBackInit = !1;
|
|
|
return e;
|
|
|
}
|
|
|
e.prototype.onLoad = function() {
|
|
|
@@ -11776,7 +11860,8 @@ this.init();
|
|
|
};
|
|
|
e.prototype.update = function() {
|
|
|
if (gData.appData.getDeviceInfoCompelete) {
|
|
|
-gData.appData.getDeviceInfoCompelete = !1;
|
|
|
+if (!this.hasDeviceBackInit) {
|
|
|
+this.hasDeviceBackInit = !0;
|
|
|
this.getDeviceInfoBack();
|
|
|
}
|
|
|
if (gData.appData.updateState == p.UpdateState.ForceUpdateFinish) {
|
|
|
@@ -11800,7 +11885,7 @@ mk.storage.setStorage("agreementTip", 1, !1);
|
|
|
} else {
|
|
|
mk.ui.openPanel("game/prefab/game");
|
|
|
console.log("===[Jsbsystem 显示开屏广告================================");
|
|
|
-mk.ad.ifShowAd && l.default.showSplash();
|
|
|
+l.default.showSplash();
|
|
|
}
|
|
|
gData.gameData.dataFinish = !1;
|
|
|
}
|
|
|
@@ -11810,6 +11895,7 @@ gData.gameData.dataFinish = !1;
|
|
|
this.lbl_progress.string = "正在更新中,请耐心等待";
|
|
|
this.bar.setProgress(gData.appData.updatePercent);
|
|
|
}
|
|
|
+}
|
|
|
};
|
|
|
e.prototype.setProgress = function(t) {
|
|
|
this.bar.setProgress(t);
|
|
|
@@ -13009,7 +13095,7 @@ var t = mk.math.random(0, this.moreGameList.normal.length - 1);
|
|
|
return this.moreGameList.normal[t];
|
|
|
};
|
|
|
e.prototype.popMoreGamePopNode = function() {
|
|
|
-mk.guide.isGuiding || mk.ui.getCurOnPanel("reward") || Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
|
|
|
+mk.guide.isGuiding() || mk.ui.getCurOnPanel("reward") || 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() {
|
|
|
@@ -14782,12 +14868,15 @@ e.prototype.update = function() {
|
|
|
if (gData.receiptNotice.init_style) {
|
|
|
gData.receiptNotice.init_style = !1;
|
|
|
this.initStyle();
|
|
|
+gData.adData.checkShowFullInter(1);
|
|
|
}
|
|
|
};
|
|
|
e.prototype.initStyle = function() {
|
|
|
this.lbl_receipt_rmb.string = "￥" + (gData.receiptNotice.receip_rmb / 100).toFixed(2) + "元";
|
|
|
this.lbl_rmb_total.string = "￥" + (gData.cashNormal.receip_total_rmb / 100).toFixed(2) + "元";
|
|
|
this.lbl_user_name.string = gData.wechatData.nickName || "";
|
|
|
+mk.data.setTAEventUser(1, "cash_time", 1);
|
|
|
+mk.data.setTAEventUser(1, "cash_total", gData.receiptNotice.receip_rmb / 100);
|
|
|
};
|
|
|
a([ s({
|
|
|
displayName: "lbl收款金额",
|
|
|
@@ -15836,7 +15925,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;
|
|
|
@@ -15845,6 +15937,8 @@ e.prototype.init = function(t, e) {
|
|
|
this.labMoney.string = t.toFixed(2) + "元";
|
|
|
this.code = e;
|
|
|
this.labRedCode.string = "提现红包码：" + this.code;
|
|
|
+mk.data.setTAEventUser(1, "cash_time", 1);
|
|
|
+mk.data.setTAEventUser(1, "cash_total", t);
|
|
|
};
|
|
|
e.prototype.clickCopyOfficial = function() {
|
|
|
mk.audio.playEffect("button");
|
|
|
@@ -16613,10 +16707,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() {
|
|
|
@@ -16627,7 +16723,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;
|
|
|
@@ -16777,7 +16876,6 @@ e.prototype.onDestroy = function() {
|
|
|
this.cur_stage === s.none && mk.audio.playEffect("rewardClose");
|
|
|
};
|
|
|
e.prototype.onClickClose = function() {
|
|
|
-mk.ad.destoryBanner();
|
|
|
if (2 == gData.reward.subType) {
|
|
|
console.log("清除积分啦啦啦啦啦阿拉拉拉啦--------------------------------", l.default.Inst.ifPass);
|
|
|
gData.gameData.setProp(p.GameProp.curTotalScore, 0);
|
|
|
@@ -16787,6 +16885,8 @@ 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);
|
|
|
+mk.ad.destoryBanner();
|
|
|
};
|
|
|
a([ f({
|
|
|
displayName: "红包类型",
|
|
|
@@ -17597,6 +17697,7 @@ e.lbl_id = null;
|
|
|
e.img_music = null;
|
|
|
e.img_effect = null;
|
|
|
e.lbl_version = null;
|
|
|
+e.lbl_group = null;
|
|
|
e.node_rule = null;
|
|
|
return e;
|
|
|
}
|
|
|
@@ -17617,6 +17718,7 @@ console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
|
|
|
this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);
|
|
|
"1" != gData.gameData.funOpenData[6] ? this.lbl_nickname.string = "" : this.lbl_nickname.string = gData.wechatData.nickName;
|
|
|
this.lbl_version.string = gData.appData.appVersion;
|
|
|
+mk.console.ifShowLog ? this.lbl_group.string = "分组号：" + gData.gameData.gameData.groupCode : this.lbl_group.string = "";
|
|
|
t = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
|
|
|
e = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
|
|
|
n = this.img_music;
|
|
|
@@ -17734,6 +17836,10 @@ a([ d({
|
|
|
type: cc.Label,
|
|
|
displayName: "版本号"
|
|
|
}) ], e.prototype, "lbl_version", void 0);
|
|
|
+a([ d({
|
|
|
+type: cc.Label,
|
|
|
+displayName: "分组号"
|
|
|
+}) ], e.prototype, "lbl_group", void 0);
|
|
|
return a([ p ], e);
|
|
|
}(cc.Component);
|
|
|
n.default = h;
|
|
|
@@ -18424,11 +18530,123 @@ t.prototype = null === e ? Object.create(e) : (n.prototype = e.prototype, new n(
|
|
|
var i, a = arguments.length, r = a < 3 ? e : null === o ? o = Object.getOwnPropertyDescriptor(e, n) : o;
|
|
|
if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) r = Reflect.decorate(t, e, n, o); else for (var c = t.length - 1; c >= 0; c--) (i = t[c]) && (r = (a < 3 ? i(r) : a > 3 ? i(e, n, r) : i(e, n)) || r);
|
|
|
return a > 3 && r && Object.defineProperty(e, n, r), r;
|
|
|
+}, r = this && this.__awaiter || function(t, e, n, o) {
|
|
|
+return new (n || (n = Promise))(function(i, a) {
|
|
|
+function r(t) {
|
|
|
+try {
|
|
|
+s(o.next(t));
|
|
|
+} catch (t) {
|
|
|
+a(t);
|
|
|
+}
|
|
|
+}
|
|
|
+function c(t) {
|
|
|
+try {
|
|
|
+s(o.throw(t));
|
|
|
+} catch (t) {
|
|
|
+a(t);
|
|
|
+}
|
|
|
+}
|
|
|
+function s(t) {
|
|
|
+t.done ? i(t.value) : (e = t.value, e instanceof n ? e : new n(function(t) {
|
|
|
+t(e);
|
|
|
+})).then(r, c);
|
|
|
+var e;
|
|
|
+}
|
|
|
+s((o = o.apply(t, e || [])).next());
|
|
|
+});
|
|
|
+}, c = this && this.__generator || function(t, e) {
|
|
|
+var n, o, i, a, r = {
|
|
|
+label: 0,
|
|
|
+sent: function() {
|
|
|
+if (1 & i[0]) throw i[1];
|
|
|
+return i[1];
|
|
|
+},
|
|
|
+trys: [],
|
|
|
+ops: []
|
|
|
+};
|
|
|
+return a = {
|
|
|
+next: c(0),
|
|
|
+throw: c(1),
|
|
|
+return: c(2)
|
|
|
+}, "function" == typeof Symbol && (a[Symbol.iterator] = function() {
|
|
|
+return this;
|
|
|
+}), a;
|
|
|
+function c(t) {
|
|
|
+return function(e) {
|
|
|
+return s([ t, e ]);
|
|
|
+};
|
|
|
+}
|
|
|
+function s(a) {
|
|
|
+if (n) throw new TypeError("Generator is already executing.");
|
|
|
+for (;r; ) try {
|
|
|
+if (n = 1, o && (i = 2 & a[0] ? o.return : a[0] ? o.throw || ((i = o.return) && i.call(o),
|
|
|
+0) : o.next) && !(i = i.call(o, a[1])).done) return i;
|
|
|
+(o = 0, i) && (a = [ 2 & a[0], i.value ]);
|
|
|
+switch (a[0]) {
|
|
|
+case 0:
|
|
|
+case 1:
|
|
|
+i = a;
|
|
|
+break;
|
|
|
+
|
|
|
+case 4:
|
|
|
+r.label++;
|
|
|
+return {
|
|
|
+value: a[1],
|
|
|
+done: !1
|
|
|
+};
|
|
|
+
|
|
|
+case 5:
|
|
|
+r.label++;
|
|
|
+o = a[1];
|
|
|
+a = [ 0 ];
|
|
|
+continue;
|
|
|
+
|
|
|
+case 7:
|
|
|
+a = r.ops.pop();
|
|
|
+r.trys.pop();
|
|
|
+continue;
|
|
|
+
|
|
|
+default:
|
|
|
+if (!(i = r.trys, i = i.length > 0 && i[i.length - 1]) && (6 === a[0] || 2 === a[0])) {
|
|
|
+r = 0;
|
|
|
+continue;
|
|
|
+}
|
|
|
+if (3 === a[0] && (!i || a[1] > i[0] && a[1] < i[3])) {
|
|
|
+r.label = a[1];
|
|
|
+break;
|
|
|
+}
|
|
|
+if (6 === a[0] && r.label < i[1]) {
|
|
|
+r.label = i[1];
|
|
|
+i = a;
|
|
|
+break;
|
|
|
+}
|
|
|
+if (i && r.label < i[2]) {
|
|
|
+r.label = i[2];
|
|
|
+r.ops.push(a);
|
|
|
+break;
|
|
|
+}
|
|
|
+i[2] && r.ops.pop();
|
|
|
+r.trys.pop();
|
|
|
+continue;
|
|
|
+}
|
|
|
+a = e.call(t, r);
|
|
|
+} catch (t) {
|
|
|
+a = [ 6, t ];
|
|
|
+o = 0;
|
|
|
+} finally {
|
|
|
+n = i = 0;
|
|
|
+}
|
|
|
+if (5 & a[0]) throw a[1];
|
|
|
+return {
|
|
|
+value: a[0] ? a[1] : void 0,
|
|
|
+done: !0
|
|
|
+};
|
|
|
+}
|
|
|
};
|
|
|
Object.defineProperty(n, "__esModule", {
|
|
|
value: !0
|
|
|
});
|
|
|
-var r = t("../../../mk/system/JsbSystem"), c = t("../../data/AdData"), s = t("../../data/GameData"), l = cc._decorator, u = l.ccclass, p = l.property, d = function(t) {
|
|
|
+var s = t("../../../mk/system/JsbSystem"), l = t("../../data/AdData"), u = t("../../data/GameData"), p = cc._decorator, d = p.ccclass, h = p.property, f = function(t) {
|
|
|
i(e, t);
|
|
|
function e() {
|
|
|
var e = null !== t && t.apply(this, arguments) || this;
|
|
|
@@ -18463,23 +18681,35 @@ e.prototype.clickReceiveReward = function() {
|
|
|
mk.audio.playEffect("button");
|
|
|
if (1 != gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay()) {
|
|
|
var t = gData.gameData.gameData.signInDay;
|
|
|
-if (gData.sign.c_sign[t].rewardType !== s.RewardType.rmb || gData.loginData.isAuth) {
|
|
|
-mk.ad.videoAdType = s.VideoAdType.Sign;
|
|
|
+if (gData.sign.c_sign[t].rewardType !== u.RewardType.rmb || gData.loginData.isAuth) {
|
|
|
+mk.ad.videoAdType = u.VideoAdType.Sign;
|
|
|
mk.ad.watchAd(function(e) {
|
|
|
mk.console.log("watchAD:" + e);
|
|
|
if (e) {
|
|
|
-gData.adData.watchVideo(c.AdFun.sign);
|
|
|
-gData.sign.c_sign[t].rewardType === s.RewardType.rmb && mk.data.sendDataEvent(s.DataEventId.signWithDrawal, "签到提现成功");
|
|
|
+gData.adData.watchVideo(l.AdFun.sign);
|
|
|
+gData.sign.c_sign[t].rewardType === u.RewardType.rmb && mk.data.sendDataEvent(u.DataEventId.signWithDrawal, "签到提现成功");
|
|
|
mk.ad.destroyNativeAd();
|
|
|
}
|
|
|
});
|
|
|
-} else r.default.WxAuth();
|
|
|
+} else s.default.WxAuth();
|
|
|
}
|
|
|
};
|
|
|
e.prototype.getReward = function() {
|
|
|
-gData.sign.signComplete();
|
|
|
-var t = gData.sign.getItemIndexByCanSign();
|
|
|
+return r(this, void 0, void 0, function() {
|
|
|
+var t;
|
|
|
+return c(this, function(e) {
|
|
|
+switch (e.label) {
|
|
|
+case 0:
|
|
|
+return [ 4, gData.sign.signComplete() ];
|
|
|
+
|
|
|
+case 1:
|
|
|
+e.sent();
|
|
|
+t = gData.sign.getItemIndexByCanSign();
|
|
|
this.tableview.resetItemData(t, gData.sign.list_data[t]);
|
|
|
+return [ 2 ];
|
|
|
+}
|
|
|
+});
|
|
|
+});
|
|
|
};
|
|
|
e.prototype.initBtnStyle = function() {
|
|
|
if (0 == gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay()) {
|
|
|
@@ -18496,17 +18726,17 @@ e.prototype.onClickClose = function() {
|
|
|
mk.ad.destroyNativeAd();
|
|
|
mk.ad.checkShowInterByChance();
|
|
|
};
|
|
|
-a([ p({
|
|
|
+a([ h({
|
|
|
type: cc.ScrollView,
|
|
|
displayName: "滚动视图"
|
|
|
}) ], e.prototype, "scroll_view", void 0);
|
|
|
-a([ p({
|
|
|
+a([ h({
|
|
|
type: cc.Animation,
|
|
|
displayName: "按钮_动画"
|
|
|
}) ], e.prototype, "anim_btn", void 0);
|
|
|
-return a([ u ], e);
|
|
|
+return a([ d ], e);
|
|
|
}(cc.Component);
|
|
|
-n.default = d;
|
|
|
+n.default = f;
|
|
|
cc._RF.pop();
|
|
|
}, {
|
|
|
"../../../mk/system/JsbSystem": "JsbSystem",
|
kaka