2

SuperTwo762/js/main_2020_show.js

@@ -24,16 +24,14 @@ 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;  
 }
 
 
 
 
+
 var musicList = {
     "0102cp":'3458d3c7ca764ecaa13c88aaa8e0a1a8, 1107bf848a6146059249cc109c6d1472, 8c0e5bcc4a69470aa5f189edde162973, 2d00ef76d93f4a578b356c593da889b0, 61afb8aaf45046be865b1b30d0357754, 0a73cf23993d4f4cbb48337708f8c7b7, 9a32f7d9b29f427182b453b1a8009efc, 58ea5816c49b4c759c26b262f403eab1, 6c455875e3834d53b43a2beaba11aa4d'.split(','),
     "04CP":'48930ada7d02438a846f6f6cf5a8693f, d3e00453736549e392ca91e9bd31ee72, b99ae9d8d19144f7866d49ed863a4b84, 14f349b0dd3d4646b2bd98c2ebfeb643'.split(','),
@@ -61,7 +59,11 @@ var musicList = {
     
 }
 
-var playMusic = function(pano){
+
+var playMusic = function(pano){//根据漫游点切换bgm
+    //var describe = player.director.describe();
+    
+    if(!g_tourAudio.paused || g_currentHot  )return;
     var shouldplayMusic
     for(let i in musicList){
         if(musicList[i].find(e=>e.includes(pano.id))){
@@ -71,9 +73,9 @@ var playMusic = function(pano){
     }
     if(shouldplayMusic){
         if(!g_bgAudio.src.includes(shouldplayMusic)){
-            g_bgAudio.src = "music/"+shouldplayMusic+'.mp3'
-            manage.switchBgmState(true)
+            g_bgAudio.src = "music/"+shouldplayMusic+'.mp3' 
         }
+        manage.switchBgmState(true)
     }else{
         g_bgAudio.src = ''
         
@@ -5289,7 +5291,10 @@ window.Modernizr = function(n, e, t) {
                         g_tourAudio.src = manage.dealURL(o);
                         g_tourAudio.load()  
                     }
-                    
+                    if(g_bgAudio && !g_bgAudio.paused){
+                        manage.switchBgmState(false); 
+                        g_bgAudio.pauseByTour = true
+                    }
                 }
                 //}
                 if (this.onTheBus = !0,
@@ -5377,7 +5382,8 @@ window.Modernizr = function(n, e, t) {
                     g_playAudio = g_bgAudio;
                     g_tourAudio && g_tourAudio.pause();
                     //window.tourAudio && window.tourAudio.pause(); 
-                    manage.switchBgmState(true); 
+                    //manage.switchBgmState(true);
+                    playMusic(player.currentPano)                    
 				}
 			}
 			,
@@ -16452,12 +16458,13 @@ window.Modernizr = function(n, e, t) {
 				var myElement = document.createElement("iframe");
                 //打开热点的时候把背景音乐关闭了，避免与热点里面的音乐冲突
                 //g_bgAudio && g_bgAudio.pause();
-                if(g_bgAudio && !g_bgAudio.paused){
+                /* if(g_bgAudio && !g_bgAudio.paused){
                     manage.switchBgmState(false); 
                     g_bgAudio.pauseByHot = true
-                } 
-                if(g_tourAudio)g_tourAudio.pause()
+                }  
                 
+                if(g_tourAudio)g_tourAudio.pause()*/
+                musicOff()
                 var src = getLink(this.link   )
                 myElement.src = src; 
                 myElement.id = "id1";
@@ -22351,7 +22358,7 @@ window.Modernizr = function(n, e, t) {
                 if(g_bgAudio && g_bgAudio.pauseByHot){
                     manage.switchBgmState(true)
                 }
-                
+                playMusic(player.currentPano)
                 
 				//$('#player').off("click",this.closePopup);
                 return false

SuperTwo762/js/overlay.js

@@ -88,7 +88,18 @@ var initOverlay = function(THREE) {
                 
                 video.volume = 0
                 video.muted = true
-                plane.material.opacity = 1;
+                plane.material.transparent = false
+                
+                
+                var soundBtn = addSoundBtn(video);
+                this.add(soundBtn)
+                this.soundBtn = soundBtn;
+                
+                var offsetX = 0.11, offsetY = 0.11; //到右下角的距离，单位m 
+                this.soundBtn.position.set(settings.overlay.width*(0.5-1/info.width*offsetX), -settings.overlay.height*(0.5-1/info.height*offsetY),0.01)
+                
+                
+                
             } else if (info.media.includes('photo')) {
                 /* var img = new Image();
                  
@@ -171,7 +182,7 @@ var initOverlay = function(THREE) {
                     plane.material.map.minFilter = THREE.LinearFilter;
                     plane.material.map.magFilter = THREE.LinearFilter;
                     plane.material.map.generateMipmaps = true;
-
+                    this.soundBtn.scale.set(1/this.scale.x,1/this.scale.y,1/this.scale.z)
                 } else {
                     this._loadDones = []
                     /* plane.material.map = Texture.load(info.file,()=>{