panoId报错 结束语完整播放

web/public/static/js/main_2020_show.js

@@ -4828,8 +4828,16 @@ window.Modernizr = function(n, e, t) {
                 this.emit("update.controls"),
                 this.tourIsPlaying)
                     return this.atEndOfTour() && !this.endlessLoop ? (this.tourInProgress = !1,
-                    this.stopTour(true),
-                    this.emit(p.TourEnd),
+                    // 周恩光 播完最后一段语音
+                    void this.awaitCompletion(function() {
+                        this.transitionStage = y.Interlude,
+                        this.player.tourInterlude(this.nextItem(this.currentItem),this.actionComplete.bind(this))
+                    }
+                    .bind(this), function(){
+                        this.currentItem = [0,0],
+                        this.stopTour(true),
+                        this.emit(p.TourEnd)
+                    }.bind(this)),
                     void (this.player.mode === c.PANORAMA && this.model.fadePanoMarkers(a.panorama.markerOpacity))) : void this.awaitCompletion(function() {
                         this.transitionStage = y.Interlude,
                         this.player.tourInterlude(this.nextItem(this.currentItem),this.actionComplete.bind(this))
@@ -4839,18 +4847,26 @@ window.Modernizr = function(n, e, t) {
             ,
             n.prototype.playTour = function() {
                 if (!this.bounceable())
-                    return this.tourIsPlaying ? void A.info("tour is already playing") : void (this.wouldInterrupt() || (this.player.emit("tour_auto", this.defaultWarpStyle),
-                    this.tourInProgress = !0,
-                    this.reachSource = "play",
-                    this.tourIsPlaying = !0,
-                    this.wasZoomEnabled = this.player.zoomEnabled,
-                    this.player.zoomEnabled = !1,
-                    this.resetSpecialTransition(),
-                    this.emit("update.controls"),
-                    this.emit(p.TourStart),
-                    this.player.enablePreRendering(),
-                    this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
-                    this.goToDestination()) : this.goNext()))
+                    return this.tourIsPlaying ? void A.info("tour is already playing") 
+                    : void (
+                        this.wouldInterrupt() || (
+                            this.player.emit("tour_auto", this.defaultWarpStyle),
+                            this.tourInProgress = !0,
+                            this.reachSource = "play",
+                            this.tourIsPlaying = !0,
+                            this.wasZoomEnabled = this.player.zoomEnabled,
+                            this.player.zoomEnabled = !1,
+                            this.resetSpecialTransition(),
+                            this.emit("update.controls"),
+                            this.emit(p.TourStart),
+                            this.player.enablePreRendering(),
+                            this.walkingSectionPaused 
+                            ? (
+                                this.clearWalkingSectionPaused(),
+                                this.goToDestination()) 
+                            : this.goNext()
+                        )
+                    )
             } 
 			,
 			/* n.prototype.bgmReplay = function() {//xzw add  结束tour后可能要继续播放背景音乐
@@ -27414,7 +27430,7 @@ window.Modernizr = function(n, e, t) {
             void 0 !== t && null !== t || (t = 0);
             for (var n = 0; n < e.length; ) {
                 var r = e[n];
-                (!i || i && i === r.tile.panoId) && r.level >= t ? (r.uploadQueued = !1,
+                (!i || i && i === r.tile && r.tile.panoId) && r.level >= t ? (r.uploadQueued = !1,
                 e.splice(n, 1)) : n++
             }
         }

webM/public/static/js/main_2020_show.js

@@ -4829,8 +4829,15 @@ window.Modernizr = function(n, e, t) {
                 this.emit("update.controls"),
                 this.tourIsPlaying)
                     return this.atEndOfTour() && !this.endlessLoop ? (this.tourInProgress = !1,
-                    this.stopTour(true),
-                    this.emit(p.TourEnd),
+                    void this.awaitCompletion(function() {
+                        this.transitionStage = y.Interlude,
+                        this.player.tourInterlude(this.nextItem(this.currentItem),this.actionComplete.bind(this))
+                    }
+                    .bind(this), function(){
+                        this.currentItem = [0,0],
+                        this.stopTour(true),
+                        this.emit(p.TourEnd)
+                    }.bind(this)),
                     void (this.player.mode === c.PANORAMA && this.model.fadePanoMarkers(a.panorama.markerOpacity))) : void this.awaitCompletion(function() {
                         this.transitionStage = y.Interlude,
                         this.player.tourInterlude(this.nextItem(this.currentItem),this.actionComplete.bind(this))
@@ -27416,7 +27423,7 @@ window.Modernizr = function(n, e, t) {
             void 0 !== t && null !== t || (t = 0);
             for (var n = 0; n < e.length; ) {
                 var r = e[n];
-                (!i || i && i === r.tile.panoId) && r.level >= t ? (r.uploadQueued = !1,
+                (!i || i && i === r.tile && r.tile.panoId) && r.level >= t ? (r.uploadQueued = !1,
                 e.splice(n, 1)) : n++
             }
         }