瀏覽代碼

从四维看看转过来的 floor改为subgroup

xzw 2 年之前
父節點
當前提交
3991a6eb6f
共有 3 個文件被更改,包括 12 次插入10 次删除
  1. 5 7
      js/main_2020_edit.js
  2. 2 2
      js/main_2020_show.js
  3. 5 1
      js/manage.js

+ 5 - 7
js/main_2020_edit.js

@@ -12530,8 +12530,8 @@ function o(a, s, l) {
                                 x: e.puck.x,
                                 x: e.puck.x,
                                 y: e.puck.y,
                                 y: e.puck.y,
                                 z: e.puck.z
                                 z: e.puck.z
-                            },
-                            floor: e.group,
+                            }, 
+                            floor: window.sceneFrom == 'kankan' ? e.subgroup : e.group,
                             neighbours: e.visibles,
                             neighbours: e.visibles,
                             alignmentType: e.alignment_type
                             alignmentType: e.alignment_type
                         }
                         }
@@ -12542,15 +12542,13 @@ function o(a, s, l) {
                         e
                         e
                     });
                     });
                     return i.forEach(function(e) { 
                     return i.forEach(function(e) { 
-                        if(e.neighbours.find(a=>a==-1)){
+                        /* if(e.neighbours.find(a=>a==-1)){
                             console.log('%c neighbours 存在-1  ' +e.uuid ,"color:#f00")
                             console.log('%c neighbours 存在-1  ' +e.uuid ,"color:#f00")
-                        }
+                        } */
                         e.neighbours = e.neighbours.filter(e=>i[e])
                         e.neighbours = e.neighbours.filter(e=>i[e])
                         e.neighbours = e.neighbours.map(function(e) {
                         e.neighbours = e.neighbours.map(function(e) {
                             return i[e].uuid
                             return i[e].uuid
-                        })
-                        
-                        
+                        }) 
                     }),
                     }),
                     i
                     i
                 }
                 }

+ 2 - 2
js/main_2020_show.js

@@ -13166,7 +13166,7 @@ window.Modernizr = function(n, e, t) {
                                 y: e.puck.y,
                                 y: e.puck.y,
                                 z: e.puck.z
                                 z: e.puck.z
                             },
                             },
-                            floor: e.group,
+                            floor: window.sceneFrom == 'kankan' ? e.subgroup : e.group,
                             neighbours: e.visibles,
                             neighbours: e.visibles,
                             alignmentType: e.alignment_type
                             alignmentType: e.alignment_type
                         }
                         }
@@ -27104,7 +27104,7 @@ window.Modernizr = function(n, e, t) {
                 overlayStyle: r.valueFromHash("tileoverlay", 0),
                 overlayStyle: r.valueFromHash("tileoverlay", 0),
                 uploadIntervalDelay: r.valueFromHash("tileupdelay", 10),
                 uploadIntervalDelay: r.valueFromHash("tileupdelay", 10),
                 initialIntervalDelay: r.valueFromHash("itiledelay", 0),
                 initialIntervalDelay: r.valueFromHash("itiledelay", 0),
-                maxNonBaseUploadsPerFrame: r.valueFromHash("maxnbtpf", 2),
+                maxNonBaseUploadsPerFrame: r.valueFromHash("maxnbtpf", 1/* 2 */), 
                 maxBaseUploadsPerFrame: r.valueFromHash("maxbtpf", 6),
                 maxBaseUploadsPerFrame: r.valueFromHash("maxbtpf", 6),
                 customCompression: r.valueFromHash("tilecustcomp", 0),
                 customCompression: r.valueFromHash("tilecustcomp", 0),
                 // mobileHighQualityOverride: !1,
                 // mobileHighQualityOverride: !1,

+ 5 - 1
js/manage.js

@@ -17,6 +17,10 @@ var g_HotMeshSize = {
     g_HotMeshHeight:0.3
     g_HotMeshHeight:0.3
 };
 };
 
 
+
+
+
+
 //add表示添加,delete表示删除
 //add表示添加,delete表示删除
 var g_HotStatus=null;
 var g_HotStatus=null;
 var g_newHot = [];//存储新加热点
 var g_newHot = [];//存储新加热点
@@ -2000,7 +2004,7 @@ function logSth(){
     漫游点数 ${panoCount} 个)`, '#FF4399', 14)
     漫游点数 ${panoCount} 个)`, '#FF4399', 14)
 }
 }
 
 
-
+window.sceneFrom = number.slice(0,3) == 'KJ-' ? 'kankan' : '' //看看or看见转来的
 
 
 //兼容一代的場景
 //兼容一代的場景
 //請求地址統一管理
 //請求地址統一管理