1

scene/public/static/js/main_2020_show.js

@@ -14933,12 +14933,12 @@ window.Modernizr = function(n, e, t) {
                     }else{
                         SoundManager.setSrc('bgm', window.DATA.backgroundMusic )
                     }  
-                    $("#volume").show();
+                    $("#bgm").show();
                 }else if (g_version === "one"){
                     SoundManager.setSrc('bgm', manage.dealURL( g_Prefix+"/audio/"+"audio"+window.number + "/background.mp3"))
                     
                     
-                    $("#volume").show();
+                    $("#bgm").show();
                 }
 
                 //隐藏公司logo
@@ -23145,6 +23145,13 @@ window.Modernizr = function(n, e, t) {
                   , c = e.constantMoveSpeed
                   , h = null
                   , p = null 
+                //-----add-------
+                let blackList = ['1','2','3']
+                if(blackList.includes(this.currentPano.id) || blackList.includes(i.id)){
+                    return this.blackToPano(e)
+                }
+                //-------------------
+                
                 
                 if (aim){ 
                     var _ = (new r.Matrix4).lookAt(i.position, aim, d.UP)
@@ -58855,11 +58862,18 @@ class PanTransGuide{
                 path.setWarpDestPano()
                 let A = path.getHeroPano(last), 
                     B = path.warpDestPano
-                path.nodes = path.findShortestPath(A, B)
-                if(path.nodes == null){//两个点之间不相通
-                    console.log('两个点之间不相通',A.id,B.id)
+                if(e.momentTour == 'black'){
                     path.nodes = [A.id,B.id];//直接加入
+                }else{ 
+                    path.nodes = path.findShortestPath(A, B)
+                    if(path.nodes == null){//两个点之间不相通
+                        console.log('两个点之间不相通',A.id,B.id)
+                        path.nodes = [A.id,B.id];//直接加入
+                    }
                 }
+                
+                
+                
                 let wholeDis = 0, disSections = []
                 path.nodes.forEach((cur,i)=>{
                     if(i==0)return

scene/public/static/js/manage.js

@@ -2187,13 +2187,13 @@ function initByTHREE(THREE){
                          
                         if(canPlay){
                             SoundManager.play('bgm')
-                            $("#volume").show();
+                            $("#bgm").show();
                         }
                         
                         if(areaAudio || window.DATA.backgroundMusic){
-                            $("#volume").show()
+                            $("#bgm").show()
                         }else{
-                            $("#volume").hide()
+                            $("#bgm").hide()
                         }
                         
                     }
@@ -2459,17 +2459,20 @@ Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
     })
      
     
-    $("#volume").find("a").on("click", ()=> {  
-        if($("#volume img")[0].src.indexOf("btn_on.png")>-1)
+    /* $("#bgm").find("a").on("click", ()=> {  
+        if($("#bgm img")[0].src.indexOf("btn_on.png")>-1)
         { 
             this.switchBgmState(true); 
         }
-        else if($("#volume img")[0].src.indexOf("btn_off.png")>-1)
+        else if($("#bgm img")[0].src.indexOf("btn_off.png")>-1)
         {
             this.switchBgmState(false);    
         }
     })  
-    
+     */
+     
+     
+     
     // this.switchBgmState(true);//初始设置允许播放bgm 
     // SoundManager.initAutoPlay()