xzw 5 سال پیش
والد
کامیت
5095440e76
4فایلهای تغییر یافته به همراه19 افزوده شده و 13 حذف شده
  1. 1 1
      css/lzb.css
  2. 7 7
      js/edit.js
  3. 6 3
      js/main_2020_edit.js
  4. 5 2
      js/main_2020_show.js

+ 1 - 1
css/lzb.css

@@ -683,7 +683,7 @@ ul.MenuOptions li.chosen {
     border-radius: 3px;
     transition: opacity 0.3s;
     background-size: cover;
-    background-position-y: bottom;
+    background-position: 50% 50%;
 }
 
 .hotListSwitch {

+ 7 - 7
js/edit.js

@@ -282,7 +282,7 @@ SceneInformation.prototype.init = function (data, data2) {
   if (data.momentTour === 'black') {
     momentTour.prop('checked', true);
   }
-  if (data.showHotListSta && data.showHotListSta != "false") {
+  if (data.showHotListSta) {
     hotListSwitch.prop('checked', true);
   }
   if (data.hotIconScale && parseFloat(data.hotIconScale) <= 1.5 && parseFloat(data.hotIconScale) >= 0.3) {
@@ -300,22 +300,22 @@ SceneInformation.prototype.init = function (data, data2) {
   }
 
   // 热点图片放大
-  if (data.hotImageScale && data.hotImageScale != "false") {
+  if (data.hotImageScale) {
     $hotImageScale[0].checked = true
   }
 
   // 隐藏地面标记
-  if (data.hideFloorMarker && data.hideFloorMarker != "false") {
+  if (data.hideFloorMarker) {
     $hideFloorMarker[0].checked = true
   }
 
   // 隐藏鼠标标记 
-  if (data.hideMouseMarker && data.hideMouseMarker != "false") {
+  if (data.hideMouseMarker) {
     $hideMouseMarker[0].checked = true
   }
 
   //特殊大场景
-  if (data.special === "true" || data.special) {
+  if (data.special) {
     $g_specialScene[0].checked = true
   }
 
@@ -393,8 +393,8 @@ function getSeft(seft) {
     } 
 
     var ev = document.createEvent("MouseEvent");//点击截取视图
-    g_snapShotWidth = 240;
-    g_snapShotHeight = 118;
+    g_snapShotWidth = 240*4;
+    g_snapShotHeight = 118*4;
     window.screenSta = 'startScreen';
     ev.initMouseEvent("snapshotBegin", true, true, document.defaultView, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
     

+ 6 - 3
js/main_2020_edit.js

@@ -13734,7 +13734,9 @@ function o(a, s, l) {
                 
                 t.model.summary = t.summary
                 t.model.name = t.name
-                
+                for(let i in t){
+                    t[i] == "false" && (t[i] = false)
+                }
                 
                 re(.7),
                 function() {
@@ -16731,6 +16733,7 @@ function o(a, s, l) {
                         for (var t in e.hots){
                             this.hotsCount++,
                             this.hots[t] = new M(t,e.hots[t],this);
+                            e.hots[t].infoAttribute || (e.hots[t].infoAttribute = {})
                             this.hots[t].initStyleImg(e.hots[t].infoAttribute);
                         }
                         window.hotData = e.hots
@@ -20074,8 +20077,8 @@ function o(a, s, l) {
                   , n = ",{\r\t" + i
                   , r = arguments[0];
                 this.screenShot({
-                    width: 4 * g_snapShotWidth,
-                    height: 4 * g_snapShotHeight,
+                    width: g_snapShotWidth,
+                    height: g_snapShotHeight,
                     type: "image/jpeg",
                     f: function(e) {
                         if (r && r.__callback)

+ 5 - 2
js/main_2020_show.js

@@ -14228,11 +14228,13 @@ window.Modernizr = function(n, e, t) {
                     }
                     
                 }catch(e){console.log(e) }
-                 
+                     
 				window.MP_PREFETCHED_MODELDATA = data; 
                 data.model.summary = data.summary
                 data.model.name = data.name
-                
+                for(let i in data){
+                    data[i] == "false" && (data[i] = false)
+                }
                 
 				progressUpdate(0.7);
 				StartLoad(); //xzw  someData.js是我整合的 原本在html里 但这样每个场景的html都不一样了
@@ -17476,6 +17478,7 @@ window.Modernizr = function(n, e, t) {
                         for(var i in t.hots){
                             this.hotsCount ++;
                             this.hots[i] = new Hot(i, t.hots[i], this);  
+                            t.hots[i].infoAttribute || (t.hots[i].infoAttribute = {})
                             this.hots[i].initStyleImg(t.hots[i].infoAttribute);
                         };
                         window.hotData = t.hots