12312

SuperTwo762/js/main_2020_show.js

@@ -27,9 +27,15 @@ g_tourAudio.addEventListener("ended", function() {
 }) 
 
 g_tourAudio.oncanplaythrough = function() {
+    if(g_currentHot)return g_tourAudio.pause()
     if(g_tourAudio.shouldPlay){
         g_tourAudio.play(); 
         g_playAudio = g_tourAudio; 
+        
+        if(g_bgAudio && !g_bgAudio.paused){
+            manage.switchBgmState(false); 
+            g_bgAudio.pauseByTour = true
+        }
     }    
 }
 
@@ -372,12 +378,12 @@ var loadVideo = ()=>{
         loadedVideo = true      
     })
     
-    var btn = addSoundBtn(video)
+    /* var btn = addSoundBtn(video)
     window.videoPlane.add(btn)
     video.btn = btn;  btn.video = video
                
     btn.position.set(-11.6,1.02,-8.5);
-    btn.rotation.y = -0.4 
+    btn.rotation.y = -0.4  */
     
 }
                                                   
@@ -498,7 +504,7 @@ var getScale = function(){
 }
 
 
-
+/* 
                                                                             
 var btnMat;
 var btnGeo 
@@ -535,6 +541,8 @@ var addSoundBtn = function(video){
     return btn 
     
 } 
+
+
 var SoundOnVideo;
 var switchSoundBtn = function(video, belong){
     if(video.btn.material == soundOffMat){ //开启
@@ -585,14 +593,14 @@ var switchSoundBtn = function(video, belong){
     
     
 }
-
+ 
 var checkSoundBtnClick = function(intersect){
     if(intersect && intersect.object.name == "soundBtn"){
         switchSoundBtn(intersect.object.video, intersect.object.parent);
         return true
     } 
 }
-
+ */
 
 
 
@@ -22834,8 +22842,8 @@ window.Modernizr = function(n, e, t) {
 					if(this.checkHotClick())//add 
 						return !0;
                         
-                    if(checkSoundBtnClick(this.intersect))//add 
-						return !0;
+                    /* if(checkSoundBtnClick(this.intersect))//add 
+						return !0; */
                     if(this.hoveringPlane){
                         this.clickOverlay(this.hoveringPlane)
                         return;