Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/zhengzhou_university

edit-backstage/js/main_2020_edit.js

@@ -22244,7 +22244,12 @@ function o(a, s, l) {
                 }else{  
                     this.transitionPos({type:"beforeFlyOut",  dur:p/2})//add                       
                 }
-            
+                if(this.mode == 'panorama'){
+                    this.overlayGroup.visible = false;
+                    this.overlayGroup.children.forEach((overlay)=>{
+                        overlay.overlayType == "video"  &&  overlay.plane.material.map.image.pause()
+                    })
+                }
             
                 
                 if (i === V.PANORAMA)
@@ -22343,7 +22348,7 @@ function o(a, s, l) {
                     if(this.mode == V.PANORAMA){ 
                         Overlay.updateVisibles([this.currentPano])
                     }else{
-                        Overlay.updateVisibles(true)
+                        //Overlay.updateVisibles(true)
                     }
                     
                     c && u !== V.PANORAMA && i === V.PANORAMA ? this.startWarp(M.Retain, S.Retain, R.BLACK, null, null, a) : (a && a(),

web/public/static/js/main_2020_show.js

@@ -130,6 +130,8 @@ var changeVideoMat = function(){
 
  
 var updateVideo = (o)=>{//因为漫游中点位不准，所以在不同点更新视频位置
+    return
+    
     playVideo()
  
 
@@ -22224,7 +22226,7 @@ window.Modernizr = function(n, e, t) {
                  //-------------------
                 window.initOverlay(r)
                 this.model.loadOverlays() 
-                loadVideo();//add   
+                //loadVideo();//add   
                 //-------------------
                 
                 
@@ -23556,6 +23558,10 @@ window.Modernizr = function(n, e, t) {
                     }else{
                         updateVideo({type:"beforeFlyOut", dur:I})//add     
                     }
+                    this.overlayGroup.visible = false;
+                    this.overlayGroup.children.forEach((overlay)=>{
+                        overlay.overlayType == "video"  &&  overlay.plane.material.map.image.pause()
+                    })
                 }
                 
                 if(i == "panorama"){  
@@ -23669,7 +23675,7 @@ window.Modernizr = function(n, e, t) {
                         updateVideo({type:"flyDone", pano:this.currentPano})//add 
                         Overlay.updateVisibles([this.currentPano])
                     }else{
-                        Overlay.updateVisibles(true)
+                        //Overlay.updateVisibles(true)
                     }
                       
                     h && p !== u.PANORAMA && i === u.PANORAMA ? this.startWarp(b.Retain, E.Retain, x.BLACK, null, null, s) : (s && s(),

web/public/static/js/overlay.js

@@ -108,6 +108,7 @@ var initOverlay = function(THREE){
                 })
                 video.volume = 0
                 video.muted = true
+                plane.material.opacity = 1;
             }else if(info.media.includes('photo')){
                 /* var img = new Image();
                  
@@ -116,9 +117,9 @@ var initOverlay = function(THREE){
                  */
                 
                 info.type = "photo"  
-                
+                plane.material.opacity = 0.1;
             }
-            plane.material.opacity = 0.1;
+            
             plane.material.color = new THREE.Color(1,1,1) 
         }
         if(info.width == void 0) info.width = settings.overlay.width;