Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

js/edit.js

@@ -3740,7 +3740,7 @@ EditGuide.prototype.uploadGuide = function(urlData, guide, renew, insideFolder)
                 
             }
         }
-    })
+    },'tour.jpg');
 }
 
 

js/main_2020_show.js

@@ -14614,6 +14614,7 @@ window.Modernizr = function(n, e, t) {
 							H.loadComplete(e),
 							de.warn("First render after model load finished.")
                             try {
+                                window.evt && window.dispatchEvent(window.evt);
                                 parent.postMessage({
                                     cmd: "loaded",
                                 }, "*")