|
|
@@ -4693,7 +4693,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
var s = tM.music.includes(g_Prefix.slice(-10)) ? tM.music : g_Prefix + tM.music;
|
|
|
|
|
|
|
|
|
- g_tourAudio.src = s;
|
|
|
+ g_tourAudio.src = manage.dealURL(s);
|
|
|
g_tourAudio.load();
|
|
|
g_tourAudio.crossOrigin = "anonymous"
|
|
|
|
|
|
@@ -4751,7 +4751,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
this.emit("update.controls"),
|
|
|
this.tourIsPlaying)
|
|
|
return this.atEndOfTour() && !this.endlessLoop ? (this.tourInProgress = !1,
|
|
|
- this.stopTour(),
|
|
|
+ this.stopTour(true),
|
|
|
this.emit(p.TourEnd),
|
|
|
void (this.player.mode === c.PANORAMA && this.model.fadePanoMarkers(a.panorama.markerOpacity))) : void this.awaitCompletion(function() {
|
|
|
this.transitionStage = y.Interlude,
|
|
|
@@ -4786,16 +4786,16 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
}
|
|
|
,
|
|
|
- n.prototype.stopTour = function() {
|
|
|
+ n.prototype.stopTour = function(isAutoStop) {//停止导览 isAutoStop 希望仅在飞完结束自动停止时的stopTour不停止tourSound, 这样才能完整播放tourSound. 不过似乎会在倒数第二个片段点击按钮停止导览时也视作自动结束的（执行this.interrupt() ）。
|
|
|
this.isInterrupted() || this.transitionStage === y.Moving && this.checkAndHandleWalkingtourInterruption(this.nextWarpStyle) || (this.tourIsPlaying && (this.player.zoomEnabled = this.wasZoomEnabled),
|
|
|
this.tourIsPlaying = !1,
|
|
|
- this.bgmReplay(),//xzw
|
|
|
+ (!isAutoStop || g_tourAudio && g_tourAudio.paused )&&this.bgmReplay(),//xzw
|
|
|
this.interrupt(),
|
|
|
this.clearWalkingSectionPaused(),
|
|
|
this.resetSpecialTransition(),
|
|
|
this.emit("update.controls"))
|
|
|
//window.tourAudio && window.tourAudio.pause();
|
|
|
- if( g_tourAudio && g_tourAudio.paused == false )
|
|
|
+ if(!isAutoStop && g_tourAudio && g_tourAudio.paused == false )
|
|
|
{
|
|
|
g_tourAudio.pause();
|
|
|
g_tourAudio.src = ""
|
|
|
@@ -7695,9 +7695,9 @@ window.Modernizr = function(n, e, t) {
|
|
|
s(n, r)
|
|
|
}
|
|
|
function a(e) {
|
|
|
- return e && (y.addClass("quick-brand"),
|
|
|
- v.before(y),
|
|
|
- A = $(".quick-brand").toArray()),
|
|
|
+ return /* e && (y.addClass("quick-brand"), //quick-brand样式有问题 会遮住屏幕
|
|
|
+ v.before(y),
|
|
|
+ A = $(".quick-brand").toArray()),*/
|
|
|
m.addClass("fadeOut"),
|
|
|
setTimeout(function() {
|
|
|
A.forEach(function(e) {
|
|
|
@@ -14622,10 +14622,12 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
//czj 判断someData 有没有backgroundMusic 添加音乐
|
|
|
if (window.MP_PREFETCHED_MODELDATA.backgroundMusic) {
|
|
|
- g_bgAudio.src = window.MP_PREFETCHED_MODELDATA.backgroundMusic.substr(0,4)=="http" ? window.MP_PREFETCHED_MODELDATA.backgroundMusic : "//" + window.MP_PREFETCHED_MODELDATA.backgroundMusic;
|
|
|
+ let src = window.MP_PREFETCHED_MODELDATA.backgroundMusic.substr(0,4)=="http" ? window.MP_PREFETCHED_MODELDATA.backgroundMusic : "//" + window.MP_PREFETCHED_MODELDATA.backgroundMusic;
|
|
|
+ g_bgAudio.src = manage.dealURL(src) ;
|
|
|
$("#volume").show();
|
|
|
}else if (g_version === "one"){
|
|
|
- g_bgAudio.src = g_Prefix+"/audio/"+"audio"+window.number + "/background.mp3";
|
|
|
+ let src = g_Prefix+"/audio/"+"audio"+window.number + "/background.mp3";
|
|
|
+ g_bgAudio.src = manage.dealURL(src) ;
|
|
|
}
|
|
|
|
|
|
//隐藏公司logo
|
|
|
@@ -15424,8 +15426,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
hot.prototype.initStyleImg = function(t){
|
|
|
this.styleTex = []
|
|
|
t.styleImg = t.styleImg || [];
|
|
|
- t.styleImg.forEach((src)=>{
|
|
|
- this.styleTex.push({src:src})
|
|
|
+ t.styleImg.forEach((src)=>{
|
|
|
+ this.styleTex.push({src:manage.dealURL(src)})
|
|
|
})
|
|
|
this.changeTex()
|
|
|
}
|
|
|
@@ -17114,6 +17116,10 @@ window.Modernizr = function(n, e, t) {
|
|
|
if (u === a.MESH)
|
|
|
continue;
|
|
|
|
|
|
+
|
|
|
+ var src = g_version === "one" ? g_Prefix + l + "?"+ randomTime().getTime() : (l.substr(0,4)=="http" ? l + "?"+ randomTime().getTime() : '//' + l + "?"+ randomTime().getTime())
|
|
|
+ src = manage.dealURL(src)
|
|
|
+
|
|
|
var d = {
|
|
|
cameraMode: u,
|
|
|
position: o.metadata.camera_position,
|
|
|
@@ -17122,7 +17128,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
panoId: o.metadata.scan_id,
|
|
|
orthoZoom: o.metadata.ortho_zoom,
|
|
|
floorVisibility: void 0 !== o.metadata.floor_visibility ? o.metadata.floor_visibility.slice(0) : [],
|
|
|
- thumbUrl: g_version === "one" ? g_Prefix + l + "?"+ randomTime().getTime() : (l.substr(0,4)=="http" ? l + "?"+ randomTime().getTime() : '//' + l + "?"+ randomTime().getTime()),
|
|
|
+ thumbUrl: src,
|
|
|
name: n.filterImageName(c),
|
|
|
sid: o.sid //xzw add g_tourAudio要用,
|
|
|
}
|
|
|
@@ -23624,7 +23630,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
throw new c("Can't start SceneRenderer, already started");
|
|
|
this.createContext(e),
|
|
|
/***************************************************VR fyz改 from徐世廷**********************************************************************/
|
|
|
- this.boluoVrInit(),
|
|
|
+ m.isMobile() && this.boluoVrInit(),
|
|
|
/*******************************************************************************************************************************/
|
|
|
this.initComposer(),
|
|
|
this.started = !0,
|
|
|
@@ -23862,7 +23868,7 @@ window.Modernizr = function(n, e, t) {
|
|
|
}
|
|
|
,
|
|
|
n.prototype.vrLoadingInit = function() {
|
|
|
- var a = function() {
|
|
|
+ var a = function(camera) {
|
|
|
var a = this
|
|
|
, b = new r.RingGeometry(1.3,1.5,32,32,0,1.2 * Math.PI)
|
|
|
, c = new r.MeshBasicMaterial({
|
|
|
@@ -23874,8 +23880,8 @@ window.Modernizr = function(n, e, t) {
|
|
|
d.position.z = -2,
|
|
|
d.scale.set(.08, .08, .08),
|
|
|
d.visible = !1,
|
|
|
- // camera.add(d),
|
|
|
- window.player.camera.add(d),
|
|
|
+ camera.add(d),
|
|
|
+ //window.player.camera.add(d),
|
|
|
a.enabled = !1,
|
|
|
this.update = function(b) {
|
|
|
1 == a.enabled && (d.rotation.z += 15 * b)
|
xzw