|
|
@@ -59603,10 +59603,11 @@ class UserGuide{
|
|
|
}
|
|
|
|
|
|
setCurrentItem(item){
|
|
|
+
|
|
|
if(player.director.itemCompare(item, this.currentItem,'equal' )) return
|
|
|
//lastCurItem = player.director.currentItem?.slice()
|
|
|
-
|
|
|
-
|
|
|
+ console.log('setCurrentItem', item)
|
|
|
+ this.currentItem = item
|
|
|
let curItem = player.model.getHeroDescriptorByIndex(item)
|
|
|
if(player.currentPano.id == curItem.panoId){
|
|
|
player.director.setCurrentItem(item)
|
|
|
@@ -59621,13 +59622,13 @@ class UserGuide{
|
|
|
this.pause(false)//SoundManager.pause('tour')
|
|
|
}
|
|
|
|
|
|
- this.currentItem = item
|
|
|
+
|
|
|
}
|
|
|
|
|
|
play(){
|
|
|
//从当前index开始播放,如果在导览区域,就在当前点播音乐,如果不是就跳到当前导览区域第一个点
|
|
|
//假定导览都在漫游模式 //假设不同导览区域不存在相同漫游点
|
|
|
-
|
|
|
+ this.pausedByBtn = false
|
|
|
let curItem = player.model.getHeroDescriptorByIndex(player.director.currentItem || [0,0])
|
|
|
let playMusic = ()=>{
|
|
|
this.setMusic()
|
|
|
@@ -59652,8 +59653,8 @@ class UserGuide{
|
|
|
|
|
|
go(axis){
|
|
|
let length = player.model.heroLocations.length
|
|
|
- let cur = player.director.currentItem
|
|
|
- let next = [(cur[0]+axis) % length, 0]
|
|
|
+ let cur = this.currentItem
|
|
|
+ let next = [(cur[0]+axis+length) % length, 0]
|
|
|
let nextItem = player.model.getHeroDescriptorByIndex(next)
|
|
|
|
|
|
player.flyToPano({pano: player.model.panos.get(nextItem.panoId), quaternion:nextItem.quaternion},()=>{
|