Merge branches 'master' and 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

index.html

@@ -804,7 +804,7 @@
                   
                   var str = ''
                   args.forEach(a=>{
-                      str += a
+                      str += a + ' '
                   })
                   document.getElementById("consoleLog").innerHTML = str + "\n\n" + t;
                 }

js/main_2020_show.js

@@ -17109,7 +17109,7 @@ window.Modernizr = function(n, e, t) {
                         item.momentTour = info.momentTour
                         item.dontRot = info.dontRot
                         item.rotTime = info.rotTime
-                        
+                        item.musicInfo = info.musicInfo || g_data2.tourAudio[info.sid] || {}//新的music数据统一写在每个info下,如果有musicInfo则覆盖g_data2.tourAudio
                         
                         
                         container.push(item) 
@@ -17133,7 +17133,6 @@ window.Modernizr = function(n, e, t) {
                     }else{
                         var item = deal(image, locations);
                          
-                        item.musicInfo = image.musicInfo || g_data2.tourAudio[item.sid] || {}//新的music数据统一写在每个info下,如果有musicInfo则覆盖g_data2.tourAudio
                     }
                 })