7454

SuperTwo762/js/main_2020_show.js

@@ -26,9 +26,10 @@ g_tourAudio.addEventListener("ended", function() {
 }) 
 
 g_tourAudio.oncanplaythrough = function() {
-    g_tourAudio.play();
-    
-    g_playAudio = g_tourAudio;  
+    if(g_tourAudio.shouldPlay){
+        g_tourAudio.play(); 
+        g_playAudio = g_tourAudio; 
+    }    
 }
 
 
@@ -65,8 +66,8 @@ var musicList = {
 
 var playMusic = function(pano){//根据漫游点切换bgm
     //var describe = player.director.describe();
-    
-    if( manage.bgmShouldPlay/* g_tourAudio.paused  */|| g_currentHot  )return;
+    //manage.bgmShouldPlay
+    if( g_tourAudio.shouldPlay /* !g_tourAudio.paused */ || g_currentHot  )return;
     var shouldplayMusic
     for(let i in musicList){
         if(musicList[i].find(e=>e.includes(pano.id))){
@@ -5308,11 +5309,13 @@ window.Modernizr = function(n, e, t) {
                         if(this.destinationItem[1] == 0){//从头开始播放 因为可能暂停后然后再点该缩略图播
                             g_tourAudio.currentTime = 0;  g_tourAudio.play();
                         }else if(g_tourAudio.paused && g_tourAudio.currentTime < g_tourAudio.duration){//未播完
-                            g_tourAudio.play()
+                            g_tourAudio.play(); 
                         } 
+                        g_tourAudio.shouldPlay = true
                         
                     }else{//很可能是该folder的起始
                         g_tourAudio.src = manage.dealURL(o);
+                        g_tourAudio.shouldPlay = true
                         g_tourAudio.load()  
                     }
                     if(g_bgAudio && !g_bgAudio.paused){
@@ -5423,6 +5426,7 @@ window.Modernizr = function(n, e, t) {
                 if(!isAutoStop && g_tourAudio && g_tourAudio.paused == false )
                 {
                     g_tourAudio.pause();
+                    g_tourAudio.shouldPlay = false
                     //g_tourAudio.src = ""
                 }
             }