1

SuperTwo762/js/main_2020_show.js

@@ -74,7 +74,7 @@ var musicList = {
 var playMusic = function(pano){//根据漫游点切换bgm
     //var describe = player.director.describe();
     //manage.bgmShouldPlay
-    if( g_tourAudio.shouldPlay /* !g_tourAudio.paused */ || g_currentHot  )return;
+    if( !manage.bgmShouldPlay || g_tourAudio.shouldPlay /* !g_tourAudio.paused */ || g_currentHot  )return;
     var shouldplayMusic
     for(let i in musicList){
         if(musicList[i].find(e=>e.includes(pano.id))){
@@ -15003,8 +15003,11 @@ window.Modernizr = function(n, e, t) {
 			$('#gui-loading').fadeIn(200);
 			progressUpdate(0.1)
 			var fileName = g_version ?  'modeldata.js' : 'someData.json' ;
-            $.ajax(g_Prefix + "data/"+window.number+"/"+fileName+"?"+randomTime().getTime(),{dataType: "json"}).done( function(e){ //改
+            $.ajax(g_Prefix + /* "data/"+ */window.number+"/"+fileName+"?"+randomTime().getTime(),{dataType: "json"}).done( function(e){ //改
                 var data = matcher(e);
+                data.files.templates =  ["{{number}}/{{filename}}"]
+                
+                
 				data.files.templates[0] = g_Prefix + e.files.templates[0].replace("{{number}}",window.number);
 				data.user = {
 					"is_authenticated": false,
@@ -18560,8 +18563,7 @@ window.Modernizr = function(n, e, t) {
                 
 			n.prototype.loadhots = function() {//xzw 
                 var e = $.Deferred(); 
-                //var t = g_Prefix+"data/" + this.sid + "/data2.js" +'?'+ randomTime().getTime();
-                var t = 'https://ossxiaoan.4dage.com/cms_army_macao_data/762_en/data2.js'
+                var t = g_Prefix+/* "data/" + */ this.sid + "/data2.js" +'?'+ randomTime().getTime();
                 
 
                 return a.get(t, {
@@ -18606,10 +18608,10 @@ window.Modernizr = function(n, e, t) {
                                 this.hots[sid] = new Hot(sid, data ,this);
                                 data.infoAttribute || (data.infoAttribute = {})
                                 
-                                data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
+                                /* data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
                                 data.infoAttribute.styleImg = data.infoAttribute.styleImg.map(e=>changeURL(e))
                                 data.infoAttribute.video = data.infoAttribute.video.map(e=> {return {url:changeURL(e.url)}})
-                                 
+                                  */
                                 this.hots[sid].initStyleImg(data.infoAttribute);
                                 window.hotData[sid] = data;
                             }) 
@@ -18617,10 +18619,10 @@ window.Modernizr = function(n, e, t) {
                         this.createHotItem(window.hotData, this.hots);
                         
                         
-                        g_data2.overlays.forEach(e=>{
+                       /*  g_data2.overlays.forEach(e=>{
                             e.file = changeURL(e.file)
                         })
-                        
+                         */
                         
                         
                         g_index = w.valueFromHash("m");

SuperTwo762/js/myShow.js

@@ -1,8 +1,8 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
 // var g_Prefix="http://192.168.0.44:8110/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-var g_Prefix=window.location.origin+'/';
-
+//var g_Prefix=window.location.origin+'/';
+var g_Prefix = 'https://ossxiaoan.4dage.com/cms_army_macao_data/'
 var s = window.location.href.split('/');
 s.pop();
 //var g_Prefix = s.join('/');

SuperTwo791/js/main_2020_show.js

@@ -14486,8 +14486,10 @@ window.Modernizr = function(n, e, t) {
 			$('#gui-loading').fadeIn(200);
 			progressUpdate(0.1)
 			var fileName = g_version ?  'modeldata.js' : 'someData.json' ;
-            $.ajax(g_Prefix + "data/"+window.number+"/"+fileName+"?"+randomTime().getTime(),{dataType: "json"}).done( function(e){ //改
+            $.ajax(g_Prefix + /* "data/" +*/window.number+"/"+fileName+"?"+randomTime().getTime(),{dataType: "json"}).done( function(e){ //改
                 var data = matcher(e);
+                data.files.templates =  ["{{number}}/{{filename}}"]
+                
 				data.files.templates[0] = g_Prefix + e.files.templates[0].replace("{{number}}",window.number);
 				data.user = {
 					"is_authenticated": false,
@@ -17980,8 +17982,7 @@ window.Modernizr = function(n, e, t) {
             }
 			n.prototype.loadhots = function() {//xzw 
                 var e = $.Deferred(); 
-                //var t = g_Prefix+"data/" + this.sid + "/data2.js" +'?'+ randomTime().getTime();
-                var t = 'https://ossxiaoan.4dage.com/cms_army_macao_data/791/data2.js'
+                var t = g_Prefix+/* "data/" + */ this.sid + "/data2.js" +'?'+ randomTime().getTime();
                 
 
                 return a.get(t, {
@@ -18020,10 +18021,10 @@ window.Modernizr = function(n, e, t) {
                                 this.hots[sid] = new Hot(sid, data ,this);
                                 data.infoAttribute || (data.infoAttribute = {})
                                 
-                                data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
+                                /* data.infoAttribute.images = data.infoAttribute.images.map(e=>changeURL(e))
                                 data.infoAttribute.styleImg = data.infoAttribute.styleImg.map(e=>changeURL(e))
                                 data.infoAttribute.video = data.infoAttribute.video.map(e=> {return {url:changeURL(e.url)}})
-                                 
+                                  */
                                 this.hots[sid].initStyleImg(data.infoAttribute);
                                 window.hotData[sid] = data;
                             })  
@@ -18031,9 +18032,9 @@ window.Modernizr = function(n, e, t) {
                         this.createHotItem(window.hotData, this.hots);
                         
                         
-                        g_data2.overlays.forEach(e=>{
+                       /*  g_data2.overlays.forEach(e=>{
                             e.file = changeURL(e.file)
-                        })
+                        }) */
                         
                         
                         

SuperTwo791/js/myShow.js

@@ -2,7 +2,9 @@ var g_ProjectName=window.location.pathname.substring(window.location.pathname.in
 // var g_Prefix="http://192.168.0.44:8110/";
 // var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
-var g_Prefix=window.location.origin+'/';
+//var g_Prefix=window.location.origin+'/';
+
+var g_Prefix = 'https://ossxiaoan.4dage.com/cms_army_macao_data/'
 
 var s = window.location.href.split('/');
 s.pop();