xzw 1 år sedan
förälder
incheckning
5fc97021a9
2 ändrade filer med 7 tillägg och 2 borttagningar
  1. 4 2
      scene/public/static/js/main_2020_show.js
  2. 3 0
      scene/public/static/js/manage.js

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

@@ -58865,7 +58865,7 @@ class PanTransGuide{
                 path.setWarpDestPano()
                 let A = path.getHeroPano(last), 
                     B = path.warpDestPano
-                if(e.momentTour == 'black'){
+                if(e.momentTour == 'black' && A!=B){
                     path.nodes = [A.id,B.id];//直接加入
                 }else{ 
                     path.nodes = path.findShortestPath(A, B)
@@ -58944,7 +58944,9 @@ class PanTransGuide{
             aimNode = this.nodes[this.currentIndex]
         }
         
-        this.player.flyToPano({pano: this.player.model.panos.get(aimNode.panoId),quaternion:aimNode.quaternion})
+        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})
        
     }
     

+ 3 - 0
scene/public/static/js/manage.js

@@ -2151,8 +2151,11 @@ function initByTHREE(THREE){
             player.on('mode.changed',()=>{ 
                 if(player.mode == 'panorama'){
                     $('.gui-floor').hide()
+                    player.model.hotGroup.visible = true
+                    
                 }else{
                     $('.gui-floor').show()
+                    player.model.hotGroup.visible = false
                 }
                 
             })