Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/yangshi_cloudExbition

public/static/js/main_2020_show.js

@@ -9,7 +9,7 @@ window.easing = null
 window.lerp = null
 window.transitions = null
 window.browser = null
-window.momentTourBlackNewType = 0//true
+window.momentTourBlackNewType =  true
 
 g_playAudio = null
 
@@ -23389,6 +23389,38 @@ window.Modernizr = function(n, e, t) {
             }
             ,
             
+            n.prototype.blackToPano = function(o={}) {//add 瞬间过渡
+                
+                var pano = o.pano || this.model.panos.index[o.panoId] 
+                 
+
+                this.path.warpDestPano = pano
+ 
+                var retry = ()=>{
+                    this.waitingToWarp = !1,
+                    this.blackToPano(o)
+                }
+                if (this.checkAndWaitForPanoLoad(pano, "high", "low", this.basePanoSize, retry))
+                    return void (this.waitingToWarp = !0)
+                 
+                this.emit("pano.chosen", this.currentPano, this.path.warpDestPano),
+
+ 
+                this.path.warpDestHeroLoc = {  
+                    panoId : o.panoId,
+                    position: pano.position,
+                    quaternion: o.quaternion || this.quaternion.clone()
+                   
+                }
+
+                this.path.warpTravel_BLACK(null, 1500,1, ()=>{ 
+                    pano != this.currentPano && this.currentPano.exit() 
+                    pano.enter() 
+                    this.currentPano = pano
+                    
+                } )
+                
+            }
             
             
             window._transitionPosId = 9999

public/static/js/myShow.js

@@ -61,9 +61,9 @@ var g_weixinObj = {
 
 var settings = {
     overlay:{
-      width:1, height:0.5, depth:0.02
-    },
-    dontExamHot:true  
+		width:1, height:0.5, depth:0.02
+	}  ,
+    dontExamHot:true
 }
 if(window.number == '725'||window.number == '724'){
     settings.mobileNavHigh = true