Browse Source

改成三维了

xzw 4 years ago
parent
commit
7104cd403a

BIN
web/public/static/images/bg2.jpg


BIN
web/public/static/images/select.png


File diff suppressed because it is too large
+ 324 - 57
web/public/static/js/main_2020_show.js


+ 21 - 2
web/public/static/js/overlay.js

@@ -252,7 +252,17 @@ var initOverlay = function(THREE) {
     
     
     Overlay.prototype.updateVisibles = function(panos) {
-        this.visible = !!panos.find(pano=>this.visiblePanos.includes(pano))
+        var v = !!panos.find(pano=>this.visiblePanos.includes(pano))
+        
+        if(this == window.leftBtn || this == window.rightBtn){ 
+            this.visible = v && this.visible_;
+            return;
+        }else{
+            this.visible = v
+        }
+        
+        
+        
         
         if(this.overlayType == 'video'){
             this.visible ? this.videoControl("play") : this.videoControl('stop')
@@ -265,7 +275,13 @@ var initOverlay = function(THREE) {
     
     Overlay.updateVisibles = function(panos) {
         if (panos === true) {
-            player.overlayGroup.children.forEach(e=>e.visible = true)
+            player.overlayGroup.children.forEach(e=>{ 
+                if(e == window.leftBtn || e == window.rightBtn){ 
+                    e.visible =  e.visible_; 
+                }else{
+                    e.visible = true
+                }  
+            })
         } else {
             player.overlayGroup.children.forEach(e=>e.updateVisibles(panos))
         }
@@ -281,6 +297,9 @@ var initOverlay = function(THREE) {
             //console.log("pause")
         }else if(state){ 
             this.plane.material.map.image.paused && this.plane.material.map.image.play()
+            if(this.hasSound){
+                manage.switchBgmState(false)
+            }
             //console.log("play")
         }
     }     

BIN
web/public/static/videos/chen.mp4


BIN
web/public/static/videos/kangri/1.mp4


BIN
web/public/static/videos/kangri/2.mp4


BIN
web/public/static/videos/kangri/3.mp4


BIN
web/public/static/videos/kangri/4.mp4


BIN
web/public/static/videos/kangri/5.mp4


BIN
web/public/static/videos/li.mp4


BIN
web/public/static/videos/mao.mp4