xzw 10 bulan lalu
induk
melakukan
e6e1741130

+ 3 - 3
scene/public/static/js/main_2020_show.js

@@ -24539,7 +24539,7 @@ window.Modernizr = function(n, e, t) {
                 
                 if( currentLocation.rotTime == void 0 || currentLocation.rotTime == ''){
                     var hasMusic
-                    if(settings.tourSoundUnable){
+                    //if(!settings.tourSoundUnable){
                         var restChildCount = currentLocation0.heroLocations ? (currentLocation0.heroLocations.length-this.director.currentItem[1]-1) : 0
                         hasMusic = currentLocation0 && currentLocation0.musicInfo.music
                         if(hasMusic){
@@ -24552,10 +24552,10 @@ window.Modernizr = function(n, e, t) {
                         }else{
                             rotTime = defaultRotTime
                         } 
-                    }else{//区域音频    好难写。因为我不知道会不会导览的时候走重复的路
+                    //}else{//区域音频    好难写。因为我不知道会不会导览的时候走重复的路
                         //hasMusic = 
                         
-                    }
+                    //}
                     rotTime = Math.max(0, rotTime)
                     Log("rotTime "+rotTime +" at item "+this.director.currentItem + (hasMusic ? (",musicCurrentTime:"+current+'音乐总长:'+currentLocation0.musicInfo.time) : ''),"#E8E") 
                 }else{

+ 13 - 10
scene/public/static/js/manage.js

@@ -102,7 +102,7 @@ window.browser = { //提前定义
     },
 }
 var settings = {
-    tourSoundUnable: true,//导览音乐禁用
+    //tourSoundUnable:  true,//导览音乐禁用
     hotClickEvent:{
         video:{
             playAndPause:true,
@@ -2428,9 +2428,10 @@ function initByTHREE(THREE){
         let f = ()=>{
             window.bus.removeEventListener('playerAndModelReady',f)
             
-            document.querySelector('#openMusic').style.display='block'
-            $("#bgm").hide();
-            
+            document.querySelector('#closeMusic').style.display='block' //默认没开音乐
+            //if(settings.tourSoundUnable){
+                $("#bgm").hide();
+            //}
             player.on("mode.changing",(currentMode, mode, pano, duration)=>{ 
                 let noLine = mode == 'floorplan';
                 if(noLine){
@@ -2557,13 +2558,15 @@ function initByTHREE(THREE){
                          
                         if(canPlay){
                             SoundManager.play('bgm') 
-                        }
-                        
-                        if(areaAudio || window.DATA.backgroundMusic){
                             $("#bgm").show()
-                        }else{
-                            $("#bgm").hide()
                         }
+                        //if(settings.tourSoundUnable){
+                            if(areaAudio || window.DATA.backgroundMusic){
+                                $("#bgm").show()
+                            }else{
+                                $("#bgm").hide()
+                            }
+                        //}
                         
                     }
                 }
@@ -2840,7 +2843,7 @@ Manage.prototype.loadAudio = function() { //相关:g_tourAudio \  g_playAudio
     
     SoundManager.createAudio({
         name:'tour',
-        level:0, 
+        level:1, 
         src:'',
         loop:false,
         canplay:(audio)=>{

+ 1 - 1
scene/src/views/gui/menu.vue

@@ -761,7 +761,7 @@ export default {
         document.querySelector("#openMusic").style.display = "block";
         document.querySelector("#closeMusic").style.display = "none";
         // 手动停止自动导览
-        window.player.director.stopTour();
+        //window.player.director.stopTour();
       } else {
         this.musicState = false;
         window.manage.switchBgmState(false);