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

js/edit.js

@@ -72,7 +72,7 @@ EditTools.prototype.active = function () {
             panoVisiSet.finishSetPanoVisible()
             break;
         case "screen": 
-            confirmSnap.addClass("hide");
+            confirmSnap.addClass("hide").removeClass("unable");
             snapshotGui.hide();
             break;
         case "overlay":
@@ -102,6 +102,7 @@ EditTools.prototype.active = function () {
             confirmSnap.removeClass("hide");
             $('#camera-start').text("点此设置为初始画面")  
             snapshotGui.show();
+            if(player.modeTran.split("-")[1] != "panorama")$(".confirmSnap").addClass("unable")
             break;
         case "overlay":
             EditOverlay.enter()

js/main_2020_edit.js

@@ -6976,7 +6976,7 @@ function o(a, s, l) {
                     /Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent) ? n(e.bottom, e.top) : n(t.bottom, t.top);
                     (window.MP_PREFETCHED_MODELDATA.model.special || "true" === window.MP_PREFETCHED_MODELDATA.special) && window.specialScene && specialScene.special().afterImplement()
                 }(),
-                window.EditTools && new EditTools(n.sceneRenderer)
+                window.EditTools && (window.editTool = new EditTools(n.sceneRenderer))
             }
             ,
             Le.exports.onProgress = function(e) {
@@ -21579,7 +21579,10 @@ function o(a, s, l) {
                 if(this.mode == "floorplan" && window.panoVisiSet && panoVisiSet.setPanoVisible){
                     panoVisiSet.finishSetPanoVisible()
                 }
-                
+                if(editTool.atPanel == "screen"){
+                    if(this.mode == "panorama") $(".confirmSnap").addClass("unable")
+                    else if(i == "panorama") $(".confirmSnap").removeClass("unable")
+                }
                 
                 if (i === V.PANORAMA)
                     this.emit(W.PanoChosen, n, n),