xzw 3 yıl önce
ebeveyn
işleme
8a7679be18
1 değiştirilmiş dosya ile 13 ekleme ve 9 silme
  1. 13 9
      public/static/js/main_2020_show.js

+ 13 - 9
public/static/js/main_2020_show.js

@@ -452,11 +452,15 @@ var startIdle = function(){
     var musicSrc = musicInfo && musicInfo.music
     
     animations.forEach((e,i)=>{
+        e.currentIdleAnimation && GifTexDeal.stop(e.currentIdleAnimation)
         e.mesh.visible = true; 
         let a = getRandomItem(e.idleAnimation)
         e.mesh.material.map = a.animation.texture
         GifTexDeal.stop(e.walkAnimation)
-        musicGroup[e.name].some(e=>e.includes(musicSrc)) && GifTexDeal.start(a )
+        if(musicGroup[e.name].some(e=>e.includes(musicSrc)) ){
+            GifTexDeal.start(a);
+            console.log('animationIdle', e.name)
+        } 
         e.currentIdleAnimation = a
         
         //console.log('animationIdle', i, 'use',  e.idleAnimation.indexOf(a))
@@ -530,15 +534,15 @@ const disTpCameras = [
     //站到黄色展板上了
     {
         items: [[13,0]],   
-         dis:3.4, gap: 0.55, y: 0.1
+         dis:3.4, gap: 0.6, y: 0.1
     },
     {
         items: [[14,0],[15,0],[16,0],[18,0]],   
-         dis:3.4, gap: 0.55, y: -0.6
+         dis:3.4, gap: 0.6, y: -0.6
     },
     {
         items: [[19,0],[20,0],[21,0]],   
-         dis:5, gap: 0.55 , y: -0.6
+         dis:5, gap: 1.2 , y: -0.6
     },
     {
         items: [[23,0],[24,0] ],   
@@ -21280,8 +21284,8 @@ window.Modernizr = function(n, e, t) {
                     this.player.smoothZoomFovTo(null, this.warpDestHeroLoc.zoom , e)
                 
                 return u > c.warp.minRotation ? p.start(C, e, t, 0, d[c.warp.movementEasing]) : 
-                (y.info("Aim angle only is " + u.toPrecision(3) + " degrees, skipping explicit re-aim")
-                ,void (t && t())
+                 (/*y.info("Aim angle only is " + u.toPrecision(3) + " degrees, skipping explicit re-aim") 
+                ,*/void (t && t())
                 )
                 
             }
@@ -24554,9 +24558,9 @@ window.Modernizr = function(n, e, t) {
                 }else{
                     rotTime = currentLocation.rotTime * 1000
                     Log("rotTime "+rotTime +" at item "+this.director.currentItem,"#E8E") 
-                } 
+                }  
                  
-                /* rotTime = 600  */
+                //rotTime = 600  
                  
                  
                 startIdle();  
@@ -24719,7 +24723,7 @@ window.Modernizr = function(n, e, t) {
             n.prototype.smoothZoomFovTo = function (fov, zoomLevel, dur, callback) {//add
                 y.cancelById(window.fovTranId)
                 
-                console.log("smoothZoomFovTo "+zoomLevel)
+                //console.log("smoothZoomFovTo "+zoomLevel)
                 var i,
                     n = this.zoomLevel,
                     aimLevel = zoomLevel || this.baseFov / fov