11111啊啊啊啊

web/public/static/js/main_2020_show.js

@@ -86,20 +86,19 @@ var initMenuSanda = ()=>{
     
     
     
-    /* var tex = Texture.load(manage.dealURL("static/images/select.png"))
-    menuSanda.nameBox = new THREE.Mesh(geo, new THREE.MeshBasicMaterial({
+    var tex = Texture.load(manage.dealURL("static/images/noAction.png"))
+    menuSanda.dontTouchWarn = new THREE.Mesh(geo, new THREE.MeshBasicMaterial({
         map : tex    
     }))
-    menuSanda.nameBox.position.set(0,-0.2,0.004)
-    menuSanda.nameBox.scale.set(0.1, 0.05, 1); 
-    menuSanda.add(menuSanda.nameBox) */
-    
+    menuSanda.dontTouchWarn.position.set(0,-0.2,0.004)
+    menuSanda.dontTouchWarn.scale.set(0.3, 0.045, 1); 
+    menuSanda.add(menuSanda.dontTouchWarn) 
     
     dealMap(menuSanda.buttons[0].material.map)
     dealMap(menuSanda.buttons[1].material.map)
     dealMap(menuSanda.buttons[2].material.map)
     dealMap(menuSanda.openTex)
-    //dealMap(tex)
+    dealMap(tex)
     
     
     
@@ -129,7 +128,7 @@ var openMenu = function(){//打开菜单  或者 播放完回到菜单
     })
     
     backToOriginVideo()
-    
+    menuSanda.dontTouchWarn.visible = false
     menuSanda.opened = true
     SandaPlayingIndex = null
 }
@@ -140,6 +139,7 @@ var closeMenu = function(ifPause){//完全关闭菜单
         e.visible = false 
     })
     menuSanda.opened = false
+    menuSanda.dontTouchWarn.visible = false
     backToOriginVideo(ifPause)
     SandaPlayingIndex = null
     clearTimeout(timer1)
@@ -165,11 +165,14 @@ var clickMenuBtn = function(btn){
     })
     clearTimeout(timer1)
 }
-
-
+ 
 
 var checkMenuClick = function(){
-    if(SandaPlayingIndex != void 0 || !menuSanda.opened && player.mode == 'panorama')return
+    if(!menuSanda.opened && player.mode == 'panorama')return
+    if(SandaPlayingIndex != void 0 ){
+        menuSanda.dontTouchWarn.visible = true
+    }
+    
     var intersect = player.getMouseIntersect(null, menuSanda.buttons.slice())
     if(!intersect)return
     var item = menuSanda.buttons.find(e=>e==intersect.object)
@@ -21116,18 +21119,25 @@ window.Modernizr = function(n, e, t) {
             }
             ,
             n.prototype.waitNextStep = function(e, t, time) {//xzw 改时间
-                var i = (time==void 0)? c.warp.tourStepDelay : time;
-                i || (i = this.lastTransType === l.BLACK ? b.tourStepDelaySlideShow : b.tourStepDelayDefault);
                 var n = new r.Euler
                   , o = new r.Vector3;
                 y.debug("Starting wait: " + (void 0 !== t));
                 var s = this.calcBurnsAmount(e)
-                  , h = function() {
+                
+                i = (time==void 0)? c.warp.tourStepDelay : time;
+                i || (i = this.lastTransType === l.BLACK ? b.tourStepDelaySlideShow : b.tourStepDelayDefault);
+                if(browser.isMobile() &&this.lastTransType !== l.BLACK ){
+                   i = Math.min(Math.abs(s * 8000), 7000);
+                }
+                
+                
+                var  h = function() {
                     this.endWarpState(),
                     this.player.mode === a.DOLLHOUSE && (this.playerControls.cameras[a.DOLLHOUSE].controls.rotationAcceleration.x = 0),
                     t && t()
                 }
-                .bind(this)
+                .bind(this) 
+                
                   , u = function(e, t) {
                     if (this.warpInterrupted)
                         return h(),
@@ -21150,6 +21160,11 @@ window.Modernizr = function(n, e, t) {
                             this.player.mode === a.DOLLHOUSE ? this.playerControls.controls[a.DOLLHOUSE].rotationAcceleration.x = s : this.playerControls.controls[a.FLOORPLAN].absoluteScale *= .9996
                 }
                 .bind(this);
+                
+                
+                 
+                
+                
                 this.startWarpState(),
                 p.start(u, i, h, 0, d.easeInOutQuad, "wait")
 
@@ -23342,6 +23357,7 @@ window.Modernizr = function(n, e, t) {
                         if(menuSanda.opened){
                             if(SandaPlayingIndex != void 0){
                                 //openMenu()
+                                menuSanda.dontTouchWarn.visible = true
                             }else{
                                 closeMenu()
                             } 
@@ -27156,8 +27172,10 @@ window.Modernizr = function(n, e, t) {
                 softBendTilt: 4,
                 softBendEnd: .3,
                 doBurns: true, //r.valueFromHash("kb", !0),
-                burnsAngle: 8, //导览在每个点停留时的旋转角度
+                
+                burnsAngle: browser.isMobile() ? 35 : 8, //导览在每个点停留时的旋转角度
                 minBurnsAngle: 35,
+                
                 minDownAngle: -35,
                 maxTurnPerSec: 280,
                 maxAimPerSec: 35,