|
@@ -4551,7 +4551,6 @@
|
|
|
this.n47 = (this.getChild("n47"));
|
|
|
this.n10 = (this.getChild("n10"));
|
|
|
this.secretary = (this.getChild("secretary"));
|
|
|
- this.shopBtn = (this.getChild("shopBtn"));
|
|
|
this.moneyNode = (this.getChild("moneyNode"));
|
|
|
this.headNode = (this.getChild("headNode"));
|
|
|
this.bigMoveBtn = (this.getChild("bigMoveBtn"));
|
|
@@ -4559,10 +4558,11 @@
|
|
|
this.classicBtn = (this.getChild("classicBtn"));
|
|
|
this.globalBtn = (this.getChild("globalBtn"));
|
|
|
this.n44 = (this.getChild("n44"));
|
|
|
- this.signBtn = (this.getChild("signBtn"));
|
|
|
- this.drawBtn = (this.getChild("drawBtn"));
|
|
|
this.n_dengLu = (this.getChild("n_dengLu"));
|
|
|
this.settingNode = (this.getChild("settingNode"));
|
|
|
+ this.drawBtn = (this.getChild("drawBtn"));
|
|
|
+ this.signBtn = (this.getChild("signBtn"));
|
|
|
+ this.shopBtn = (this.getChild("shopBtn"));
|
|
|
this.n45 = (this.getChild("n45"));
|
|
|
this.ganFaMoShiBtn = (this.getChild("ganFaMoShiBtn"));
|
|
|
this.secretaryBtn = (this.getChild("secretaryBtn"));
|
|
@@ -7588,7 +7588,6 @@
|
|
|
case 'app_sign_for_buyProduct_onSuccess':
|
|
|
console.log('zh:收到APP通知,需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
|
|
|
DataMgr.getUserZiChanInfo();
|
|
|
- console.log("zh:更新用户资产信息结束");
|
|
|
break;
|
|
|
case '222axxxxxx':
|
|
|
let dui15 = xGame.uiMgr.getUI(UISign);
|
|
@@ -7778,7 +7777,7 @@
|
|
|
addEvent() {
|
|
|
this.addUIClick(this.ui.classicBtn, this.startGame, [GameMode.classic]);
|
|
|
this.addUIClick(this.ui.bigMoveBtn, this.startGame, [GameMode.bigMove]);
|
|
|
- this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove]);
|
|
|
+ this.addUIClick(this.ui.ganFaMoShiBtn, this.openShopView0);
|
|
|
this.addUIClick(this.ui.globalBtn, this.startGlobal);
|
|
|
this.addUIClick(this.ui.placeBallBtn, this.startPlaceBall);
|
|
|
this.addUIClick(this.ui.headNode, this.onGetUserInfo, [true]);
|
|
@@ -7860,7 +7859,7 @@
|
|
|
}
|
|
|
}
|
|
|
ensureSecretary() {
|
|
|
- console.log('zh: ensureSecretary ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary');
|
|
|
+ console.log('zh: ensureSecretary ');
|
|
|
this.ui.secretaryGuide.visible = false;
|
|
|
this.ui.enterGuide.visible = true;
|
|
|
this.ui.wordsNode.t0.play();
|
|
@@ -7877,14 +7876,14 @@
|
|
|
xGame.common.secretary.play(data, 0, true, parent);
|
|
|
}
|
|
|
startGame(type) {
|
|
|
- console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
|
|
|
if (!this.isReadyForLoadNetSource()) {
|
|
|
return;
|
|
|
}
|
|
|
xGame.common.gameMode = type;
|
|
|
Moyu.sendDataEvent("PlayGame", { type: type });
|
|
|
- console.log('zh:进入游戏gameMode =' + xGame.common.gameMode);
|
|
|
- switch (xGame.common.gameMode) {
|
|
|
+ let gm = xGame.common.gameMode;
|
|
|
+ console.log('zh:进入游戏gameMode =' + gm);
|
|
|
+ switch (gm) {
|
|
|
case GameMode.classic:
|
|
|
console.log('zh:进入经典模式111111111');
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
|
|
@@ -7910,15 +7909,16 @@
|
|
|
else {
|
|
|
this.beginGame();
|
|
|
}
|
|
|
- break;
|
|
|
}
|
|
|
+ break;
|
|
|
case GameMode.bigMove:
|
|
|
- console.error('zh:bigMove check 大招');
|
|
|
+ console.info('zh:bigMove check 大招');
|
|
|
let guide = DataMgr.getSkillGuide();
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
|
|
|
let db_over_lev = DataMgr.getChallengeMode_overLev();
|
|
|
console.log('zh:bigMove db_over_lev=', db_over_lev);
|
|
|
if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod) {
|
|
|
+ console.log('zh:提示不可以玩');
|
|
|
let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
|
|
|
xGame.uiMgr.Show(UIMsg, tipStr);
|
|
|
return;
|
|
@@ -7951,30 +7951,36 @@
|
|
|
else {
|
|
|
console.log('zh:新手引导,不显示AD ');
|
|
|
}
|
|
|
- console.log('zh:beginGame 2 go');
|
|
|
+ console.log('zh:beginGame gameMode=' + xGame.common.gameMode);
|
|
|
+ console.log('zh:beginGame 1');
|
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
|
+ console.log('zh:beginGame 2');
|
|
|
if (isNice) {
|
|
|
console.log('zh:进入巅峰赛');
|
|
|
this.enterClassic();
|
|
|
}
|
|
|
else {
|
|
|
+ console.log('zh:beginGame 3-1');
|
|
|
xGame.uiMgr.Show(UIModeSelection, () => {
|
|
|
- console.log('zh:BBBBBBBBBBBBBBB');
|
|
|
+ console.log('zh:beginGame 3-2');
|
|
|
this.enterClassic();
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
else if (xGame.common.gameMode == GameMode.bigMove) {
|
|
|
+ console.log('zh:beginGame 5');
|
|
|
this.ui.enterGuide.visible = false;
|
|
|
xGame.uiMgr.Show(UISkill);
|
|
|
}
|
|
|
}
|
|
|
enterClassic() {
|
|
|
+ console.log('zh:beginGame 7');
|
|
|
xGame.uiMgr.Show(UIGame);
|
|
|
xGame.uiMgr.Show(UIMatching, () => {
|
|
|
if (!this.isHide)
|
|
|
this.hide();
|
|
|
xGame.common.gameUI.ui.alpha = 1;
|
|
|
+ console.log('zh:beginGame 8');
|
|
|
xGame.common.gameUI.startGame();
|
|
|
xGame.uiMgr.Hide(UIGameEnd);
|
|
|
});
|
|
@@ -8053,9 +8059,8 @@
|
|
|
Moyu.initUser(this, this.freshUser, force);
|
|
|
}
|
|
|
this.freshUser();
|
|
|
- console.log('zh:5秒后更新用戶資產信息');
|
|
|
+ console.log('zh:5秒后更新用户信息');
|
|
|
setTimeout(() => {
|
|
|
- console.log('setTimeout 5秒over 執行');
|
|
|
DataMgr.getUserZiChanInfo();
|
|
|
}, 5000);
|
|
|
}
|
|
@@ -8122,6 +8127,9 @@
|
|
|
Moyu.sendDataEvent("secretary");
|
|
|
}
|
|
|
openShopView() {
|
|
|
+ xGame.uiMgr.Show(UIShop, 1);
|
|
|
+ }
|
|
|
+ openShopView0() {
|
|
|
xGame.uiMgr.Show(UIShop, 0);
|
|
|
}
|
|
|
openSignView() {
|
|
@@ -11452,12 +11460,10 @@
|
|
|
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;
|
|
@@ -15376,7 +15382,6 @@
|
|
|
onConstruct() {
|
|
|
this.n0 = (this.getChild("n0"));
|
|
|
this.n3 = (this.getChild("n3"));
|
|
|
- this.t0 = this.getTransition("t0");
|
|
|
}
|
|
|
}
|
|
|
ui_dh_zy_shangcheng.URL = "ui://isxx5ak7n43d3vo";
|
|
@@ -18789,6 +18794,7 @@
|
|
|
}
|
|
|
this.userData.coin = val;
|
|
|
this.saveUserData();
|
|
|
+ console.log('zh:通知更新金币变化' + val);
|
|
|
xGame.eventMgr.event(COIN_CHANGE);
|
|
|
}
|
|
|
static getCoin() {
|
|
@@ -18824,6 +18830,7 @@
|
|
|
}
|
|
|
this.userData.diamond = val;
|
|
|
this.saveUserData();
|
|
|
+ console.log('zh:通知更新钻石变化' + val);
|
|
|
xGame.eventMgr.event(DIAMOND_CHANGE);
|
|
|
}
|
|
|
static getDiamond() {
|
|
@@ -18977,7 +18984,6 @@
|
|
|
this.saveUserData();
|
|
|
}
|
|
|
static setBallRodFormServer(haveQiuGanJsonStr) {
|
|
|
- console.log('zh:haveQiuGanJsonStr = ' + haveQiuGanJsonStr);
|
|
|
if (!haveQiuGanJsonStr) {
|
|
|
console.log("setBallRodFormServer数据为空或未定义");
|
|
|
return;
|
|
@@ -18988,8 +18994,6 @@
|
|
|
let v = haveQiuGanJsonObj[key];
|
|
|
let k = parseInt(key);
|
|
|
let idx = k - 1;
|
|
|
- console.log('zh:开始更新IDX = ' + idx);
|
|
|
- console.log('this.userData.ballRod[idx]===' + this.userData.ballRod[idx]);
|
|
|
this.userData.ballRod[idx] = v;
|
|
|
});
|
|
|
}
|
|
@@ -19180,7 +19184,6 @@
|
|
|
let reqData = xGame.httpMgr.getReqData();
|
|
|
xGame.httpMgr.sendPost2025('user/getUserGameInfo', reqData, (res) => {
|
|
|
try {
|
|
|
- console.log('zh:buySp res = ' + JSON.stringify(res));
|
|
|
let code = res.code;
|
|
|
let msg = res.msg;
|
|
|
if (code == 401) {
|
|
@@ -19197,15 +19200,14 @@
|
|
|
let placeBallData = d.placeBallData;
|
|
|
DataMgr.setDiamondFormServer(zuanShi);
|
|
|
DataMgr.setCoinFormServer(jinBi);
|
|
|
- console.log('zh:更新球杆信息');
|
|
|
DataMgr.setBallRodFormServer(haveQiuGanJson);
|
|
|
- console.log('zh:更新关卡信息');
|
|
|
DataMgr.setPlaceBallLevelList(placeBallData);
|
|
|
if (signData && signData > 0) {
|
|
|
DataMgr.setSignData(signData);
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
+ console.log("zh:更新用户资产信息error" + msg);
|
|
|
alert(msg);
|
|
|
}
|
|
|
}
|
|
@@ -19214,6 +19216,7 @@
|
|
|
alert(error);
|
|
|
}
|
|
|
finally {
|
|
|
+ console.log("zh:更新用户资产信息结束");
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -20458,12 +20461,10 @@
|
|
|
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;
|
|
@@ -24673,7 +24674,6 @@
|
|
|
case 'app_sign_for_buyProduct_onSuccess':
|
|
|
console.log('zh:收到APP通知,需要更新用户游戏资产信息app_sign_for_buyProduct_onSuccess ');
|
|
|
DataMgr.getUserZiChanInfo();
|
|
|
- console.log("zh:更新用户资产信息结束");
|
|
|
break;
|
|
|
case '222axxxxxx':
|
|
|
let dui15 = xGame.uiMgr.getUI(UISign$1);
|
|
@@ -24863,7 +24863,7 @@
|
|
|
addEvent() {
|
|
|
this.addUIClick(this.ui.classicBtn, this.startGame, [GameMode.classic]);
|
|
|
this.addUIClick(this.ui.bigMoveBtn, this.startGame, [GameMode.bigMove]);
|
|
|
- this.addUIClick(this.ui.ganFaMoShiBtn, this.startGame, [GameMode.bigMove]);
|
|
|
+ this.addUIClick(this.ui.ganFaMoShiBtn, this.openShopView0);
|
|
|
this.addUIClick(this.ui.globalBtn, this.startGlobal);
|
|
|
this.addUIClick(this.ui.placeBallBtn, this.startPlaceBall);
|
|
|
this.addUIClick(this.ui.headNode, this.onGetUserInfo, [true]);
|
|
@@ -24945,7 +24945,7 @@
|
|
|
}
|
|
|
}
|
|
|
ensureSecretary() {
|
|
|
- console.log('zh: ensureSecretary ensureSecretaryensureSecretaryensureSecretaryensureSecretaryensureSecretary');
|
|
|
+ console.log('zh: ensureSecretary ');
|
|
|
this.ui.secretaryGuide.visible = false;
|
|
|
this.ui.enterGuide.visible = true;
|
|
|
this.ui.wordsNode.t0.play();
|
|
@@ -24962,14 +24962,14 @@
|
|
|
xGame.common.secretary.play(data, 0, true, parent);
|
|
|
}
|
|
|
startGame(type) {
|
|
|
- console.log("zh:@@@@@@@@@@@@@@@@@@@@startGame=", type);
|
|
|
if (!this.isReadyForLoadNetSource()) {
|
|
|
return;
|
|
|
}
|
|
|
xGame.common.gameMode = type;
|
|
|
Moyu.sendDataEvent("PlayGame", { type: type });
|
|
|
- console.log('zh:进入游戏gameMode =' + xGame.common.gameMode);
|
|
|
- switch (xGame.common.gameMode) {
|
|
|
+ let gm = xGame.common.gameMode;
|
|
|
+ console.log('zh:进入游戏gameMode =' + gm);
|
|
|
+ switch (gm) {
|
|
|
case GameMode.classic:
|
|
|
console.log('zh:进入经典模式111111111');
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark) {
|
|
@@ -24995,15 +24995,16 @@
|
|
|
else {
|
|
|
this.beginGame();
|
|
|
}
|
|
|
- break;
|
|
|
}
|
|
|
+ break;
|
|
|
case GameMode.bigMove:
|
|
|
- console.error('zh:bigMove check 大招');
|
|
|
+ console.info('zh:bigMove check 大招');
|
|
|
let guide = DataMgr.getSkillGuide();
|
|
|
if (DataMgr.DIY_challengeMode_overLev_jieSuo_mark && guide == 1) {
|
|
|
let db_over_lev = DataMgr.getChallengeMode_overLev();
|
|
|
console.log('zh:bigMove db_over_lev=', db_over_lev);
|
|
|
if (db_over_lev < DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod) {
|
|
|
+ console.log('zh:提示不可以玩');
|
|
|
let tipStr = 'Complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_rodMethod + ' levels in Challenge Mode to unlock the Rod Method Mode';
|
|
|
xGame.uiMgr.Show(UIMsg$1, tipStr);
|
|
|
return;
|
|
@@ -25036,30 +25037,36 @@
|
|
|
else {
|
|
|
console.log('zh:新手引导,不显示AD ');
|
|
|
}
|
|
|
- console.log('zh:beginGame 2 go');
|
|
|
+ console.log('zh:beginGame gameMode=' + xGame.common.gameMode);
|
|
|
+ console.log('zh:beginGame 1');
|
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
|
+ console.log('zh:beginGame 2');
|
|
|
if (isNice) {
|
|
|
console.log('zh:进入巅峰赛');
|
|
|
this.enterClassic();
|
|
|
}
|
|
|
else {
|
|
|
+ console.log('zh:beginGame 3-1');
|
|
|
xGame.uiMgr.Show(UIModeSelection$1, () => {
|
|
|
- console.log('zh:BBBBBBBBBBBBBBB');
|
|
|
+ console.log('zh:beginGame 3-2');
|
|
|
this.enterClassic();
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
else if (xGame.common.gameMode == GameMode.bigMove) {
|
|
|
+ console.log('zh:beginGame 5');
|
|
|
this.ui.enterGuide.visible = false;
|
|
|
xGame.uiMgr.Show(UISkill$1);
|
|
|
}
|
|
|
}
|
|
|
enterClassic() {
|
|
|
+ console.log('zh:beginGame 7');
|
|
|
xGame.uiMgr.Show(UIGame$1);
|
|
|
xGame.uiMgr.Show(UIMatching$1, () => {
|
|
|
if (!this.isHide)
|
|
|
this.hide();
|
|
|
xGame.common.gameUI.ui.alpha = 1;
|
|
|
+ console.log('zh:beginGame 8');
|
|
|
xGame.common.gameUI.startGame();
|
|
|
xGame.uiMgr.Hide(UIGameEnd$1);
|
|
|
});
|
|
@@ -25138,9 +25145,8 @@
|
|
|
Moyu.initUser(this, this.freshUser, force);
|
|
|
}
|
|
|
this.freshUser();
|
|
|
- console.log('zh:5秒后更新用戶資產信息');
|
|
|
+ console.log('zh:5秒后更新用户信息');
|
|
|
setTimeout(() => {
|
|
|
- console.log('setTimeout 5秒over 執行');
|
|
|
DataMgr.getUserZiChanInfo();
|
|
|
}, 5000);
|
|
|
}
|
|
@@ -25207,6 +25213,9 @@
|
|
|
Moyu.sendDataEvent("secretary");
|
|
|
}
|
|
|
openShopView() {
|
|
|
+ xGame.uiMgr.Show(UIShop$1, 1);
|
|
|
+ }
|
|
|
+ openShopView0() {
|
|
|
xGame.uiMgr.Show(UIShop$1, 0);
|
|
|
}
|
|
|
openSignView() {
|