Merge branch 'gugong1.0' of http://192.168.0.115:3000/xingjinxing/ggbwy_onlineTour into gugong1.0

scene/public/static/js/main_2020_show.js

@@ -22331,6 +22331,7 @@ window.Modernizr = function(n, e, t) {
                 r = r || $.Deferred(),
                 this.currentPano = e;
                 window.bus.dispatchEvent({type:'playerAndModelReady'})
+                window.dispatchEvent(new CustomEvent('playerAndModelReady', { detail: this }));
                 this.ready = true               
                 var o = e && !e.isAligned();
                 if (t = o ? e.position : t || e.position,
@@ -23826,6 +23827,7 @@ window.Modernizr = function(n, e, t) {
                     this.transitionPos({type:"beforeFlyOut",  dur:I/2})//add                       
                 }
                 window.bus.dispatchEvent({type:'playerAndModelReady'}) 
+                window.dispatchEvent(new CustomEvent('playerAndModelReady', { detail: this }));
                 this.ready = true
                 //------------------------------------
                 

scene/src/views/gui/menu.vue

@@ -152,7 +152,7 @@
     </transition>
     <div class="kanzhan-btns">
       <transition name="preScene">
-        <div v-show="openType == 'immersive'" class="button-item">
+        <div v-show="openType == 'immersive'" @click="player.guide2.go('prev')" class="button-item">
           <img class="normal" :src="require('@/assets/image/icon/new-icon/icon_pre.png')" alt="" />
         </div>
       </transition>
@@ -161,7 +161,7 @@
           <img class="normal" :src="require('@/assets/image/icon/new-icon/icon_mod_active.png')" alt="" />
         </div>
       </transition>
-      <transition name="nextScene">
+      <transition name="nextScene"  @click="player.guide2.go('next')" >
         <div v-show="openType == 'immersive'" class="button-item">
           <img class="normal" :src="require('@/assets/image/icon/new-icon/icon_next.png')" alt="" />
         </div>
@@ -195,7 +195,7 @@ export default {
     return {
       miniMapStatus: true,
       isRoute: true,
-
+      mode: "panorama",
       tourList: [],
       openType: null,
       isGuide: true,
@@ -259,6 +259,17 @@ export default {
       });
     });
 
+    let initListener = () => {
+      // setTimeout(() => {
+      //   console.error(window.bus)
+      // }, 100);
+      window.addEventListener("playerAndModelReady", () => {
+        player.on("flying.ended", () => {
+          this.mode = player.mode;
+        });
+      });
+    };
+    initListener();
     // this.tourList = window.player ? player?.model?.heroLocations : [];
   },
   methods: {
@@ -283,6 +294,16 @@ export default {
       }
 
       switch (item.type) {
+        case "model":
+          if (player.mode == "dollhouse") {
+            player.FlyToMode("panorama");
+            this.mode = "panorama";
+          } else if (player.mode == "panorama") {
+            player.FlyToMode("dollhouse");
+            this.mode = "dollhouse";
+          }
+
+          break;
         case "map":
           break;
         case "tour":
@@ -292,6 +313,8 @@ export default {
           break;
         case "route":
           this.isRoute = !this.isRoute;
+          console.error(this.isRoute);
+          player.emit("changeArrowShow", this.isRoute);
           break;
         case "fullScreen":
           this.onFullScreen();
@@ -301,7 +324,9 @@ export default {
     getActive(item) {
       switch (item) {
         case "model":
-          // return "active";
+          if (this.mode == "dollhouse") {
+            return "active";
+          }
           break;
 
         case "map":