xzw 3 tahun lalu
induk
melakukan
8ee5d167eb
2 mengubah file dengan 6 tambahan dan 3 penghapusan
  1. 2 2
      js/Hot.js
  2. 4 1
      js/edit.js

+ 2 - 2
js/Hot.js

@@ -965,7 +965,7 @@ window.initHot = function(model){
         }
                     
         updateScale(e, t) {//自适应调节大小 
-            if(!DATA.autoAdjustHotScale || this.texType != 'shine' )return
+            if(!DATA.autoAdjustHotScale || this.texType != 'shine' || !this.plane )return
             //let renderSize = player.sceneRenderer.renderer.domElement 
             let renderSize = player.sceneRenderer.renderer.getSize()
             
@@ -1187,7 +1187,7 @@ window.initHot = function(model){
             
             
             
-            var needExamine = !this.info.cameraData && (options.examine || (!settings.dontExamHot && this.info.actionType.examine))
+            var needExamine = !fastTran && (options.examine || (!settings.dontExamHot && this.info.actionType.examine))
             if(!openHot && !needExamine)return;
             
             

+ 4 - 1
js/edit.js

@@ -345,7 +345,7 @@ EditTools.prototype.initSaveAll = function() {
                 
                 showHotListSta: $('#hotListSwitch').is(':checked'),
                 // 开启热点列表
-                //hotIconScale: DATA.hotIconScale,
+                hotIconScale: DATA.hotIconScale,
                 // 热点缩放
                 supportsVR: $('#VRSwitch input').is(':checked'),
                 // 开启VR功能
@@ -1058,6 +1058,9 @@ Hotpoint.prototype.init = function() {
         }else{
             s = c
         }
+        
+        s = Math.max(0.001, s) 
+        
         player.model.hotGroup.children.forEach(hot=>{
             if(hot.texType == 'shine'){
                 hot.info.scale.multiplyScalar(s)