|
@@ -16,11 +16,11 @@ g_tourAudio.addEventListener("ended", function() {
|
|
|
|
|
|
g_tourAudio.oncanplaythrough = function() {
|
|
|
g_tourAudio.play();
|
|
|
- if(g_bgAudio && !g_bgAudio.paused){
|
|
|
- manage.switchBgmState(false);
|
|
|
- g_bgAudio.pauseByTour = true
|
|
|
- }
|
|
|
- g_playAudio = g_tourAudio;
|
|
|
+ // if(g_bgAudio && !g_bgAudio.paused){
|
|
|
+ // manage.switchBgmState(false);
|
|
|
+ // g_bgAudio.pauseByTour = true
|
|
|
+ // }
|
|
|
+ // g_playAudio = g_tourAudio;
|
|
|
}
|
|
|
|
|
|
|
|
@@ -4852,7 +4852,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
return destination && destination.panoId == e
|
|
|
}
|
|
|
,
|
|
|
- n.prototype.redirectToItem = function(e, t) {
|
|
|
+ n.prototype.redirectToItem = function(e, t,noMusic) {
|
|
|
if (null === e || void 0 === e)
|
|
|
return void A.warn("Director.redirectToItem() -> Redirecting to null item.");
|
|
|
if (!this.wouldInterrupt())
|
|
@@ -4862,8 +4862,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
A.debug("Director.redirectToItem() -> Redirecting to " + e + " via " + t);
|
|
|
var i = function() {
|
|
|
s.setTimeout(function() {
|
|
|
+ let flag = noMusic?'noMusic':''
|
|
|
this.setDestinationItem(e),
|
|
|
- this.goToDestination(!0, g.BEGINNING, a.warp.warpInterruptionRedirectTime, !1)
|
|
|
+ this.goToDestination(flag, g.BEGINNING, a.warp.warpInterruptionRedirectTime, !1)
|
|
|
}
|
|
|
.bind(this), 0)
|
|
|
}
|
|
@@ -4902,10 +4903,16 @@ window.Modernizr = function(n, e, t) {
|
|
|
if(this.destinationItem[1] == 0){//如果是每个folder的起始
|
|
|
var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
|
|
|
if(musicInfo && musicInfo.music){
|
|
|
- var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
|
- g_tourAudio.src = manage.dealURL(o);
|
|
|
- g_tourAudio.load()
|
|
|
+ g_tourAudio.pause();
|
|
|
+ g_tourAudio.src = ""
|
|
|
+
|
|
|
+ if(e!='noMusic'){
|
|
|
+ var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
|
+ g_tourAudio.src = manage.dealURL(o);
|
|
|
+ g_tourAudio.load()
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
if (this.onTheBus = !0,
|
|
@@ -4971,17 +4978,18 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.emit(p.TourStart),
|
|
|
this.player.enablePreRendering(),
|
|
|
this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
|
|
|
- this.goToDestination()) : this.goNext()))
|
|
|
+ this.goToDestination()) : (this.clearWalkingSectionPaused(),
|
|
|
+ this.goToDestination())))
|
|
|
}
|
|
|
,
|
|
|
n.prototype.bgmReplay = function() {//xzw add 结束tour后可能要继续播放背景音乐
|
|
|
//if(g_tourAudio && g_tourAudio.paused && g_bgAudio && g_bgAudio.paused){
|
|
|
- if(g_bgAudio && g_bgAudio.paused && g_bgAudio.pauseByTour){
|
|
|
- g_playAudio = g_bgAudio;
|
|
|
- g_tourAudio && g_tourAudio.pause();
|
|
|
- //window.tourAudio && window.tourAudio.pause();
|
|
|
- manage.switchBgmState(true);
|
|
|
- }
|
|
|
+ // if(g_bgAudio && g_bgAudio.paused && g_bgAudio.pauseByTour){
|
|
|
+ // g_playAudio = g_bgAudio;
|
|
|
+ // g_tourAudio && g_tourAudio.pause();
|
|
|
+ // //window.tourAudio && window.tourAudio.pause();
|
|
|
+ // manage.switchBgmState(true);
|
|
|
+ // }
|
|
|
}
|
|
|
,
|
|
|
n.prototype.stopTour = function(isAutoStop) {//停止导览 isAutoStop 希望仅在飞完结束自动停止时的stopTour不停止tourSound, 这样才能完整播放tourSound. 不过似乎会在倒数第二个片段点击按钮停止导览时也视作自动结束的(执行this.interrupt() )。
|
|
@@ -5008,7 +5016,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
,
|
|
|
n.prototype.goToHighlight = function(e) {
|
|
|
if (this.wouldInterrupt())
|
|
|
- this.itemCompare(this.destinationItem,e,'equal') ? this.interrupt() : this.redirectToItem(e, "goToHighlight");
|
|
|
+ this.itemCompare(this.destinationItem,e,'equal') ? this.interrupt() : this.redirectToItem(e, "goToHighlight",true);
|
|
|
else {
|
|
|
if (A.debug("<tour.goto " + e + ">"),
|
|
|
this.isInterrupted())
|
|
@@ -5016,7 +5024,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.clearWalkingSectionPaused(),
|
|
|
this.setDestinationItem(e),
|
|
|
this.useSpecialTransition("Hilight"),
|
|
|
- this.goToDestination(),
|
|
|
+ this.goToDestination('noMusic'),
|
|
|
h.trackAlways("reach_highlight", {
|
|
|
reach_source: "thumb"
|
|
|
})
|
|
@@ -15781,7 +15789,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
transparent: !0
|
|
|
})
|
|
|
var sprite = new r.Mesh( geometry, shaderMaterial );
|
|
|
- var hotIconScale = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
|
|
|
+ var hotIconScale = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale*0.7);
|
|
|
sprite.dynamic = true;
|
|
|
sprite.position.copy(this.position);
|
|
|
sprite.quaternion.copy(this.quaternion)
|
|
@@ -15911,9 +15919,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
exit.style["z-index"] = "3"
|
|
|
exit.onclick = ()=>{
|
|
|
$(div).remove()
|
|
|
- if(g_bgAudio && g_bgAudio.pauseByHot){
|
|
|
- manage.switchBgmState(true)
|
|
|
- }
|
|
|
+ // if(g_bgAudio && g_bgAudio.pauseByHot){
|
|
|
+ // manage.switchBgmState(true)
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
var myElement = document.createElement("iframe");
|
|
@@ -15932,11 +15940,11 @@ window.Modernizr = function(n, e, t) {
|
|
|
|
|
|
//打开热点的时候把背景音乐关闭了,避免与热点里面的音乐冲突
|
|
|
//g_bgAudio && g_bgAudio.pause();
|
|
|
- if(g_bgAudio && !g_bgAudio.paused){
|
|
|
- // manage.switchBgmState(false);
|
|
|
- // g_bgAudio.pauseByHot = true
|
|
|
- }
|
|
|
- if(g_tourAudio)g_tourAudio.pause()
|
|
|
+ // if(g_bgAudio && !g_bgAudio.paused){
|
|
|
+ // manage.switchBgmState(false);
|
|
|
+ // g_bgAudio.pauseByHot = true
|
|
|
+ // }
|
|
|
+ // if(g_tourAudio)g_tourAudio.pause()
|
|
|
|
|
|
|
|
|
|
|
@@ -15959,11 +15967,11 @@ window.Modernizr = function(n, e, t) {
|
|
|
var myElement = document.createElement("iframe");
|
|
|
//打开热点的时候把背景音乐关闭了,避免与热点里面的音乐冲突
|
|
|
//g_bgAudio && g_bgAudio.pause();
|
|
|
- if(g_bgAudio && !g_bgAudio.paused){
|
|
|
- manage.switchBgmState(false);
|
|
|
- g_bgAudio.pauseByHot = true
|
|
|
- }
|
|
|
- if(g_tourAudio)g_tourAudio.pause()
|
|
|
+ // if(g_bgAudio && !g_bgAudio.paused){
|
|
|
+ // manage.switchBgmState(false);
|
|
|
+ // g_bgAudio.pauseByHot = true
|
|
|
+ // }
|
|
|
+ // if(g_tourAudio)g_tourAudio.pause()
|
|
|
|
|
|
var src = getLink(this.link )
|
|
|
myElement.src = src;
|
|
@@ -21781,9 +21789,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
manage.switchBgmState(true)
|
|
|
}; */
|
|
|
|
|
|
- if(g_bgAudio && g_bgAudio.pauseByHot){
|
|
|
- manage.switchBgmState(true)
|
|
|
- }
|
|
|
+ // if(g_bgAudio && g_bgAudio.pauseByHot){
|
|
|
+ // manage.switchBgmState(true)
|
|
|
+ // }
|
|
|
|
|
|
|
|
|
//$('#player').off("click",this.closePopup);
|
|
@@ -21930,7 +21938,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
manage.switchBgmState(true)
|
|
|
} */
|
|
|
|
|
|
- if(!this.director.tourIsPlaying) this.director.bgmReplay()
|
|
|
+ // if(!this.director.tourIsPlaying) this.director.bgmReplay()
|
|
|
}
|
|
|
,
|
|
|
n.prototype.bindEvents = function(e) {
|