xzw пре 1 година
родитељ
комит
f06793ef48
2 измењених фајлова са 12 додато и 3 уклоњено
  1. 10 2
      scene/public/static/js/main_2020_show.js
  2. 2 1
      scene/public/static/js/manage.js

+ 10 - 2
scene/public/static/js/main_2020_show.js

@@ -18064,6 +18064,14 @@ window.Modernizr = function(n, e, t) {
             ,
             n.prototype.build = function() {
                 this.heroLocations = this.images.getHeroLocations(this.panos);
+                
+                
+                //重点展位:
+
+                let index = this.heroLocations.findIndex(e=>e.name == '沉浸看展')
+                this.heroLocations2 = this.heroLocations.splice(0,index) //提取沉浸看展之前的
+                
+                
                 var e = function() {
                     return !!(this.heroImage && this.heroImage.metadata && this.heroImage.metadata.scan_id && this.panos.get(this.heroImage.metadata.scan_id)) && !this.panos.get(this.heroImage.metadata.scan_id).isAligned()
                 }
@@ -59230,8 +59238,8 @@ class PanTransGuide{
             aimNode = this.nodes[this.currentIndex]
         }
         
-        let dis = this.player.model.panos.get(aimNode.panoId).position.distanceTo(this.player.position)
-        let moveStyle = dis < 10 ? "flyToPano" : "blackToPano"
+        //let dis = this.player.model.panos.get(aimNode.panoId).position.distanceTo(this.player.position)
+        let moveStyle = /* dis < 10 ?  */"flyToPano" /* : "blackToPano" */
         this.player[moveStyle]({pano: this.player.model.panos.get(aimNode.panoId),quaternion:aimNode.quaternion})
        
     }

+ 2 - 1
scene/public/static/js/manage.js

@@ -2520,7 +2520,7 @@ function initByTHREE(THREE){
                 
             }
             
-            
+            const pauseWhenGoNextPano = true //到有音频的地方先暂停,用户自己打开播放(后加的需求)
             {//根据漫游点切换音频
                 let curAudio  
                 let bgmObject = SoundManager.list.find(e=>e.name == 'bgm')
@@ -2547,6 +2547,7 @@ function initByTHREE(THREE){
                     }
                 }
                 player.on("flying.ended",(a,b,pano,d)=>{
+                    pauseWhenGoNextPano && this.switchBgmState(false)
                     setCurBgm(pano) 
                 })
                 player.on("mode.changed", ()=>{ //飞出后不播放 也不显示按钮