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

web/public/static/js/main_2020_show.js

@@ -32,7 +32,7 @@ var changeBGM = function(id){
     let areaArr = Object.keys(areaInfo)
     let flagnext = true
 
-    let danTime = 3000 //毫秒
+    let danTime = 2000 //毫秒
     areaArr.forEach(function (i){
         if(flagnext && areaInfo[i]){
             for(let j in areaInfo[i]){
@@ -52,7 +52,7 @@ var changeBGM = function(id){
                                     $(g_bgAudio).animate({volume: 0.3}, danTime);
                                     // manage.switchBgmState(true)
                                 }
-                            }, danTime+200);
+                            }, danTime+100);
                         }
                         else{
                             g_bgAudio.src =  areaAudio[i];
@@ -22487,8 +22487,7 @@ window.Modernizr = function(n, e, t) {
                 this.emit(w.PanoChosen, this.currentPano, this.currentPano),
                 this.switchCameraMode(this.mode, i),
                 this.emit(w.StartInside, o),
-                r.resolve(!0),
-                r
+                r.resolve(!0)
             }
             ,
             n.prototype.startInsideWithFlyin = function(e, t, i, n, r) { 
@@ -23245,6 +23244,8 @@ window.Modernizr = function(n, e, t) {
                 } 
             },
             n.prototype.flyToPano = function(e, t) {
+                console.log(e.pano.id)
+
                 var i = e.pano
                   , n = e.lookAtPoint
                   , o = e.duration
@@ -28250,7 +28251,7 @@ window.Modernizr = function(n, e, t) {
             //if(settings.mobileNavHigh)return r.HIGH  //改
             //else return this.useHighResolutionPanos ? a.isMobile() ? r.STANDARD : $("#player").height() < this.highQualityThreshold ? r.STANDARD : r.HIGH : r.STANDARD
             //cause配置不高 卡顿
-            if(window.fps && window.fps.aveFps>52){
+            if(window.fps && window.fps.aveFps>48){
                 return r.HIGH
             } 
             else return r.STANDARD

web/public/static/js/myShow.js

@@ -126,7 +126,6 @@ var areaInfo = {
   '9e5e83f99f27490481f62d43d9f151cd',
   '387e65de6eb7449790ef737bd733dbe1',
   '02f830b3b32e4270b7b91bf83ef7173d',
-  '941262daeac049e0aa3519e4f29353fb',
   '4a36fb91f52a4d438672d7a916425d41',
   'e3f8efe1a1eb423ab577f1911740878d'],//第二章
   4:['4e3c9d0c550f481b86477013820a7f49',
@@ -230,6 +229,7 @@ var areaInfo = {
   '61c9a86dba7d42c3b677c4dc9fee9d89',
   '3ca709bd84444690970e9d77de854aec',
   'd693b73a3269404681fa9c073d678c63',
+  '941262daeac049e0aa3519e4f29353fb',
   'fa502ac24a4c4aa3a467d55f1117faeb'] //抗美援朝
 }
 

web/src/components/welcome/index.vue

@@ -8,6 +8,7 @@
 
     <video ref="welcome" >
       <source :src="require('@/assets/video/welcome.mp4')" type="video/mp4">
+      <source :src="require('@/assets/video/welcome.webm')" type="video/webm">
     </video> 
 
     <span v-if="isVideo" class="btn jump" @click="$bus.$emit('toggleWelcome', false)">跳过</span>

web/src/pages/Home.vue

@@ -234,7 +234,7 @@ export default {
           this.showTips = true
           setTimeout(() => {
             this.showTips = false
-          }, 7000); 
+          }, 5000); 
         });
     })
     

web/src/views/gui/newguide.vue

@@ -142,6 +142,7 @@ export default {
       this.swiper[type]()
     },
     gotoLight(item){
+      console.log(item.toIdx);
       player.director.goToHighlight([item.toIdx,0])
     },
     hoverHandle(item,i){