chenzhiguang 4 years ago
parent
commit
6a18ffe068

BIN
edit-backstage/images/Volume btn_off.png


BIN
edit-backstage/images/Volume btn_on.png


+ 4 - 4
web/public/static/js/main_2020_show.js

@@ -22387,7 +22387,8 @@ window.Modernizr = function(n, e, t) {
                 
                 setTimeout(()=>{
                     this.qualityManager.updateMaximums()
-                    window.stats && (stats.dom.parentElement && stats.dom.parentElement.removeChild(stats.dom), window.stats = null)
+                    // && stats.dom.parentElement.removeChild(stats.dom), window.stats = null
+                    window.stats && (stats.dom.parentElement )
                 },6000)
                 
                 var t = e.mode
@@ -22448,8 +22449,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) { 
@@ -24563,7 +24563,7 @@ window.Modernizr = function(n, e, t) {
             e.appendChild(this.renderer.domElement)
             
             window.stats = new Stats();  
-            //e.appendChild( stats.dom );
+            e.appendChild( stats.dom );
         }
         ,
         n.prototype.overrideTextures = function() {

+ 2 - 2
web/public/static/js/myShow.js

@@ -1,7 +1,7 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-// var g_Prefix="http://192.168.1.101/";
+var g_Prefix="http://192.168.1.101/";
 // https://super.4dage.com/
-var g_Prefix=window.location.origin+'/';
+// var g_Prefix=window.location.origin+'/';
 
 var s = window.location.href.split('/');
 s.pop();

+ 8 - 21
web/src/components/mapsvg.vue

@@ -120,7 +120,7 @@
             font-weight="500"
             opacity="0.8"
           >
-            <tspan x="0" y="0">万水山</tspan>
+            <tspan x="0" y="0">万水山</tspan>
             <tspan x="0" y="10">铁心向党</tspan>
           </text>
         </g>
@@ -425,41 +425,28 @@
 <script>
 let data = {
   1:{
-    id:'20d76961641346d9885a56261bb3d83c',
-    lookat:'8aeff58bce4b4b68b58bb07d84e39df8'
+    toIdx:0,
   },
   2:{
-    id:'fa0c42b9245e4fadb2ba3d4dd212b45a',
-    lookat:'5c749805e878411cb4899e9d15073452'
+    toIdx:4,
   },
   3:{
-    id:'772de4cad34342669fc3f6bf28383bfa',
-    lookat:'e9ef309ee81b47cba82f3b4c29c35bc1'
+    toIdx:14,
   },
   4:{
-    id:'1aae98d557e54334be68a81081480f76',
-    lookat:'387e65de6eb7449790ef737bd733dbe1'
+    toIdx:20,
   },
   5:{
-    id:'b2a4c12c3be14a75aa63f66bab43649d',
-    lookat:'a6765a0f2b0d4babba659417518c1346'
+    toIdx:26,
   },
   6:{
-    id:'cac901ab8e654cce913c0941290900e5',
-    lookat:'6bd12dff135349a68d734b076b173a4d'
-  },
-  7:{
-    id:'0a1ef71ae39349bd8ca207b730c3bb01',
-    lookat:'25469284bbaa4c4f89c24235df164b93'
+    toIdx:32,
   }
 }
 export default {
   methods:{
     handleClick(item){
-      player.flyToPano({
-        pano:player.model.panos.index[data[item].id],
-        lookAtPoint:player.model.panos.index[data[item].lookat].position
-      })
+      player.director.goToHighlight([data[item].toIdx,0])
       window.stopTour()
     }
   }

+ 1 - 0
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){