update

web/public/static/js/main_2020_show.js

@@ -4797,8 +4797,8 @@ window.Modernizr = function(n, e, t) {
                     if(audioSrc1 == audioSrc2){//应该是继续播放该folder 
                         if(this.destinationItem[1] == 0){//从头开始播放 因为可能暂停后然后再点该缩略图播
                             SoundManager.play('tour',null,0)  // currentTime = 0; 
-                        }else if( audioObj.audio.paused && audioObj.audio.currentTime < audioObj.audio.duration   ){//未播完
-                            SoundManager.play('tour')//继续播。为什么会有暂停的情况？如果手动切换到bgm了呢？
+                        }else if( audioObj.audio.paused && (audioObj.audio.currentTime < audioObj.audio.duration)  ){//未播完
+                            SoundManager.play('tour',null,audioObj.audio.currentTime)//继续播。为什么会有暂停的情况？如果手动切换到bgm了呢？
                         } 
                         
                     }else{//很可能是该folder的起始

web/public/static/js/main_2020_show0429.js

@@ -4534,9 +4534,9 @@ window.Modernizr = function(n, e, t) {
                 this.updateModel(),
                 this.resetAll(),
                 this.bindEvents()
-                
+
                 // 周恩光 查询pano对应的导览片段
-                if(!this.panoIdMap) {
+             if(!this.panoIdMap) {
                     this.panoIdMap = new Map()
                     this.model.heroLocations.forEach( (value, index) => {
                         // value.heroLocations.forEach( hl => {
@@ -4916,7 +4916,7 @@ window.Modernizr = function(n, e, t) {
             }
             ,
             n.prototype.playTour = function() {
-                if (!this.bounceable()) {
+                  if (!this.bounceable()) {
 
                     if(!this.currentItem) this.currentItem = []
                     if((this.currentItem[0] != 0 || this.destinationItem[0]!= this.nItems-1) && this.player.hasMoved){
@@ -4957,8 +4957,7 @@ window.Modernizr = function(n, e, t) {
                     this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
                     this.goToDestination()) : this.goNext()))
                 }
-            }
-			,
+            },
 			/* n.prototype.bgmReplay = function() {//xzw add  结束tour后可能要继续播放背景音乐
 			  
                 

web/public/static/js/manage.js

@@ -863,12 +863,13 @@ var SoundManager = {//暂不支持同时播放
             if(src){ 
                 this.setSrc(name, src)
             }
-            if(currentTime!=void 0){
-                object.audio.currentTime = currentTime
-            }
+            
             if(object.audio){
                 object.audio.muted = window.ISMUTED
                 object.audio.load();	// iOS 9   还需要额外的 load 一下, 否则直接 play 无效 *///https://www.cnblogs.com/interdrp/p/4211883.html   部分资料
+                if(currentTime!=void 0){
+                    object.audio.currentTime = currentTime
+                }
                 object.audio.play();
                 object.callback && object.callback(true)
             }
@@ -901,7 +902,7 @@ var SoundManager = {//暂不支持同时播放
                 while(this.playHistory.length){ 
                     var last = this.playHistory.pop();
                     if(last.src && last.canplay(last.audio)){
-                        this.play(last.name )
+                        this.play(last.name)
                     }
                     
                 }

web/src/components/exhibition/index.vue

@@ -197,7 +197,6 @@ export default {
   .xinjiang03 {
     background-image: url('~@/assets/images/data/xinjiang03.jpg') ;
     > svg {
-      transform: translate(0) scale(1.2);
       > g {
         transform: scale(1) translate(80px, 190px);
       }

web/src/views/scene/scene.vue

@@ -82,7 +82,8 @@
     <vpopup @close="handlepopClose" :cp="cp" v-if="cp" />
 
     <div class="jieshuo" :class="{jieshuoActive:istran,middlepos:isStartScene,jieshuospk:isSpeak}" v-show="isjieshuo">
-      <img :src="require(`@/assets/images/jieshuo/${isSpeak?'junren_speaking':'junren_standlook'}.png`)" alt="">
+      <img v-show="isSpeak" :src="require(`@/assets/images/jieshuo/junren_speaking.png`)" alt="">
+      <img v-show="!isSpeak" :src="require(`@/assets/images/jieshuo/junren_standlook.png`)" alt="">
     </div>
     <div class="jieshuomask" v-if="!istran&&isStartScene"></div>
   </div>
@@ -407,13 +408,14 @@ export default {
     left: 0;
     height: 100%;
     position: absolute;
-    animation: jieshuo 2.4s steps(53) infinite;
+    animation: jieshuo 4.4s steps(53) infinite;
   }
 }
 
 .jieshuospk{
   >img{
-    animation: jieshuo 5.4s steps(53) infinite;
+    width: @full * @scale * 2;
+    animation: jieshuo2 8.4s steps(106) infinite;
   }
 }
 .middlepos{
@@ -433,6 +435,13 @@ export default {
   }
 }
 
+
+@keyframes jieshuo2 {
+  100% {
+    left: -@full * 2 * @scale;
+  }
+}
+
 @keyframes trantobr {
   0% {
     bottom: calc(50% - 200px);