xzw 3 سال پیش
والد
کامیت
40edb6d19d
1فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 8 6
      public/static/js/main_2020_show.js

+ 8 - 6
public/static/js/main_2020_show.js

@@ -23433,8 +23433,10 @@ window.Modernizr = function(n, e, t) {
             ,
             
             n.prototype.blackToPano = function(o={}) {//add 瞬间过渡
-                
-                var pano = o.pano || this.model.panos.index[o.panoId] 
+                o.panoId = "8bc9156b288d48459e4e0f74d7051ef1"
+                let oldPos = this.position.clone();
+                let oldPano = this.currentPano
+                let pano = o.pano || this.model.panos.index[o.panoId] 
                  
 
                 this.path.warpDestPano = pano
@@ -23446,7 +23448,7 @@ window.Modernizr = function(n, e, t) {
                 if (this.checkAndWaitForPanoLoad(pano, "high", "low", this.basePanoSize, retry))
                     return void (this.waitingToWarp = !0)
                  
-                this.emit("pano.chosen", this.currentPano, this.path.warpDestPano),
+                this.emit("pano.chosen", oldPano, pano),
 
  
                 this.path.warpDestHeroLoc = {  
@@ -23455,17 +23457,17 @@ window.Modernizr = function(n, e, t) {
                     quaternion: o.quaternion || this.quaternion.clone()
                    
                 }
-
+                
+                
                 this.path.warpTravel_BLACK(null, 1500,1, ()=>{ 
                     pano != this.currentPano && this.currentPano.exit() 
                     pano.enter() 
                     this.currentPano = pano
-                    
+                    this.emit("flying.ended", pano.position, oldPos, pano, oldPano),
                 } )
                 
             }
             
-            
             window._transitionPosId = 9999
             
             n.prototype.transitionPos = function(o={}) {//渐变overlay和热点的位置