|
|
@@ -7166,7 +7166,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
|
|
|
|
|
|
t.on("update.controls", function() {//导览高亮item
|
|
|
-
|
|
|
+ return
|
|
|
var n = t.describe();
|
|
|
if(n.tourIsPlaying || i.isWarping()){
|
|
|
|
|
|
@@ -59568,12 +59568,12 @@ window.tourPlayCtl = {
|
|
|
|
|
|
|
|
|
|
|
|
-class UserGuide{
|
|
|
+class UserGuide{//由音乐来控制自动播放,音乐开着就当音乐播完自动下一个区域,否则不动。
|
|
|
constructor(player){
|
|
|
let lastCurItem
|
|
|
this.currentItem = [0,0]
|
|
|
this.player = player
|
|
|
- this.pausedByBtn = true
|
|
|
+ this.pausedByBtn = true //音乐和自动播放是否暂停
|
|
|
|
|
|
SoundManager.list.find(e=>e.name == 'tour').audio.addEventListener('ended', ()=>{
|
|
|
player.director.tourIsPlaying && this.go(1) //下一个点
|
|
|
@@ -59612,14 +59612,14 @@ class UserGuide{
|
|
|
this.currentItem = item
|
|
|
let curItem = player.model.getHeroDescriptorByIndex(item)
|
|
|
if(player.currentPano.id == curItem.panoId){
|
|
|
- player.director.setCurrentItem(item)
|
|
|
+ player.director.setCurrentItem(item)//无论是否在导览页面、是否开启音乐都设置
|
|
|
|
|
|
//if(!player.director.tourIsPlaying){
|
|
|
if(this.pausedByBtn) return
|
|
|
else this.play()
|
|
|
//}
|
|
|
//this.setMusic()
|
|
|
- }else{//走到了导览以外的区域
|
|
|
+ }else{//走到了导览以外的区域 要取消高亮item
|
|
|
player.director.setCurrentItem(null)
|
|
|
this.pause(false)//SoundManager.pause('tour')
|
|
|
}
|
|
|
@@ -59649,7 +59649,7 @@ class UserGuide{
|
|
|
SoundManager.pause('tour')
|
|
|
player.director.tourInProgress = player.director.tourIsPlaying = false
|
|
|
player.director.emit("update.controls")
|
|
|
- this.pausedByBtn = byBtn
|
|
|
+ if(byBtn)this.pausedByBtn = true
|
|
|
}
|
|
|
|
|
|
|