222

web/public/static/js/main_2020_show.js

@@ -184,7 +184,7 @@ window.switchVideoSrc = function(src){
     video.play()
 
     manage.switchBgmState(false)
-
+    g_bgAudio.pauseByVideo = true
 }
 
 var backToOriginVideo = function(){ 
@@ -200,6 +200,10 @@ var backToOriginVideo = function(){
     rightScreen.material.map = rightScreen.originVideoMap
     rightScreen.originVideoMap.image.currentTime = 0 
     rightScreen.originVideoMap.image.play()
+    
+    if(g_bgAudio.pauseByVideo){
+        manage.switchBgmState(true)
+    }
 }
 
 
@@ -217,19 +221,28 @@ var videoSrcs2 = [
 ]
 
 var currIndex = 0;
-var nextPage = function(){
-    switchVideoSrc2(videoSrcs2[++currIndex])
+
+var btnShow = function(){
+    rightBtn.visible = rightBtn.visible_  = true
+    leftBtn.visible = leftBtn.visible_ = true
     if(currIndex == 4){
         rightBtn.visible = rightBtn.visible_  = false
+    }else if(currIndex == 0){
+        leftBtn.visible = leftBtn.visible_ = false
     }
-    leftBtn.visible = leftBtn.visible_ = true
+}
+var nextPage = function(){
+    ++currIndex;
+    currIndex %= 5; 
+    switchVideoSrc2(videoSrcs2[currIndex])
+    btnShow()
 }
 var lastPage = function(){
-    switchVideoSrc2(videoSrcs2[--currIndex])
-    if(currIndex == 0){
-        leftBtn.visible = leftBtn.visible_ = false
-    }
-    rightBtn.visible = rightBtn.visible_ = true
+    --currIndex;
+    currIndex += 5;
+    currIndex %= 5;
+    switchVideoSrc2(videoSrcs2[currIndex])
+    btnShow()
 }
 var switchVideoSrc2 = function(src){
     var video = videosPlane.material.map.image
@@ -18283,6 +18296,10 @@ window.Modernizr = function(n, e, t) {
                         leftBtn.visible = leftBtn.visible_ = false
                     }else if(info.sid == "1626927980174"){//抗日图片
                         videosPlane = overlay.plane
+                        videosPlane.material.map.image.loop = false
+                        videosPlane.material.map.image.addEventListener('ended', ()=>{
+                            nextPage()
+                        })
                     }else if(info.sid == "1626743467424"){
                         overlay.hasSound = true
                     }
@@ -18302,9 +18319,7 @@ window.Modernizr = function(n, e, t) {
                     window.player.emit("videoEnded")
                     console.log( " ended!!!") 
                     if(video.src != leftScreen.originVideoSrc){//播放完之后换为原来的视频
-                    
-                        backToOriginVideo()
-                     
+                        openMenu()  
                     } 
                     
                 })  

web/public/static/js/manage.js

@@ -188,6 +188,7 @@ Manage.prototype.switchBgmState = function(state){
     
     g_bgAudio.pauseByHot = false
     g_bgAudio.pauseByTour = false
+    g_bgAudio.pauseByVideo = false
 }