Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/WuZhongBWG into master

web/public/static/js/main_2020_show.js

@@ -4137,6 +4137,7 @@ window.Modernizr = function(n, e, t) {
                     case c.LEFT:
                         this.startRotationFrom(e.clientX, e.clientY)
                     }
+                    SoundManager.pause('tour') // 周恩光 点击场景时停止语音
                     this.emit(u.InputStart, "mouse")
                 }
             }
@@ -4854,13 +4855,13 @@ window.Modernizr = function(n, e, t) {
 			} */
 			 
             n.prototype.stopTour = function(isAutoStop) {//停止导览        isAutoStop 希望仅在飞完结束自动停止时的stopTour不停止tourSound, 这样才能完整播放tourSound.  不过似乎会在倒数第二个片段点击按钮停止导览时也视作自动结束的（执行this.interrupt() ）。
+                SoundManager.pause('tour'), // 周恩光 自动导览暂停时同时停止语音
                 this.isInterrupted() || this.transitionStage === y.Moving && this.checkAndHandleWalkingtourInterruption(this.nextWarpStyle) || (this.tourIsPlaying && (this.player.zoomEnabled = this.wasZoomEnabled),
                 this.tourIsPlaying = !1, 
                 this.interrupt(),
                 this.clearWalkingSectionPaused(),
                 this.resetSpecialTransition(),
                 this.emit("update.controls"))
-                
             }
             ,
             n.prototype.endTourProgress = function() {
@@ -8852,9 +8853,10 @@ window.Modernizr = function(n, e, t) {
             }, p.tourInteraction.allowNextClick))
         }
         function a() {
-            C.tourInProgress && (C.stopTour(),
-            C.endTourProgress(),
-            E.classList.remove("playing"))
+            // 周恩光 在自动导览时拖动导览片段触发，会暂停自动导览
+            // C.tourInProgress && (C.stopTour(),
+            // C.endTourProgress(),
+            // E.classList.remove("playing"))
         }
         function s() {
             T.is(":visible") ? r() : o()

webM/public/static/js/main_2020_show.js

@@ -4862,6 +4862,7 @@ window.Modernizr = function(n, e, t) {
 			} */
 			 
             n.prototype.stopTour = function(isAutoStop) {//停止导览        isAutoStop 希望仅在飞完结束自动停止时的stopTour不停止tourSound, 这样才能完整播放tourSound.  不过似乎会在倒数第二个片段点击按钮停止导览时也视作自动结束的（执行this.interrupt() ）。
+                SoundManager.pause('tour'),
                 this.isInterrupted() || this.transitionStage === y.Moving && this.checkAndHandleWalkingtourInterruption(this.nextWarpStyle) || (this.tourIsPlaying && (this.player.zoomEnabled = this.wasZoomEnabled),
                 this.tourIsPlaying = !1, 
                 this.interrupt(),
@@ -8860,9 +8861,9 @@ window.Modernizr = function(n, e, t) {
             }, p.tourInteraction.allowNextClick))
         }
         function a() {
-            C.tourInProgress && (C.stopTour(),
-            C.endTourProgress(),
-            E.classList.remove("playing"))
+            // C.tourInProgress && (C.stopTour(),
+            // C.endTourProgress(),
+            // E.classList.remove("playing"))
         }
         function s() {
             T.is(":visible") ? r() : o()