xzw 4 năm trước cách đây
mục cha
commit
c93895c125
2 tập tin đã thay đổi với 9 bổ sung8 xóa
  1. 2 2
      web/public/static/js/main_2020_show.js
  2. 7 6
      web/public/static/js/overlay.js

+ 2 - 2
web/public/static/js/main_2020_show.js

@@ -22231,7 +22231,7 @@ window.Modernizr = function(n, e, t) {
                     window.Hotpoint && new Hotpoint().state(this,Hot);
                 }
                 
-                
+                //overlay.videoControl(true)
                 /* if( this.overlayGroup.children.length){
                     this.overlayGroup.children.forEach((overlay)=>{
                         overlay.overlayType == "video"  && overlay.visible  &&  overlay.plane.material.map.image.play()
@@ -22930,7 +22930,7 @@ window.Modernizr = function(n, e, t) {
                 if(this.openOverlay && !overlay)return;
                 var plane = overlay.plane;
                 
-                /* if(overlay.overlayType == "video"){
+                /* if(overlay.overlayType == "video"){//overlay.videoControl(true) 
                     if(plane.material.map.image.paused)plane.material.map.image.play()
                     else plane.material.map.image.pause();
                 } */

+ 7 - 6
web/public/static/js/overlay.js

@@ -71,7 +71,7 @@ var initOverlay = function(THREE){
         this.sid = info.sid;
         
         if(info.sid == '1624590736940'){
-            this.visiblePanos = [player.model.panos.index["db8c40d5b3be459695c25d0de45f7b69"]]
+            this.playPanos = [player.model.panos.index["db8c40d5b3be459695c25d0de45f7b69"]]
             info.loop = false;
             this.hideWhenPlayDone = true
         }
@@ -327,10 +327,10 @@ var initOverlay = function(THREE){
     Overlay.prototype.updateVisibles = function(panos){ 
         this.visible = !!panos.find(pano=>this.visiblePanos.includes(pano))
         //if(this.loop) 
-        if(!this.visible && this.overlayType == 'video'){
+        if((!this.visible || (this.playPanos && !this.playPanos.find(pano=>player.currentPano == pano)  )) && this.overlayType == 'video'){
             this.videoControl('stop')
             
-        }
+        } 
     }    
     Overlay.updateVisibles = function(panos){
         if(panos === true){
@@ -350,11 +350,12 @@ var initOverlay = function(THREE){
                 this.plane.material.map.image.currentTime = 0;
                 this.playCount = 0
             }
-            console.log("pause")
-        }else if(state && (this.loop !== false || this.playCount == 0 || this.plane.material.map.image.currentTime<this.plane.material.map.image.duration)){
+            //console.log("pause")
+        }else if(state && (this.loop !== false || this.playCount == 0 || this.plane.material.map.image.currentTime<this.plane.material.map.image.duration)
+          && (!this.playPanos || this.playPanos.find(pano=>player.currentPano == pano)  )){ 
             this.plane.material.map.image.play()
             this.playCount = this.playCount ? (this.playCount+1) : 1
-            console.log("play")
+            //console.log("play")
         }
         
     }