|
@@ -6568,11 +6568,9 @@
|
|
xGame.common.isNewDay = false;
|
|
xGame.common.isNewDay = false;
|
|
xGame.soundMgr.playSound("s_main01");
|
|
xGame.soundMgr.playSound("s_main01");
|
|
xGame.common.showGirlTalkPop(1, this.ui.talkNode, this.ui.talkNode.womanTxt);
|
|
xGame.common.showGirlTalkPop(1, this.ui.talkNode, this.ui.talkNode.womanTxt);
|
|
- console.log("播放小秘书每天语音");
|
|
|
|
|
|
+ console.log("zh:播放小秘书每天语音");
|
|
}
|
|
}
|
|
- this.onGetUserInfo();
|
|
|
|
this.ui.n83.visible = false;
|
|
this.ui.n83.visible = false;
|
|
- Moyu.setShareInfo("8Ball Fury", ["台球", "万宁", "桌球"], '2300002254');
|
|
|
|
window['nativeCallJs'] = this.nativeCallJs.bind(this);
|
|
window['nativeCallJs'] = this.nativeCallJs.bind(this);
|
|
}
|
|
}
|
|
changeSecretary(curUse) {
|
|
changeSecretary(curUse) {
|
|
@@ -6616,10 +6614,12 @@
|
|
super.show();
|
|
super.show();
|
|
this.moneyNode.ui.c1.selectedIndex = 1;
|
|
this.moneyNode.ui.c1.selectedIndex = 1;
|
|
this.playSecretaryIdle();
|
|
this.playSecretaryIdle();
|
|
- xGame.soundMgr.playMusic("caromhall01");
|
|
|
|
|
|
+ xGame.soundMgr.playMusic("caromhall01", 0);
|
|
Laya.timer.clearAll(this);
|
|
Laya.timer.clearAll(this);
|
|
this.playSecretaryRandomSound();
|
|
this.playSecretaryRandomSound();
|
|
|
|
+ console.log('zh:uimain.ts show show FailWords=', showFailWords);
|
|
if (showFailWords) {
|
|
if (showFailWords) {
|
|
|
|
+ console.log('zh:uimain.ts ');
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
let str = Math.random() <= 0.5 ? "s_main02" : "s_main03";
|
|
let str = Math.random() <= 0.5 ? "s_main02" : "s_main03";
|
|
let words = -1;
|
|
let words = -1;
|
|
@@ -6701,6 +6701,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
beginGame(isNice = false) {
|
|
beginGame(isNice = false) {
|
|
|
|
+ console.log('zh:beginGame beginGame beginGame');
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
if (isNice) {
|
|
if (isNice) {
|
|
this.enterClassic();
|
|
this.enterClassic();
|
|
@@ -6739,6 +6740,7 @@
|
|
xGame.uiMgr.Show(UILevelDisplay);
|
|
xGame.uiMgr.Show(UILevelDisplay);
|
|
}
|
|
}
|
|
hide() {
|
|
hide() {
|
|
|
|
+ console.log('zh:uimain hide ...');
|
|
super.hide();
|
|
super.hide();
|
|
xGame.common.stopGirlPop(this.ui.talkNode);
|
|
xGame.common.stopGirlPop(this.ui.talkNode);
|
|
}
|
|
}
|
|
@@ -9800,12 +9802,9 @@
|
|
}
|
|
}
|
|
show() {
|
|
show() {
|
|
super.show();
|
|
super.show();
|
|
- console.log("zh:uigame show");
|
|
|
|
|
|
+ console.log("zh:uigame show AADD");
|
|
this.ui.alpha = 0;
|
|
this.ui.alpha = 0;
|
|
this.updateSelf();
|
|
this.updateSelf();
|
|
- console.log("zh:uigame bf gamemusic01 start");
|
|
|
|
- xGame.soundMgr.playMusic("gamemusic01");
|
|
|
|
- console.log("zh:uigame bf gamemusic01 end");
|
|
|
|
xGame.common.gameMgr.gamePause = false;
|
|
xGame.common.gameMgr.gamePause = false;
|
|
xGame.common.gameUI.ui.blackAni.visible = false;
|
|
xGame.common.gameUI.ui.blackAni.visible = false;
|
|
xGame.common.gameUI.ui.whiteAni.visible = false;
|
|
xGame.common.gameUI.ui.whiteAni.visible = false;
|
|
@@ -9815,7 +9814,6 @@
|
|
let curUse = DataMgr.getCurBallRod();
|
|
let curUse = DataMgr.getCurBallRod();
|
|
console.log('zh:UIGame 选择的球杆234 = ' + curUse);
|
|
console.log('zh:UIGame 选择的球杆234 = ' + curUse);
|
|
this.getGanZiImg();
|
|
this.getGanZiImg();
|
|
- xGame.soundMgr.playSound("bjyy1", 0);
|
|
|
|
}
|
|
}
|
|
updateSelf() {
|
|
updateSelf() {
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
@@ -10329,7 +10327,6 @@
|
|
this.ui.off(Laya.Event.MOUSE_OUT, this, this.onEventUp);
|
|
this.ui.off(Laya.Event.MOUSE_OUT, this, this.onEventUp);
|
|
}
|
|
}
|
|
resetGame() {
|
|
resetGame() {
|
|
- xGame.soundMgr.stopSound("bjyy1");
|
|
|
|
this.closeAllEvent();
|
|
this.closeAllEvent();
|
|
this.hideBallUI();
|
|
this.hideBallUI();
|
|
xGame.common.gameMgr.gamePause = true;
|
|
xGame.common.gameMgr.gamePause = true;
|
|
@@ -15773,28 +15770,25 @@
|
|
playMusic(path, loop = 0) {
|
|
playMusic(path, loop = 0) {
|
|
console.log('zh:playMusic 1 PATH=' + path);
|
|
console.log('zh:playMusic 1 PATH=' + path);
|
|
this.musicPath = path;
|
|
this.musicPath = path;
|
|
- if (!this.isLoad)
|
|
|
|
- console.log('zh:playMusic 2');
|
|
|
|
- return;
|
|
|
|
- if (!path || path == "")
|
|
|
|
- console.log('zh:playMusic 3');
|
|
|
|
- return;
|
|
|
|
- if (!this.isSound)
|
|
|
|
- console.log('zh:playMusic 4');
|
|
|
|
- return;
|
|
|
|
|
|
+ if (!this.isLoad) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if (!path || path == "") {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ if (!this.isSound) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
this.musicPlayed = true;
|
|
this.musicPlayed = true;
|
|
- console.log('zh:playMusic 5');
|
|
|
|
let url = this.getUrl(path);
|
|
let url = this.getUrl(path);
|
|
- console.log('zh:playMusic 6' + url);
|
|
|
|
- if (Laya.Browser.onPC) {
|
|
|
|
- console.log('zh:playMusic 7');
|
|
|
|
|
|
+ if (!Laya.Browser.onAndroid) {
|
|
Laya.loader.load(url, Laya.Handler.create(this, () => {
|
|
Laya.loader.load(url, Laya.Handler.create(this, () => {
|
|
- console.log('zh:playMusic 8');
|
|
|
|
this.play(url, loop);
|
|
this.play(url, loop);
|
|
}));
|
|
}));
|
|
}
|
|
}
|
|
- else
|
|
|
|
|
|
+ else {
|
|
this.play(url, loop);
|
|
this.play(url, loop);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
play(url, loop) {
|
|
play(url, loop) {
|
|
Laya.SoundManager.playMusic(url, loop);
|
|
Laya.SoundManager.playMusic(url, loop);
|
|
@@ -17983,12 +17977,9 @@
|
|
}
|
|
}
|
|
show() {
|
|
show() {
|
|
super.show();
|
|
super.show();
|
|
- console.log("zh:uigame show");
|
|
|
|
|
|
+ console.log("zh:uigame show AADD");
|
|
this.ui.alpha = 0;
|
|
this.ui.alpha = 0;
|
|
this.updateSelf();
|
|
this.updateSelf();
|
|
- console.log("zh:uigame bf gamemusic01 start");
|
|
|
|
- xGame.soundMgr.playMusic("gamemusic01");
|
|
|
|
- console.log("zh:uigame bf gamemusic01 end");
|
|
|
|
xGame.common.gameMgr.gamePause = false;
|
|
xGame.common.gameMgr.gamePause = false;
|
|
xGame.common.gameUI.ui.blackAni.visible = false;
|
|
xGame.common.gameUI.ui.blackAni.visible = false;
|
|
xGame.common.gameUI.ui.whiteAni.visible = false;
|
|
xGame.common.gameUI.ui.whiteAni.visible = false;
|
|
@@ -17998,7 +17989,6 @@
|
|
let curUse = DataMgr.getCurBallRod();
|
|
let curUse = DataMgr.getCurBallRod();
|
|
console.log('zh:UIGame 选择的球杆234 = ' + curUse);
|
|
console.log('zh:UIGame 选择的球杆234 = ' + curUse);
|
|
this.getGanZiImg();
|
|
this.getGanZiImg();
|
|
- xGame.soundMgr.playSound("bjyy1", 0);
|
|
|
|
}
|
|
}
|
|
updateSelf() {
|
|
updateSelf() {
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
@@ -18512,7 +18502,6 @@
|
|
this.ui.off(Laya.Event.MOUSE_OUT, this, this.onEventUp);
|
|
this.ui.off(Laya.Event.MOUSE_OUT, this, this.onEventUp);
|
|
}
|
|
}
|
|
resetGame() {
|
|
resetGame() {
|
|
- xGame.soundMgr.stopSound("bjyy1");
|
|
|
|
this.closeAllEvent();
|
|
this.closeAllEvent();
|
|
this.hideBallUI();
|
|
this.hideBallUI();
|
|
xGame.common.gameMgr.gamePause = true;
|
|
xGame.common.gameMgr.gamePause = true;
|
|
@@ -21284,11 +21273,9 @@
|
|
xGame.common.isNewDay = false;
|
|
xGame.common.isNewDay = false;
|
|
xGame.soundMgr.playSound("s_main01");
|
|
xGame.soundMgr.playSound("s_main01");
|
|
xGame.common.showGirlTalkPop(1, this.ui.talkNode, this.ui.talkNode.womanTxt);
|
|
xGame.common.showGirlTalkPop(1, this.ui.talkNode, this.ui.talkNode.womanTxt);
|
|
- console.log("播放小秘书每天语音");
|
|
|
|
|
|
+ console.log("zh:播放小秘书每天语音");
|
|
}
|
|
}
|
|
- this.onGetUserInfo();
|
|
|
|
this.ui.n83.visible = false;
|
|
this.ui.n83.visible = false;
|
|
- Moyu.setShareInfo("8Ball Fury", ["台球", "万宁", "桌球"], '2300002254');
|
|
|
|
window['nativeCallJs'] = this.nativeCallJs.bind(this);
|
|
window['nativeCallJs'] = this.nativeCallJs.bind(this);
|
|
}
|
|
}
|
|
changeSecretary(curUse) {
|
|
changeSecretary(curUse) {
|
|
@@ -21332,10 +21319,12 @@
|
|
super.show();
|
|
super.show();
|
|
this.moneyNode.ui.c1.selectedIndex = 1;
|
|
this.moneyNode.ui.c1.selectedIndex = 1;
|
|
this.playSecretaryIdle();
|
|
this.playSecretaryIdle();
|
|
- xGame.soundMgr.playMusic("caromhall01");
|
|
|
|
|
|
+ xGame.soundMgr.playMusic("caromhall01", 0);
|
|
Laya.timer.clearAll(this);
|
|
Laya.timer.clearAll(this);
|
|
this.playSecretaryRandomSound();
|
|
this.playSecretaryRandomSound();
|
|
|
|
+ console.log('zh:uimain.ts show show FailWords=', showFailWords);
|
|
if (showFailWords) {
|
|
if (showFailWords) {
|
|
|
|
+ console.log('zh:uimain.ts ');
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
let str = Math.random() <= 0.5 ? "s_main02" : "s_main03";
|
|
let str = Math.random() <= 0.5 ? "s_main02" : "s_main03";
|
|
let words = -1;
|
|
let words = -1;
|
|
@@ -21417,6 +21406,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
beginGame(isNice = false) {
|
|
beginGame(isNice = false) {
|
|
|
|
+ console.log('zh:beginGame beginGame beginGame');
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
if (xGame.common.gameMode == GameMode.classic) {
|
|
if (isNice) {
|
|
if (isNice) {
|
|
this.enterClassic();
|
|
this.enterClassic();
|
|
@@ -21455,6 +21445,7 @@
|
|
xGame.uiMgr.Show(UILevelDisplay$1);
|
|
xGame.uiMgr.Show(UILevelDisplay$1);
|
|
}
|
|
}
|
|
hide() {
|
|
hide() {
|
|
|
|
+ console.log('zh:uimain hide ...');
|
|
super.hide();
|
|
super.hide();
|
|
xGame.common.stopGirlPop(this.ui.talkNode);
|
|
xGame.common.stopGirlPop(this.ui.talkNode);
|
|
}
|
|
}
|