123123123

SuperTwo762/js/main_2020_show.js

@@ -74,7 +74,7 @@ var musicList = {
 var playMusic = function(pano){//根据漫游点切换bgm
     //var describe = player.director.describe();
     //manage.bgmShouldPlay
-    if( !manage.bgmShouldPlay || g_tourAudio.shouldPlay /* !g_tourAudio.paused */ || g_currentHot  )return;
+    var play = !( !manage.bgmShouldPlay || g_tourAudio.shouldPlay  || g_currentHot ) 
     var shouldplayMusic
     for(let i in musicList){
         if(musicList[i].find(e=>e.includes(pano.id))){
@@ -84,9 +84,9 @@ var playMusic = function(pano){//根据漫游点切换bgm
     }
     if(shouldplayMusic){
         if(!g_bgAudio.src.includes(shouldplayMusic)){
-            g_bgAudio.src = "music/"+shouldplayMusic+'.mp3' 
-        }
-        manage.switchBgmState(true)
+            g_bgAudio.src = isMobile?"""music/"+shouldplayMusic+'.mp3' 
+        } 
+        manage.switchBgmState(play)
     }else{
         g_bgAudio.src = ''
         
@@ -5311,9 +5311,10 @@ 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){
+                
+                if(musicInfo && musicInfo.music){ 
                     var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music :  g_Prefix + musicInfo.music;
-                    
+                    if(isMobile)o = o.replace('//data/','')//add
                     let audioSrc1 = g_tourAudio.src.split('/').pop();
                     let audioSrc2 = o.split('/').pop();
                
@@ -18613,10 +18614,10 @@ window.Modernizr = function(n, e, t) {
                                 this.hots[sid] = new Hot(sid, data ,this);
                                 data.infoAttribute || (data.infoAttribute = {})
                                 
-                                /* data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
+                                data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
                                 data.infoAttribute.styleImg = data.infoAttribute.styleImg.map(e=>changeURL(e))
                                 data.infoAttribute.video = data.infoAttribute.video.map(e=> {return {url:changeURL(e.url)}})
-                                  */
+                                 
                                 this.hots[sid].initStyleImg(data.infoAttribute);
                                 window.hotData[sid] = data;
                             }) 
@@ -18624,10 +18625,10 @@ window.Modernizr = function(n, e, t) {
                         this.createHotItem(window.hotData, this.hots);
                         
                         
-                       /*  g_data2.overlays.forEach(e=>{
+                       g_data2.overlays.forEach(e=>{
                             e.file = changeURL(e.file)
                         })
-                         */
+                        
                         
                         
                         g_index = w.valueFromHash("m");
@@ -21716,7 +21717,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.warpTravel_BLACK = function(e, t, i, n) {
                 var r = e || 0;
                 void 0 !== t && null !== t || (t = c.warp.teleportTime)
-                
+                player.transitionPos({type:"beforeFlytopano",  dur:t})//add
                 updateVideo({type:"beforeFlytopano", pano : player.model.panos.index[this.warpDestHeroLoc.panoId], dur:t})//add
                 if(momentTourBlackNewType){
                     player.sceneRenderer.effects.transitionMaskPass.start(player.sceneRenderer)
@@ -21729,12 +21730,15 @@ window.Modernizr = function(n, e, t) {
                         player.sceneRenderer.effects.transitionMaskPass.stop()
                         updateVideo({type:"flyDone", pano : player.currentPano})//add
                         this.wrapupWarpShadingOnly(n, i);
+                        Overlay.updateVisibles([player.currentPano])
+                         
                     },t)
                      
                 }else{
                     var o = function() {
                         this.wrapupWarpShadingOnly(n, i);
                         updateVideo({type:"flyDone", pano:player.currentPano})//add
+                        Overlay.updateVisibles([player.currentPano])
                     }
                     .bind(this);
                     p.start(this.stepWarpPath.bind(this), t, o, r, d[c.warp.blendEasing], "stepMotion")

SuperTwo762/js/manage.js

@@ -113,11 +113,13 @@ Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
     
     //https://www.cnblogs.com/interdrp/p/4211883.html   部分资料
     g_bgAudio.load();	// iOS 9   还需要额外的 load 一下, 否则直接 play 无效
+    this.bgmShouldPlay = true //一开始默认打开
+    
+    
+    
     var play = function(){
         //if(window.tourAudioSta) return;
-        if(this.bgmShouldPlay){
-            this.switchBgmState(true)
-        }            
+        this.bgmShouldPlay && this.switchBgmState(true)           
          
         document.removeEventListener("touchstart",play);
         document.removeEventListener("click",play);
@@ -125,10 +127,10 @@ Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
     }.bind(this);
     
     g_bgAudio.oncanplay = ()=>{ 
-        this.switchBgmState(true)
+        this.bgmShouldPlay && this.switchBgmState(true)
     }
     document.addEventListener("WeixinJSBridgeReady", ()=> {
-        this.switchBgmState(true)
+        this.bgmShouldPlay && this.switchBgmState(true)
     }, false);
     
     document.addEventListener("touchstart", play);//ios需要加个事件才能播放 不能自动播放；如果还有浏览器不行，换成别的交互事件

SuperTwo791/js/main_2020_show.js

@@ -4854,6 +4854,7 @@ window.Modernizr = function(n, e, t) {
                 if(musicInfo && musicInfo.music){
                         
                     var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music :  g_Prefix + musicInfo.music;
+                    if(isMobile)o = o.replace('//data/','')//add
                     let audioSrc1 = g_tourAudio.src.split('/').pop();
                     let audioSrc2 = o.split('/').pop();
                     if(audioSrc1 == audioSrc2){//应该是继续播放该folder 
@@ -18028,10 +18029,10 @@ window.Modernizr = function(n, e, t) {
                                 this.hots[sid] = new Hot(sid, data ,this);
                                 data.infoAttribute || (data.infoAttribute = {})
                                 
-                                /* data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
+                                data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
                                 data.infoAttribute.styleImg = data.infoAttribute.styleImg.map(e=>changeURL(e))
                                 data.infoAttribute.video = data.infoAttribute.video.map(e=> {return {url:changeURL(e.url)}})
-                                  */
+                                 
                                 this.hots[sid].initStyleImg(data.infoAttribute);
                                 window.hotData[sid] = data;
                             })  
@@ -18039,9 +18040,9 @@ window.Modernizr = function(n, e, t) {
                         this.createHotItem(window.hotData, this.hots);
                         
                         
-                       /*  g_data2.overlays.forEach(e=>{
+                       g_data2.overlays.forEach(e=>{
                             e.file = changeURL(e.file)
-                        }) */
+                        })