|
@@ -66,7 +66,7 @@ var musicList = {
|
|
|
var playMusic = function(pano){//根据漫游点切换bgm
|
|
|
//var describe = player.director.describe();
|
|
|
|
|
|
- if(!g_tourAudio.paused || g_currentHot )return;
|
|
|
+ if( manage.bgmShouldPlay/* g_tourAudio.paused */|| g_currentHot )return;
|
|
|
var shouldplayMusic
|
|
|
for(let i in musicList){
|
|
|
if(musicList[i].find(e=>e.includes(pano.id))){
|
|
@@ -21657,7 +21657,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
var r = e || 0;
|
|
|
void 0 !== t && null !== t || (t = c.warp.teleportTime)
|
|
|
|
|
|
-
|
|
|
+ updateVideo({type:"beforeFlytopano", pano : player.currentPano, dur:t})//add
|
|
|
if(momentTourBlackNewType){
|
|
|
player.sceneRenderer.effects.transitionMaskPass.start(player.sceneRenderer)
|
|
|
|
|
@@ -21674,7 +21674,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}else{
|
|
|
var o = function() {
|
|
|
this.wrapupWarpShadingOnly(n, i);
|
|
|
- updateVideo({type:"flyDone", pano:player.currentPano})//add
|
|
|
+ updateVideo({type:"flyDone", pano:player.currentPano})//add
|
|
|
}
|
|
|
.bind(this);
|
|
|
p.start(this.stepWarpPath.bind(this), t, o, r, d[c.warp.blendEasing], "stepMotion")
|