|
@@ -134,14 +134,14 @@ var updateMenuVisi = function(toPano, dur){
|
|
|
window.switchVideoSrc = function(src){
|
|
|
|
|
|
|
|
|
- var a = player.overlayGroup.children.find(e=>e.sid == '1626674966708')
|
|
|
+ var a = player.overlayGroup.children.find(e=>e.sid == '1626674966708').plane
|
|
|
|
|
|
- var b = player.overlayGroup.children.find(e=>e.sid == '1626675083157')
|
|
|
+ var b = player.overlayGroup.children.find(e=>e.sid == '1626675083157').plane
|
|
|
|
|
|
b.originVideoMap.image.pause()
|
|
|
- b.material.map = a.material.map;
|
|
|
+ b.material.map = a.material.map;//同步播放
|
|
|
|
|
|
- a.material.map.src = src
|
|
|
+ a.material.map.image.src = src
|
|
|
|
|
|
|
|
|
var video = a.material.map.image
|
|
@@ -18047,25 +18047,24 @@ window.Modernizr = function(n, e, t) {
|
|
|
var overlay = new Overlay(info)
|
|
|
|
|
|
if(info.sid == '1626674966708' || info.sid == '1626675083157'){
|
|
|
- overlay.originVideoSrc = overlay.plane.material.map.image.src;
|
|
|
+ overlay.plane.originVideoSrc = overlay.plane.material.map.image.src;
|
|
|
|
|
|
}
|
|
|
|
|
|
})
|
|
|
|
|
|
//三大会议
|
|
|
- var a = player.overlayGroup.children.find(e=>e.sid == '1626674966708')
|
|
|
- var b = player.overlayGroup.children.find(e=>e.sid == '1626675083157')
|
|
|
- b.originVideoMap = b.plane.material.map;
|
|
|
+ var a = player.overlayGroup.children.find(e=>e.sid == '1626674966708').plane
|
|
|
+ var b = player.overlayGroup.children.find(e=>e.sid == '1626675083157').plane
|
|
|
+ b.originVideoMap = b.material.map;
|
|
|
|
|
|
- var video = a.plane.material.map.image
|
|
|
+ var video = a.material.map.image
|
|
|
video.addEventListener('ended', ()=>{
|
|
|
- console.log( " ended!!!")
|
|
|
-
|
|
|
- if(video.src != overlay.originVideoSrc){//播放完之后换为原来的视频
|
|
|
- video.src = overlay.originVideoSrc
|
|
|
+ console.log( " ended!!!")
|
|
|
+ if(video.src != a.originVideoSrc){//播放完之后换为原来的视频
|
|
|
+ video.src = a.originVideoSrc
|
|
|
video.loop = true
|
|
|
- b.plane.material.map = b.originVideoMap
|
|
|
+ b.material.map = b.originVideoMap
|
|
|
video.play();
|
|
|
b.originVideoMap.image.currentTime = 0
|
|
|
b.originVideoMap.image.play()
|