|
|
@@ -1281,6 +1281,11 @@
|
|
|
console.log('zh: VIP SPID = 1,免除插页AD');
|
|
|
return false;
|
|
|
}
|
|
|
+ let boo7 = this.checkAdForUserOrderForSpid17(7);
|
|
|
+ if (boo7) {
|
|
|
+ console.log('zh: VIP SPID = 7,免除任何AD');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
console.log('zh:showInternAd start');
|
|
|
if (!Laya.Browser.onAndroid) {
|
|
|
console.log('zh:showInternAd 非android dev');
|
|
|
@@ -1326,6 +1331,10 @@
|
|
|
console.log('zh:检查 userInfo.buySpidsX[' + spid + '] ' + userInfo.buySpids[spid]);
|
|
|
}
|
|
|
let boo = userInfo.buySpids[spid];
|
|
|
+ if (!boo) {
|
|
|
+ console.log('zh:刷新一下用户的AD权利');
|
|
|
+ DataMgr.loadUserSpOrderForAd();
|
|
|
+ }
|
|
|
console.log('zh:检查是否免AD SPID=' + spid + '= 免除AD？=' + boo);
|
|
|
return boo;
|
|
|
}
|
|
|
@@ -4571,8 +4580,6 @@
|
|
|
this.talkNode = (this.getChild("talkNode"));
|
|
|
this.n83 = (this.getChild("n83"));
|
|
|
this.n84 = (this.getChild("n84"));
|
|
|
- this.n_Logout = (this.getChild("n_Logout"));
|
|
|
- this.n_zhuCe = (this.getChild("n_zhuCe"));
|
|
|
this.n_moni_pay_ok = (this.getChild("n_moni_pay_ok"));
|
|
|
}
|
|
|
}
|
|
|
@@ -6971,11 +6978,11 @@
|
|
|
this.closeBtn = (this.getChild("closeBtn"));
|
|
|
this.btn_gotoReg = (this.getChild("btn_gotoReg"));
|
|
|
this.btn_login = (this.getChild("btn_login"));
|
|
|
- this.n30 = (this.getChild("n30"));
|
|
|
this.n31 = (this.getChild("n31"));
|
|
|
this.txt_up = (this.getChild("txt_up"));
|
|
|
this.n32 = (this.getChild("n32"));
|
|
|
this.txt_ua = (this.getChild("txt_ua"));
|
|
|
+ this.n40 = (this.getChild("n40"));
|
|
|
}
|
|
|
}
|
|
|
ui_UILogin.URL = "ui://isxx5ak7bobav57u";
|
|
|
@@ -7163,6 +7170,7 @@
|
|
|
let token = userInfo.token;
|
|
|
let ggSpid = 'com.vadltq.strike.ball.cue.noads.pack';
|
|
|
JSBridgeUtils.instance.startGgPay(token, ggSpid, 1);
|
|
|
+ DataMgr.loadUserSpOrderForAd();
|
|
|
return;
|
|
|
}
|
|
|
else {
|
|
|
@@ -7248,6 +7256,7 @@
|
|
|
let token = userInfo.token;
|
|
|
let ggSpid = 'com.vadltq.strike.ball.cue.passcard';
|
|
|
JSBridgeUtils.instance.startGgPay(token, ggSpid, 7);
|
|
|
+ DataMgr.loadUserSpOrderForAd();
|
|
|
return;
|
|
|
}
|
|
|
else {
|
|
|
@@ -7576,15 +7585,16 @@
|
|
|
let dui12 = xGame.uiMgr.getUI(UIAddCoin);
|
|
|
dui12.qjff_AD_for_UIAddCoin();
|
|
|
break;
|
|
|
- case '111a':
|
|
|
- let dui14 = xGame.uiMgr.getUI(UISign);
|
|
|
- dui14.qjff_AD_for_uisign();
|
|
|
+ case 'app_sign_for_buyProduct_onSuccess':
|
|
|
+ console.log('zh:收到APP通知，需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
|
|
|
+ DataMgr.getUserZiChanInfo();
|
|
|
+ console.log("zh:更新用户资产信息结束");
|
|
|
break;
|
|
|
- case '222a':
|
|
|
+ case '222axxxxxx':
|
|
|
let dui15 = xGame.uiMgr.getUI(UISign);
|
|
|
dui15.qjff_AD_for_uisign();
|
|
|
break;
|
|
|
- case '333a':
|
|
|
+ case '333axsxxxxxx':
|
|
|
let dui16 = xGame.uiMgr.getUI(UISign);
|
|
|
dui16.qjff_AD_for_uisign();
|
|
|
break;
|
|
|
@@ -7641,6 +7651,12 @@
|
|
|
DataMgr.setDiamond2(0);
|
|
|
this.setDefaultQiuGanInfo();
|
|
|
DataMgr.setPlaceBallLevelList("");
|
|
|
+ DataMgr.setChallengeMode_overLev(1);
|
|
|
+ this.setDefaultSignData();
|
|
|
+ }
|
|
|
+ setDefaultSignData() {
|
|
|
+ DataMgr.setSignData(1);
|
|
|
+ DataMgr.setSignTime(new Date().getTime());
|
|
|
}
|
|
|
setDefaultQiuGanInfo() {
|
|
|
DataMgr.setBallRod(0, 1);
|
|
|
@@ -7657,7 +7673,12 @@
|
|
|
Moyu.updateUserInfo(defUsername);
|
|
|
}
|
|
|
gotoLogin() {
|
|
|
- xGame.uiMgr.Show(UILogin);
|
|
|
+ if (this.ui.n_dengLu.c1.selectedIndex == 0) {
|
|
|
+ xGame.uiMgr.Show(UILogin);
|
|
|
+ }
|
|
|
+ if (this.ui.n_dengLu.c1.selectedIndex == 1) {
|
|
|
+ this.Logout();
|
|
|
+ }
|
|
|
}
|
|
|
gotoRegUser() {
|
|
|
xGame.uiMgr.Show(UIReg);
|
|
|
@@ -7724,14 +7745,12 @@
|
|
|
});
|
|
|
}
|
|
|
c_btn_for_user() {
|
|
|
- this.ui.n_Logout.visible = false;
|
|
|
- this.ui.n_dengLu.visible = false;
|
|
|
- this.ui.n_zhuCe.visible = false;
|
|
|
+ this.ui.n_dengLu.c1.selectedIndex = 0;
|
|
|
if (LocalStorageManager.hasJosnKey(keyForLoginInfo)) {
|
|
|
- this.ui.n_Logout.visible = true;
|
|
|
+ this.ui.n_dengLu.c1.selectedIndex = 1;
|
|
|
}
|
|
|
else {
|
|
|
- this.ui.n_dengLu.visible = true;
|
|
|
+ this.ui.n_dengLu.c1.selectedIndex = 0;
|
|
|
}
|
|
|
}
|
|
|
changeSecretary(curUse) {
|
|
|
@@ -7771,13 +7790,12 @@
|
|
|
this.addUIClick(this.ui.signBtn, this.openSignView);
|
|
|
this.addUIClick(this.ui.drawBtn, this.openDrawView);
|
|
|
this.addUIClick(this.ui.rankBtn, this.openRanking);
|
|
|
- this.addUIClick(this.ui.n_Logout, this.Logout);
|
|
|
this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
|
|
|
- this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
|
|
|
this.addUIClick(this.ui.n_moni_pay_ok, this.start_debug_for_moni_payOk);
|
|
|
}
|
|
|
show(showFailWords) {
|
|
|
super.show();
|
|
|
+ DataMgr.loadUserSpOrderForAd();
|
|
|
this.moneyNode.ui.c1.selectedIndex = 1;
|
|
|
this.playSecretaryIdle();
|
|
|
xGame.soundMgr.playMusic("caromhall01", 0);
|
|
|
@@ -7859,6 +7877,7 @@
|
|
|
xGame.common.secretary.play(data, 0, true, parent);
|
|
|
}
|
|
|
startGame(type) {
|
|
|
+ console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
|
|
|
if (!this.isReadyForLoadNetSource()) {
|
|
|
return;
|
|
|
}
|
|
|
@@ -7870,7 +7889,7 @@
|
|
|
console.log('zh:进入经典模式111111111');
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
|
|
|
let db_over_lev = DataMgr.getChallengeMode_overLev();
|
|
|
- console.log('zh:classic db_over_lev=', db_over_lev);
|
|
|
+ console.log('zh:classic 经典模式 db_over_lev=', db_over_lev);
|
|
|
if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_Classic) {
|
|
|
console.log('zh:判断是否可以玩该模式classic =NO');
|
|
|
let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
|
|
|
@@ -7878,7 +7897,7 @@
|
|
|
return;
|
|
|
}
|
|
|
else {
|
|
|
- console.log('zh:可以玩该模式classic 66666666666666');
|
|
|
+ console.log('zh:可以玩该模式classic');
|
|
|
this.beginGame();
|
|
|
}
|
|
|
}
|
|
|
@@ -7894,7 +7913,7 @@
|
|
|
break;
|
|
|
}
|
|
|
case GameMode.bigMove:
|
|
|
- console.error('zh:bigMove check');
|
|
|
+ console.error('zh:bigMove check 大招');
|
|
|
let guide = DataMgr.getSkillGuide();
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
|
|
|
let db_over_lev = DataMgr.getChallengeMode_overLev();
|
|
|
@@ -7935,6 +7954,7 @@
|
|
|
console.log('zh:beginGame 2 go');
|
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
|
if (isNice) {
|
|
|
+ console.log('zh:进入巅峰赛');
|
|
|
this.enterClassic();
|
|
|
}
|
|
|
else {
|
|
|
@@ -11432,10 +11452,12 @@
|
|
|
xGame.common.d3World.tableSrc.gameObj.transform.localPositionY = 0;
|
|
|
switch (xGame.common.gameMode) {
|
|
|
case GameMode.classic:
|
|
|
+ alert("经典模式");
|
|
|
xGame.common.d3World.d3Hand.gameObj.active = true;
|
|
|
this.playPutBallD3Ani();
|
|
|
break;
|
|
|
case GameMode.bigMove:
|
|
|
+ alert("大招模式");
|
|
|
this.enterGame();
|
|
|
Laya.timer.once(500, this, () => {
|
|
|
this.ui.topNode.middleNode.visible = true;
|
|
|
@@ -12552,7 +12574,7 @@
|
|
|
normalStar: 12000,
|
|
|
wxStar: 12001
|
|
|
};
|
|
|
- this.skillNameList = ["Surging Break", "Skyfall Shot", "Frost Lock"];
|
|
|
+ this.skillNameList = ["Skyfall Shot", "Surging Break", "Frost Lock"];
|
|
|
this.skillIconList = ["gf_jn1", "gf_jn2", "gf_jn4"];
|
|
|
this.btnClickStr = "buttonclick";
|
|
|
this.maxSkillLevel = 10;
|
|
|
@@ -14350,7 +14372,9 @@
|
|
|
return (fgui.UIPackage.createObject("game", "Component_denglu"));
|
|
|
}
|
|
|
onConstruct() {
|
|
|
+ this.c1 = this.getController("c1");
|
|
|
this.n102 = (this.getChild("n102"));
|
|
|
+ this.n103 = (this.getChild("n103"));
|
|
|
}
|
|
|
}
|
|
|
ui_Component_denglu.URL = "ui://isxx5ak7ijwrv5a0";
|
|
|
@@ -15661,17 +15685,6 @@
|
|
|
}
|
|
|
ui_ranking_com13.URL = "ui://isxx5ak7p7rrv4qa";
|
|
|
|
|
|
- class ui_Component_dl_zc extends fgui.GButton {
|
|
|
- static createInstance() {
|
|
|
- return (fgui.UIPackage.createObject("game", "Component_dl_zc"));
|
|
|
- }
|
|
|
- onConstruct() {
|
|
|
- this.c1 = this.getController("c1");
|
|
|
- this.n0 = (this.getChild("n0"));
|
|
|
- }
|
|
|
- }
|
|
|
- ui_Component_dl_zc.URL = "ui://isxx5ak7p8p3v58c";
|
|
|
-
|
|
|
class ui_Component122 extends fgui.GComponent {
|
|
|
static createInstance() {
|
|
|
return (fgui.UIPackage.createObject("game", "Component122"));
|
|
|
@@ -16926,7 +16939,6 @@
|
|
|
fgui.UIObjectFactory.setExtension(ui_ranking_com10.URL, ui_ranking_com10);
|
|
|
fgui.UIObjectFactory.setExtension(ui_ranking_com11.URL, ui_ranking_com11);
|
|
|
fgui.UIObjectFactory.setExtension(ui_ranking_com13.URL, ui_ranking_com13);
|
|
|
- fgui.UIObjectFactory.setExtension(ui_Component_dl_zc.URL, ui_Component_dl_zc);
|
|
|
fgui.UIObjectFactory.setExtension(ui_Component122.URL, ui_Component122);
|
|
|
fgui.UIObjectFactory.setExtension(ui_skillItem.URL, ui_skillItem);
|
|
|
fgui.UIObjectFactory.setExtension(ui_Component26.URL, ui_Component26);
|
|
|
@@ -18851,6 +18863,10 @@
|
|
|
if (objStr) {
|
|
|
let obj = JSON.parse(objStr);
|
|
|
this.userData.placeBallData = obj;
|
|
|
+ let cd = obj.length;
|
|
|
+ console.log('zh:setPlaceBallLevelList cd=' + cd);
|
|
|
+ xGame.common.placeBallCurLevel = cd;
|
|
|
+ DataMgr.setChallengeMode_overLev(cd);
|
|
|
this.saveUserData();
|
|
|
}
|
|
|
else {
|
|
|
@@ -20442,10 +20458,12 @@
|
|
|
xGame.common.d3World.tableSrc.gameObj.transform.localPositionY = 0;
|
|
|
switch (xGame.common.gameMode) {
|
|
|
case GameMode.classic:
|
|
|
+ alert("经典模式");
|
|
|
xGame.common.d3World.d3Hand.gameObj.active = true;
|
|
|
this.playPutBallD3Ani();
|
|
|
break;
|
|
|
case GameMode.bigMove:
|
|
|
+ alert("大招模式");
|
|
|
this.enterGame();
|
|
|
Laya.timer.once(500, this, () => {
|
|
|
this.ui.topNode.middleNode.visible = true;
|
|
|
@@ -24162,6 +24180,7 @@
|
|
|
let token = userInfo.token;
|
|
|
let ggSpid = 'com.vadltq.strike.ball.cue.noads.pack';
|
|
|
JSBridgeUtils.instance.startGgPay(token, ggSpid, 1);
|
|
|
+ DataMgr.loadUserSpOrderForAd();
|
|
|
return;
|
|
|
}
|
|
|
else {
|
|
|
@@ -24236,6 +24255,7 @@
|
|
|
let token = userInfo.token;
|
|
|
let ggSpid = 'com.vadltq.strike.ball.cue.passcard';
|
|
|
JSBridgeUtils.instance.startGgPay(token, ggSpid, 7);
|
|
|
+ DataMgr.loadUserSpOrderForAd();
|
|
|
return;
|
|
|
}
|
|
|
else {
|
|
|
@@ -24650,15 +24670,16 @@
|
|
|
let dui12 = xGame.uiMgr.getUI(UIAddCoin$1);
|
|
|
dui12.qjff_AD_for_UIAddCoin();
|
|
|
break;
|
|
|
- case '111a':
|
|
|
- let dui14 = xGame.uiMgr.getUI(UISign$1);
|
|
|
- dui14.qjff_AD_for_uisign();
|
|
|
+ case 'app_sign_for_buyProduct_onSuccess':
|
|
|
+ console.log('zh:收到APP通知，需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
|
|
|
+ DataMgr.getUserZiChanInfo();
|
|
|
+ console.log("zh:更新用户资产信息结束");
|
|
|
break;
|
|
|
- case '222a':
|
|
|
+ case '222axxxxxx':
|
|
|
let dui15 = xGame.uiMgr.getUI(UISign$1);
|
|
|
dui15.qjff_AD_for_uisign();
|
|
|
break;
|
|
|
- case '333a':
|
|
|
+ case '333axsxxxxxx':
|
|
|
let dui16 = xGame.uiMgr.getUI(UISign$1);
|
|
|
dui16.qjff_AD_for_uisign();
|
|
|
break;
|
|
|
@@ -24715,6 +24736,12 @@
|
|
|
DataMgr.setDiamond2(0);
|
|
|
this.setDefaultQiuGanInfo();
|
|
|
DataMgr.setPlaceBallLevelList("");
|
|
|
+ DataMgr.setChallengeMode_overLev(1);
|
|
|
+ this.setDefaultSignData();
|
|
|
+ }
|
|
|
+ setDefaultSignData() {
|
|
|
+ DataMgr.setSignData(1);
|
|
|
+ DataMgr.setSignTime(new Date().getTime());
|
|
|
}
|
|
|
setDefaultQiuGanInfo() {
|
|
|
DataMgr.setBallRod(0, 1);
|
|
|
@@ -24731,7 +24758,12 @@
|
|
|
Moyu.updateUserInfo(defUsername);
|
|
|
}
|
|
|
gotoLogin() {
|
|
|
- xGame.uiMgr.Show(UILogin$1);
|
|
|
+ if (this.ui.n_dengLu.c1.selectedIndex == 0) {
|
|
|
+ xGame.uiMgr.Show(UILogin$1);
|
|
|
+ }
|
|
|
+ if (this.ui.n_dengLu.c1.selectedIndex == 1) {
|
|
|
+ this.Logout();
|
|
|
+ }
|
|
|
}
|
|
|
gotoRegUser() {
|
|
|
xGame.uiMgr.Show(UIReg$1);
|
|
|
@@ -24798,14 +24830,12 @@
|
|
|
});
|
|
|
}
|
|
|
c_btn_for_user() {
|
|
|
- this.ui.n_Logout.visible = false;
|
|
|
- this.ui.n_dengLu.visible = false;
|
|
|
- this.ui.n_zhuCe.visible = false;
|
|
|
+ this.ui.n_dengLu.c1.selectedIndex = 0;
|
|
|
if (LocalStorageManager.hasJosnKey(keyForLoginInfo)) {
|
|
|
- this.ui.n_Logout.visible = true;
|
|
|
+ this.ui.n_dengLu.c1.selectedIndex = 1;
|
|
|
}
|
|
|
else {
|
|
|
- this.ui.n_dengLu.visible = true;
|
|
|
+ this.ui.n_dengLu.c1.selectedIndex = 0;
|
|
|
}
|
|
|
}
|
|
|
changeSecretary(curUse) {
|
|
|
@@ -24845,13 +24875,12 @@
|
|
|
this.addUIClick(this.ui.signBtn, this.openSignView);
|
|
|
this.addUIClick(this.ui.drawBtn, this.openDrawView);
|
|
|
this.addUIClick(this.ui.rankBtn, this.openRanking);
|
|
|
- this.addUIClick(this.ui.n_Logout, this.Logout);
|
|
|
this.addUIClick(this.ui.n_dengLu, this.gotoLogin);
|
|
|
- this.addUIClick(this.ui.n_zhuCe, this.gotoRegUser);
|
|
|
this.addUIClick(this.ui.n_moni_pay_ok, this.start_debug_for_moni_payOk);
|
|
|
}
|
|
|
show(showFailWords) {
|
|
|
super.show();
|
|
|
+ DataMgr.loadUserSpOrderForAd();
|
|
|
this.moneyNode.ui.c1.selectedIndex = 1;
|
|
|
this.playSecretaryIdle();
|
|
|
xGame.soundMgr.playMusic("caromhall01", 0);
|
|
|
@@ -24933,6 +24962,7 @@
|
|
|
xGame.common.secretary.play(data, 0, true, parent);
|
|
|
}
|
|
|
startGame(type) {
|
|
|
+ console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
|
|
|
if (!this.isReadyForLoadNetSource()) {
|
|
|
return;
|
|
|
}
|
|
|
@@ -24944,7 +24974,7 @@
|
|
|
console.log('zh:进入经典模式111111111');
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
|
|
|
let db_over_lev = DataMgr.getChallengeMode_overLev();
|
|
|
- console.log('zh:classic db_over_lev=', db_over_lev);
|
|
|
+ console.log('zh:classic 经典模式 db_over_lev=', db_over_lev);
|
|
|
if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_Classic) {
|
|
|
console.log('zh:判断是否可以玩该模式classic =NO');
|
|
|
let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
|
|
|
@@ -24952,7 +24982,7 @@
|
|
|
return;
|
|
|
}
|
|
|
else {
|
|
|
- console.log('zh:可以玩该模式classic 66666666666666');
|
|
|
+ console.log('zh:可以玩该模式classic');
|
|
|
this.beginGame();
|
|
|
}
|
|
|
}
|
|
|
@@ -24968,7 +24998,7 @@
|
|
|
break;
|
|
|
}
|
|
|
case GameMode.bigMove:
|
|
|
- console.error('zh:bigMove check');
|
|
|
+ console.error('zh:bigMove check 大招');
|
|
|
let guide = DataMgr.getSkillGuide();
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
|
|
|
let db_over_lev = DataMgr.getChallengeMode_overLev();
|
|
|
@@ -25009,6 +25039,7 @@
|
|
|
console.log('zh:beginGame 2 go');
|
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
|
if (isNice) {
|
|
|
+ console.log('zh:进入巅峰赛');
|
|
|
this.enterClassic();
|
|
|
}
|
|
|
else {
|
dzduole
