|
|
@@ -4534,25 +4534,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.updateModel(),
|
|
|
this.resetAll(),
|
|
|
this.bindEvents()
|
|
|
-
|
|
|
- // 周恩光 查询pano对应的导览片段
|
|
|
- if(!this.panoIdMap) {
|
|
|
- this.panoIdMap = new Map()
|
|
|
- this.model.heroLocations.forEach( (value, index) => {
|
|
|
- // value.heroLocations.forEach( hl => {
|
|
|
- if(value.heroLocations){
|
|
|
- let hl = value.heroLocations[0]
|
|
|
- let arr = this.panoIdMap.get(hl.panoId)
|
|
|
- if(arr){
|
|
|
- this.panoIdMap.set(hl.panoId, [...arr, index])
|
|
|
- } else {
|
|
|
- this.panoIdMap.set(hl.panoId, [index])
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- // })
|
|
|
- })
|
|
|
- }
|
|
|
}
|
|
|
,
|
|
|
n.prototype.resetAll = function() {
|
|
|
@@ -4808,15 +4789,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
|
|
|
// 手动导览不播放音频
|
|
|
if(musicInfo && musicInfo.music && !e){
|
|
|
-
|
|
|
- let musicType = localStorage.getItem('xunirole') || 'male'
|
|
|
-
|
|
|
- let isMale = musicType.indexOf('female') < 0
|
|
|
-
|
|
|
- let fixMusic = isMale?musicInfo.music:(musicInfo.fmusic||musicInfo.music)
|
|
|
-
|
|
|
- // let src = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
|
- let src = fixMusic
|
|
|
+ let src = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music : g_Prefix + musicInfo.music;
|
|
|
let audioObj = SoundManager.list.find(e=>e.name == 'tour')
|
|
|
let audioSrc1 = common.getFileNameFromUrl(audioObj.src);
|
|
|
let audioSrc2 = common.getFileNameFromUrl(src)
|
|
|
@@ -4854,11 +4827,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
if (this.player.flying || this.player.isWarping())
|
|
|
A.warn("Cannot go to new destination while player is flying or warping.");
|
|
|
else {
|
|
|
-
|
|
|
var r = this.model.getHeroDescriptorByIndex(this.destinationItem)
|
|
|
, o = null
|
|
|
, a1 = null;
|
|
|
- // console.error(this.destinationItem)
|
|
|
if (r.isPano && r.isPano()) {
|
|
|
|
|
|
//var s = 0 === this.destinationItem || e ? u.BLACK : this.nextWarpStyle;
|
|
|
@@ -4916,33 +4887,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
,
|
|
|
n.prototype.playTour = function() {
|
|
|
- if (!this.bounceable()) {
|
|
|
-
|
|
|
- if(!this.currentItem) this.currentItem = []
|
|
|
- if((this.currentItem[0] != 0 || this.destinationItem[0]!= this.nItems-1) && this.player.hasMoved){
|
|
|
- // 周恩光加 从当前pano进行自动导览
|
|
|
- let currentPanoDestinations = this.panoIdMap.get(this.player.currentPano.id)
|
|
|
- // this.model.heroLocations.forEach( (value, index) => {
|
|
|
- // if(value.heroLocations.find( hl => hl.panoId == this.player.currentPano.id )) {
|
|
|
- // currentPanoDestinations.push(index)
|
|
|
- // }
|
|
|
- // })
|
|
|
-
|
|
|
- if(!currentPanoDestinations) {
|
|
|
- // let panoIndex = this.model.panos.list.findIndex( pano => pano.id == this.player.currentPano.id )
|
|
|
- let panoIndex = this.model.panos.list.indexOf( this.player.currentPano )
|
|
|
- let neighbourIndex = [ panoIndex + 1, panoIndex - 1, panoIndex + 2, panoIndex - 2, panoIndex + 3, panoIndex - 3 ]
|
|
|
- for(var i = 0; i < neighbourIndex.length; i++) {
|
|
|
- currentPanoDestinations = this.panoIdMap.get(this.model.panos.list[neighbourIndex[i]]&&this.model.panos.list[neighbourIndex[i]].id)
|
|
|
- if(currentPanoDestinations && currentPanoDestinations[0] != 0) break
|
|
|
- }
|
|
|
- if(!currentPanoDestinations) currentPanoDestinations = [0];
|
|
|
- }
|
|
|
- if(currentPanoDestinations.indexOf(this.currentItem[0]) == -1) {
|
|
|
- this.currentItem[0] = currentPanoDestinations[0]
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+ if (!this.bounceable())
|
|
|
return this.tourIsPlaying ? void A.info("tour is already playing") : void (this.wouldInterrupt() || (this.player.emit("tour_auto", this.defaultWarpStyle),
|
|
|
this.tourInProgress = !0,
|
|
|
this.reachSource = "play",
|
|
|
@@ -4953,10 +4898,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.emit("update.controls"),
|
|
|
this.emit(p.TourStart),
|
|
|
this.player.enablePreRendering(),
|
|
|
- this.player.hasMoved && (this.currentItem[1] = null),
|
|
|
this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
|
|
|
this.goToDestination()) : this.goNext()))
|
|
|
- }
|
|
|
}
|
|
|
,
|
|
|
/* n.prototype.bgmReplay = function() {//xzw add 结束tour后可能要继续播放背景音乐
|
|
|
@@ -4972,7 +4915,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.clearWalkingSectionPaused(),
|
|
|
this.resetSpecialTransition(),
|
|
|
this.emit("update.controls"))
|
|
|
- this.player.hasMoved = false // 周恩光加 用于标注暂停导览后是否有flytopano
|
|
|
+
|
|
|
}
|
|
|
,
|
|
|
n.prototype.endTourProgress = function() {
|
|
|
@@ -5129,27 +5072,18 @@ window.Modernizr = function(n, e, t) {
|
|
|
n.prototype.tourAdvance = function(e) {//e是1或-1
|
|
|
|
|
|
A.debug("tourAdvance(" + e + ")")
|
|
|
-
|
|
|
- // 周恩光改
|
|
|
if(null === this.currentItem || void 0 === this.currentItem){
|
|
|
- // this.setDestinationItem(this.firstDestination())
|
|
|
- // this.setDestinationItem([currentPanoDestinations[0], 0])
|
|
|
- this.setDestinationItem([this.currentItem[0]||0, 0])
|
|
|
- }
|
|
|
- else if(this.currentItem[1] == null) {
|
|
|
- this.setDestinationItem([this.currentItem[0]||0, 0])
|
|
|
- }
|
|
|
- else{
|
|
|
+ this.setDestinationItem(this.firstDestination())
|
|
|
+ }else{
|
|
|
var item
|
|
|
if(e == 1){
|
|
|
item = this.nextItem(this.currentItem)
|
|
|
}else if(e == -1){
|
|
|
item = this.prevItem(this.currentItem)
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
this.setDestinationItem(item)
|
|
|
}
|
|
|
-
|
|
|
if(this.itemCompare(this.destinationItem, this.finalDestination(), 'equal')[0] < 0 ){
|
|
|
this.useSpecialTransition("reverse-looping to end")
|
|
|
}else if(this.itemCompare(this.destinationItem, this.firstDestination(), 'equal')){
|
|
|
@@ -6634,7 +6568,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}),
|
|
|
window.startAndPlay = function(e) {
|
|
|
// l(e);
|
|
|
@@ -6650,6 +6584,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
J.trackAlways("showcase_gui", {
|
|
|
gui_action: "pause_highlights"
|
|
|
})
|
|
|
+ SoundManager.pause('tour') // 周恩光 点击场景时停止语音
|
|
|
}),
|
|
|
$("#gui-zoomin").find("a").on("click", function(e) {
|
|
|
l(e),
|
|
|
@@ -6701,18 +6636,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
$(".gui-floor-number").text(" " + (e.floorIndex + 1)),
|
|
|
$(".floorChoice").removeClass("active"),
|
|
|
$(".floorChoice[data-index=" + e.floorIndex + "]").addClass("active")))
|
|
|
-
|
|
|
- if(window.number == '1149_2'){
|
|
|
- if(e.floorIndex===0){
|
|
|
- $('.cad') && $('.cad').addClass('hidemap')
|
|
|
- $('.cad1') && $('.cad1').removeClass('hidemap')
|
|
|
- }
|
|
|
-
|
|
|
- if(e.floorIndex===1){
|
|
|
- $('.cad1') && $('.cad1').addClass('hidemap')
|
|
|
- $('.cad') && $('.cad').removeClass('hidemap')
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
function I(e) {
|
|
|
return e.describe().inTransition
|
|
|
@@ -6995,7 +6918,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
var r, a, s;
|
|
|
if (null !== n.currentItem) {
|
|
|
var p, f;
|
|
|
- $("#status").find(".curIdx").text((n.currentItem[0] || 0) + 1),
|
|
|
+ $("#status").find(".curIdx").text(n.currentItem[0] + 1),
|
|
|
n.onTheBus ? (p = "active",
|
|
|
f = "recent") : (f = "active",
|
|
|
p = "recent");
|
|
|
@@ -8026,16 +7949,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
function s(e, t) {
|
|
|
setTimeout(function() {
|
|
|
- // h.isHelpEnabled()
|
|
|
- if (false) {
|
|
|
- if (t(),
|
|
|
- u.init(),
|
|
|
- C.addClass("fadeIn landing " + u.deviceType),
|
|
|
- h.isSmallHelpEnabled())
|
|
|
- return void C.addClass("small");
|
|
|
- u.fill(I, d.LANDING[E]),
|
|
|
- C.addClass(E)
|
|
|
- }
|
|
|
}, e)
|
|
|
//csz 用户引导界面
|
|
|
var helpData = {
|
|
|
@@ -14717,7 +14630,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}),
|
|
|
!P.supportsTiles) {
|
|
|
var e = new Z(P,w);
|
|
|
- // e.start()
|
|
|
+ e.start()
|
|
|
}
|
|
|
u && (S.removeComponent(g),
|
|
|
g.destroy(),
|
|
|
@@ -14729,9 +14642,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
var e = N.calcFullLoadingTime();
|
|
|
de.warn("Total load time: " + e / 1e3),
|
|
|
H.loadComplete(e),
|
|
|
- window.dispatchEvent(window.evt);
|
|
|
de.warn("First render after model load finished.")
|
|
|
try {
|
|
|
+ window.evt && window.dispatchEvent(window.evt);
|
|
|
parent.postMessage({
|
|
|
cmd: "loaded",
|
|
|
}, "*")
|
|
|
@@ -17233,7 +17146,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
item.momentTour = info.momentTour
|
|
|
item.dontRot = info.dontRot
|
|
|
item.rotTime = info.rotTime
|
|
|
-
|
|
|
+ item.musicInfo = info.musicInfo || g_data2.tourAudio[info.sid] || {}//新的music数据统一写在每个info下,如果有musicInfo则覆盖g_data2.tourAudio
|
|
|
|
|
|
|
|
|
container.push(item)
|
|
|
@@ -19093,6 +19006,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
t[this.id] || (t[this.id] = !0,
|
|
|
this.on(f.LoadComplete, function(e, t) {
|
|
|
+ //console.warn('点位下载完成 ', 'id:'+this.id, 'count:'+t )
|
|
|
var i = this.getWaitDeferred(e).deferred;
|
|
|
i && "pending" === i.state() && this.highestPartialTileRenderOpCompleted >= e && (i.resolve(e, t),
|
|
|
this.resetWaitDeferred(e))
|
|
|
@@ -19105,6 +19019,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
.bind(this)),
|
|
|
this.on(f.TileLoaded, function(t, i, n) {
|
|
|
+ //console.log('tileLoaded', 'id:'+this.id, 'size:'+t, 'index:'+i )
|
|
|
+
|
|
|
+
|
|
|
var r = this.getWaitDeferred(t).deferred;
|
|
|
if (r && "pending" === r.state()) {
|
|
|
r.notify(t, i, n);
|
|
|
@@ -20367,7 +20284,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
, o = new r.Vector3;
|
|
|
y.debug("Starting wait: " + (void 0 !== t));
|
|
|
|
|
|
- var currentLocation = this.model.heroLocations[this.director.currentItem[0]]
|
|
|
+ var currentLocation = this.model.getHeroDescriptorByIndex(this.director.currentItem)//this.model.heroLocations[this.director.currentItem[0]]
|
|
|
var s = currentLocation.dontRot || this.calcBurnsAmount(e)
|
|
|
, h = function() {
|
|
|
this.endWarpState(),
|
|
|
@@ -21916,8 +21833,6 @@ window.Modernizr = function(n, e, t) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- this.hasMoved = true // 周恩光加
|
|
|
-
|
|
|
if (this.cameraControls.activeControl && this.cameraControls.activeControl.emit(_.Move, this.isTouchEvent ? "touch" : "mouse"),
|
|
|
this.history.invalidate(),
|
|
|
this.intersect)
|
|
|
@@ -22875,7 +22790,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
//---------before fly--------------- add
|
|
|
this.updateHotVisible(i); //更新热点显示
|
|
|
this.transitionPos({type:"beforeFlytopano", pano:i, dur:I})//add
|
|
|
- //Hot.updateVisibles([this.currentPano, i]) // 周恩光 注释 只在fly完成时再显示热点
|
|
|
+ // Hot.updateVisibles([this.currentPano, i])
|
|
|
|
|
|
//地标变化
|
|
|
if(this.model.floorLogos){
|
|
|
@@ -24073,7 +23988,11 @@ window.Modernizr = function(n, e, t) {
|
|
|
, s = new a(i);
|
|
|
n.prototype.start = function() {
|
|
|
this.loadNextPano(function(e) {
|
|
|
- e ? this.start() : (s.debug("No suitable pano loaded, waiting a little while before looking again"))
|
|
|
+ e ? this.start() : (s.debug("No suitable pano loaded, waiting a little while before looking again"),
|
|
|
+ setTimeout(function() {
|
|
|
+ this.start()
|
|
|
+ }
|
|
|
+ .bind(this), 1e3))
|
|
|
}
|
|
|
.bind(this))
|
|
|
}
|
|
|
@@ -27560,6 +27479,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
,
|
|
|
l.prototype.clearUploadQueue = function(e, t, i) {
|
|
|
if(!r || !r.tile) return
|
|
|
+
|
|
|
void 0 !== t && null !== t || (t = 0);
|
|
|
for (var n = 0; n < e.length; ) {
|
|
|
var r = e[n];
|
|
|
@@ -27622,6 +27542,10 @@ window.Modernizr = function(n, e, t) {
|
|
|
var e = {}
|
|
|
, t = (new h.Vector4,
|
|
|
d.tiling.overlayStyle);
|
|
|
+
|
|
|
+ //var failHistory = {};
|
|
|
+
|
|
|
+
|
|
|
return function(i, n) {
|
|
|
var r = i.panoId
|
|
|
, o = i.image
|
|
|
@@ -27649,6 +27573,14 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.isTileUploaded(i) && (p = !1,
|
|
|
g = !1)),
|
|
|
p) {
|
|
|
+
|
|
|
+ /* if(failHistory[''+r+s+l]){
|
|
|
+ console.log('uploadTile retry', r, s, l)
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log('uploadTile 成功', r, s, l)
|
|
|
+ */
|
|
|
+
|
|
|
var C = u * a
|
|
|
, I = d * a
|
|
|
, E = a / s * y
|
|
|
@@ -27668,8 +27600,12 @@ window.Modernizr = function(n, e, t) {
|
|
|
m.uploadCount === c && this.emit(f.PanoRenderComplete, r, s, c),
|
|
|
this.setUploaded(i, !0),
|
|
|
this.addCoverageForNode(i.node)
|
|
|
- } else
|
|
|
+ } else{
|
|
|
this.setUploaded(i, !1);
|
|
|
+ console.log('uploadTile 失败', r, s, l)
|
|
|
+ //failHistory[''+r+s+l] = true;
|
|
|
+
|
|
|
+ }
|
|
|
return i.uploadAttempted || (m.uploadAttempts++,
|
|
|
this.emit(f.TileUploadAttempted, r, s, l, c)),
|
|
|
i.uploadAttempted = !0,
|
|
|
@@ -58396,7 +58332,7 @@ var addMagnifier = function(){
|
|
|
}))
|
|
|
this.overlayMesh = new THREE.Mesh(circleGeo, new THREE.MeshBasicMaterial({
|
|
|
side: THREE.DoubleSide ,
|
|
|
- map: Texture.load('images/crosshair.png') ,
|
|
|
+ map: Texture.load('static/images/crosshair.png') ,
|
|
|
transparent:true,
|
|
|
depthTest: !1,
|
|
|
depthWrite: !1,
|
tremble
