xzw пре 4 година
родитељ
комит
ab1edff480
2 измењених фајлова са 15 додато и 3 уклоњено
  1. 11 0
      web/public/static/js/main_2020_show.js
  2. 4 3
      web/public/static/js/overlay.js

+ 11 - 0
web/public/static/js/main_2020_show.js

@@ -18390,6 +18390,9 @@ window.Modernizr = function(n, e, t) {
                 d = player.overlayGroup.children.find(e=>e.sid == '1626743691935') 
                 d.plane.material = c.plane.material;//同步视频
                 var main = player.overlayGroup.children.find(e=>e.sid == "1626743467424")
+                main.forceNoBlock = true
+                main.unvisiblePanos = ["bfacbd2e303c45baa16fdc961e0f6f67","4f2155cb4a7f43e980e9218974c17882",]
+                
                 //main.plane.material.depthTest = false                
                 c.plane.material.map.image.loop = false 
                 main.plane.material.map.image.loop = false 
@@ -24198,6 +24201,9 @@ window.Modernizr = function(n, e, t) {
                     closeMenu(true)
                     this.overlayGroup.children.forEach((overlay)=>{
                         overlay.videoControl('stop')
+                        if(overlay.forceNoBlock){
+                            overlay.plane.material.depthTest = true
+                        }
                     })
                     
                 }
@@ -24320,6 +24326,11 @@ window.Modernizr = function(n, e, t) {
                         Overlay.updateVisibles(true)
                     }
                     
+                    this.overlayGroup.children.find(e=>e.forceNoBlock).plane.material.depthTest = false
+                    
+                    
+                    
+                    
                     h && p !== u.PANORAMA && i === u.PANORAMA ? this.startWarp(b.Retain, E.Retain, x.BLACK, null, null, s) : (s && s(),
                     t.resolve())
                 }

+ 4 - 3
web/public/static/js/overlay.js

@@ -269,10 +269,11 @@ var initOverlay = function(THREE) {
         }else{ */
             this.visible = v
         //}
+        if(this.forceNoBlock && panos.find(pano=>this.unvisiblePanos.includes(pano.id))  ){
+            this.visible = false
+        }
         
-        
-        
-        
+       
         if(this.overlayType == 'video'){
             this.visible ? this.videoControl("play") : this.videoControl('stop')
         }