Prechádzať zdrojové kódy

中共三大视频播放和背景音乐同时播放时,鼠标拖动或者滑动界面,背景音乐应停止

xzw 4 rokov pred
rodič
commit
b289a06f38
1 zmenil súbory, kde vykonal 5 pridanie a 1 odobranie
  1. 5 1
      web/public/static/js/main_2020_show.js

+ 5 - 1
web/public/static/js/main_2020_show.js

@@ -92,6 +92,7 @@ var initMenuSanda = ()=>{
     }))
     }))
     menuSanda.dontTouchWarn.position.set(0,-0.2,0.004)
     menuSanda.dontTouchWarn.position.set(0,-0.2,0.004)
     menuSanda.dontTouchWarn.scale.set(0.3, 0.045, 1); 
     menuSanda.dontTouchWarn.scale.set(0.3, 0.045, 1); 
+    menuSanda.dontTouchWarn.visible = false
     menuSanda.add(menuSanda.dontTouchWarn) 
     menuSanda.add(menuSanda.dontTouchWarn) 
     
     
     dealMap(menuSanda.buttons[0].material.map)
     dealMap(menuSanda.buttons[0].material.map)
@@ -165,6 +166,8 @@ var clickMenuBtn = function(btn){
             }
             }
             SandaPlayingIndex = i
             SandaPlayingIndex = i
             switchVideoSrc("static/videos/" + videoSrcs[i])
             switchVideoSrc("static/videos/" + videoSrcs[i])
+            leftScreen.parent.hasSound = true
+            
         }
         }
     })
     })
     clearTimeout(timer1)
     clearTimeout(timer1)
@@ -213,7 +216,7 @@ var backToOriginVideo = function(ifPause){
     var video = leftScreen.material.map.image 
     var video = leftScreen.material.map.image 
     
     
     if(video.src == leftScreen.originVideoSrc)return;
     if(video.src == leftScreen.originVideoSrc)return;
-    
+    leftScreen.parent.hasSound = false
     
     
     video.src = leftScreen.originVideoSrc
     video.src = leftScreen.originVideoSrc
     video.loop = true 
     video.loop = true 
@@ -18337,6 +18340,7 @@ window.Modernizr = function(n, e, t) {
   
   
                     if(info.sid == '1626674966708' || info.sid == '1626675083157'){//三大会议视频
                     if(info.sid == '1626674966708' || info.sid == '1626675083157'){//三大会议视频
                         overlay.plane.originVideoSrc = overlay.plane.material.map.image.src;  
                         overlay.plane.originVideoSrc = overlay.plane.material.map.image.src;  
+                        
                     }else if(info.sid == "1626863308658"){
                     }else if(info.sid == "1626863308658"){
                         menuSanda = overlay
                         menuSanda = overlay