|
@@ -4750,7 +4750,7 @@ window.Modernizr = function(n, e, t) {
|
|
n.prototype.goToDestination = function(e, t, i, n) {
|
|
n.prototype.goToDestination = function(e, t, i, n) {
|
|
//音频
|
|
//音频
|
|
var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
|
|
var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
|
|
- if(musicInfo && musicInfo.music){
|
|
|
|
|
|
+ if(musicInfo && musicInfo.music && !e){
|
|
let src = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
let src = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
let audioObj = SoundManager.list.find(e=>e.name == 'tour')
|
|
let audioObj = SoundManager.list.find(e=>e.name == 'tour')
|
|
let audioSrc1 = common.getFileNameFromUrl(audioObj.src);
|
|
let audioSrc1 = common.getFileNameFromUrl(audioObj.src);
|
|
@@ -4768,6 +4768,9 @@ window.Modernizr = function(n, e, t) {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ } else if(e) {
|
|
|
|
+ // 手动导览不播放音频,并暂停之前的语音
|
|
|
|
+ SoundManager.pause('tour')
|
|
}
|
|
}
|
|
|
|
|
|
if (this.onTheBus = !0,
|
|
if (this.onTheBus = !0,
|