|
|
@@ -4985,16 +4985,20 @@ window.Modernizr = function(n, e, t) {
|
|
|
//var s = 0 === this.destinationItem || e ? u.BLACK : this.nextWarpStyle;
|
|
|
//var walk = window.MP_PREFETCHED_MODELDATA.black ? 'black' : 'walk';
|
|
|
|
|
|
-
|
|
|
- var s1 = this.getMomentTour(this.destinationItem) //window.MP_PREFETCHED_MODELDATA.momentTour || "walk";
|
|
|
- a1 = this.player.warpToPanoByHeroIndex.bind(this.player, this.destinationItem, v.Show, m.Slow, s1, true, i, this.actionComplete.bind(this)),
|
|
|
- o = this.arrivedAtDestination.bind(this, !0)
|
|
|
-
|
|
|
+ if(e == 'noMusic'){
|
|
|
+ var aim = new THREE.Vector3(0,0,-1).applyQuaternion(r.quaternion).add(r.position)
|
|
|
+ a1 = this.player.flyToPano.bind(this.player, {pano: this.model.panos.index[r.panoId], lookAtPoint: aim }, this.actionComplete.bind(this))
|
|
|
+ }else{
|
|
|
+ var s1 = this.getMomentTour(this.destinationItem) //window.MP_PREFETCHED_MODELDATA.momentTour || "walk";
|
|
|
+ a1 = this.player.warpToPanoByHeroIndex.bind(this.player, this.destinationItem, v.Show, m.Slow, s1, true, i, this.actionComplete.bind(this)),
|
|
|
+ o = this.arrivedAtDestination.bind(this, !0)
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if(r.zoom && r.zoom != this.player.zoomLevel){//add
|
|
|
this.player.smoothZoomFovTo(null, r.zoom, a.warp.teleportTime) //瞬间过渡的时间
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
xzw