提交场景修改，提交电机模型后弹窗模型缩放异常问题

Assets/Scenes/Models.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_IndirectSpecularColor: {r: 0.01860223, g: 0.05197134, b: 0.14440057, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -18253,6 +18253,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 3
       objectReference: {fileID: 0}
+    - target: {fileID: -7862391691550088030, guid: 07c4ae719ffee874291556c4300acc59, type: 3}
+      propertyPath: m_Name
+      value: "\u51B7\u5374\u5854"
+      objectReference: {fileID: 0}
     - target: {fileID: -7862391691550088030, guid: 07c4ae719ffee874291556c4300acc59, type: 3}
       propertyPath: m_Layer
       value: 3
@@ -19201,6 +19205,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1ae149ee06340544ebab5db7719eff8f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  particalObj: {fileID: 213221107}
 --- !u!4 &2143385982
 Transform:
   m_ObjectHideFlags: 0

Assets/Scenes/Models_Entrance.unity

@@ -128,6 +128,24 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7654781284437887637, guid: 8e08b301940c44847b79a0c56725e445, type: 3}
   m_PrefabInstance: {fileID: 480825563}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &57791369 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -7862391691550088030, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3}
+  m_PrefabInstance: {fileID: 222722634}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &57791373
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 57791369}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 43.733265, y: 43.936016, z: 50.6718}
+  m_Center: {x: -0.01566887, y: 0.014246939, z: -2.6157386}
 --- !u!1 &59843583
 GameObject:
   m_ObjectHideFlags: 0
@@ -392,6 +410,10 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[4]
       value: 
       objectReference: {fileID: 2100000, guid: 5751731b4de85704db1f7e0be20ad90f, type: 2}
+    - target: {fileID: -7862391691550088030, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3}
+      propertyPath: m_Name
+      value: "\u51B7\u5374\u5854"
+      objectReference: {fileID: 0}
     - target: {fileID: -7862391691550088030, guid: 5b2ebaebe78c9ed4e8ee0fcc4f7bf342, type: 3}
       propertyPath: m_Layer
       value: 3
@@ -4030,7 +4052,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1143766383
 Transform:
   m_ObjectHideFlags: 0
@@ -4830,6 +4852,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1ae149ee06340544ebab5db7719eff8f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  particalObj: {fileID: 1143766382}
 --- !u!4 &1727190919
 Transform:
   m_ObjectHideFlags: 0
@@ -6407,6 +6430,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1ae149ee06340544ebab5db7719eff8f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  particalObj: {fileID: 0}
 --- !u!4 &2143385982
 Transform:
   m_ObjectHideFlags: 0

Assets/Scripts/RawImageModelViewer.cs

@@ -125,11 +125,15 @@ public class RawImageModelViewer : MonoBehaviour
             return;
         }
 
+        //Debug.Log("初始化模型查看器>>>>>>>>>>>>>>>>>>");
+
         //displayedModel = Instantiate(modelPrefab, modelCenter, Quaternion.Euler(modelPrefab.transform.eulerAngles));
         displayedModel = Instantiate(modelPrefab, modelCenter, Quaternion.Euler(modelPrefab.transform.eulerAngles));
         //Debug.Log(modelPrefab.transform.eulerAngles);
         modelTransform = displayedModel.transform;
 
+        displayedModel.transform.localScale = modelPrefab.transform.lossyScale;
+
         MonoBehaviour[] scripts = displayedModel.GetComponentsInChildren<MonoBehaviour>();
         foreach (MonoBehaviour script in scripts)
         {

Assets/Zion/Scripts/UIView/EquipmentChildStructureView.cs

@@ -27,7 +27,10 @@ public class EquipmentChildStructureView : UIView
         equipmentParameters.Add("冷却水泵", $"​流量：常见范围1-100m³/h，选型时一般为冷却塔流量的1.1-1.2倍。\n扬程：典型范围8-20m，需克服系统阻力。\n电机功率：0.37-7.5kW。\n效率：约32%-75%。");
         equipmentParameters.Add("中央空调主机", $"制冷量：常见范围108-1732kW（约30-490RT）。\n输入功率：20.3-333kW。\n能效比(COP)：通常3.7-4.2。\n冷冻水量：18-290m³/h。\n冷却水量：22-352m³/h。");
         equipmentParameters.Add("集水器", $"管径：小型系统DN25-DN40，大型空调系统DN350-DN1500。\n工作压力：0.6-1.6MPa。\n材质：碳钢或不锈钢。\n设计流速：0.3-0.7m/s。");
+        equipmentParameters.Add("增压补水装置", $"工作压力范围：常用0.2-1.6MPa（可调）。\n补水流量：小型0.5-5m³/h，中型5-20m³/h，大型20m³/h以上。\n控制方式：压力传感器+变频器控制，或电接点压力表+接触器控制。\n水泵功率：0.37-7.5kW（单台），多台泵组备用。\n稳压罐容积：常配24L-500L。\n控制精度：压力波动通常≤±0.02MPa。");
         equipmentParameters.Add("分水器", $"管径：小型系统DN25-DN40，大型空调系统DN350-DN1500。\n工作压力：0.6-1.6MPa。\n材质：碳钢或不锈钢。\n设计流速：0.3-0.7m/s。");
+        equipmentParameters.Add("空气处理机", $"​风量范围：小型1000-10000m³/h，中型10000-50000m³/h，大型50000m³/h以上。\n机外静压：150-800Pa（标准型），高静压型可达1000Pa以上。\n冷/热量：需根据风量、温差计算，常见冷量范围10kW-1000kW以上。\n电机功率：0.75-55kW（风机段）。\n噪音：≤45-75dB(A)（取决于风量和静压）。\n过滤等级：初效G3/G4，中效F5-F8，可选配高效H10-H14。");
+        equipmentParameters.Add("配电柜", $"​额定电压：AC380V/220V，50Hz。\n额定电流：主回路63A-3200A。\n主开关类型：塑壳断路器(MCCB)或框架断路器(ACB)。\n防护等级：通常IP54（室内），IP65（室外或高防护环境）。\n柜体尺寸：宽600-1000mm，深400-800mm，高1800-2200mm。\n柜体材质：冷轧钢板喷塑，或不锈钢304。\n控制功能：可集成PLC、变频器接口、通信模块（如Modbus）及智能电表。");
         equipmentParameters.Add("风机盘管", $"风量：小型200-600m³/h，中型600-1200m³/h，大型1200-2000m³/h。\n冷量：1.5-14kW。\n机外静压：低静压型12-30Pa，高静压型30-50Pa。\n电机功率：30-200W。\n噪声：高档风速下约35-50dB(A)。");
         equipmentParameters.Add("空气处理机​", $"​风量：常见范围2000-100000m³/h。\n冷量：30-1500kW。\n机外静压：200-800Pa。\n电机功率：1.1-55kW。\n换热器排数：4-8排。\n过滤等级：初效G3/G4，可选配中效F5-F8。");
         equipmentParameters.Add("水泵", $"​电机型号：YE2-280M-4。\n功率：90。\n额定频率/HZ：50。\n额定电流/A：163。\n额定转速/min：1485。\n运行电流/A(实测数据)：92A。\n额定效率：95%。\n负载率(根据电流计算)：56%。");

ProjectSettings/EditorBuildSettings.asset

@@ -17,7 +17,7 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Scenes/Models.unity
     guid: edbdaf5b6b6d96741bb986d8a38e5494
-  - enabled: 1
+  - enabled: 0
     path: Assets/Scenes/Models_Entrance.unity
     guid: a372234e4cc77974b938660c3b83ea40
   - enabled: 1

UserSettings/EditorUserSettings.asset

@@ -27,10 +27,10 @@ EditorUserSettings:
       value: 5757065255045d5e595a5c7b16750f4444154b7a7d7d7f667e714e61b3b13139
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0655560204535c595b0c5a264975084447151a73747e22682c7a4536b7b46d6c
+      value: 0202035457065d5e590d0f75477a0844144e4b727a7e76337e2b4560e7e16068
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 0202035457065d5e590d0f75477a0844144e4b727a7e76337e2b4560e7e16068
+      value: 0655560204535c595b0c5a264975084447151a73747e22682c7a4536b7b46d6c
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 55070d50560d5e0f5c565e2147700e44414e1d737e2c27342e711e37b6e1676c

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 200}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 1073
+  controlID: 39232
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -48,9 +48,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 564
+    y: 634
     width: 906
-    height: 445
+    height: 375
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -99,22 +99,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 906
-      height: 424
-    m_Scale: {x: 0.3925926, y: 0.39259258}
-    m_Translation: {x: 453.00003, y: 212}
+      height: 354
+    m_Scale: {x: 0.32777777, y: 0.32777777}
+    m_Translation: {x: 453, y: 177}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1153.8679
+      x: -1382.0339
       y: -540
-      width: 2307.7358
+      width: 2764.0679
       height: 1080
     m_MinimalGUI: 1
-  m_defaultScale: 0.39259258
-  m_LastWindowPixelSize: {x: 906, y: 445}
+  m_defaultScale: 0.32777777
+  m_LastWindowPixelSize: {x: 906, y: 375}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 1074
+  controlID: 39233
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -163,7 +163,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 907
-    height: 491
+    height: 561
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 5}
@@ -194,7 +194,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 906
-    height: 470
+    height: 540
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -291,7 +291,7 @@ MonoBehaviour:
       containerId: overlay-container--right
       floating: 0
       collapsed: 0
-      displayed: 1
+      displayed: 0
       snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
@@ -421,7 +421,7 @@ MonoBehaviour:
       layout: 4
     m_OverlaysVisible: 1
   m_WindowGUID: 7621e59dd5b924547a56067f39f47c9a
-  m_Gizmos: 1
+  m_Gizmos: 0
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -430,9 +430,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.099999905, y: 0.09946966, z: 2.1999998}
+    m_Target: {x: -0.39298317, y: 0.5658054, z: 0.15095906}
     speed: 2
-    m_Value: {x: 0.099999905, y: 0.09946966, z: 2.1999998}
+    m_Value: {x: -0.39298317, y: 0.5658054, z: 0.15095906}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -474,18 +474,18 @@ MonoBehaviour:
         m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
-      m_Size: {x: 0, y: 0}
+      m_Size: {x: 1, y: 1}
     m_ShowGrid: 1
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+    m_Target: {x: 0.097887024, y: -0.89827824, z: 0.25586456, w: 0.3436218}
     speed: 2
-    m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+    m_Value: {x: 0.097885646, y: -0.8982656, z: 0.25586095, w: 0.34361696}
   m_Size:
-    m_Target: 0.21833599
+    m_Target: 0.51143706
     speed: 2
-    m_Value: 0.22862408
+    m_Value: 0.51143706
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -503,7 +503,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -526,9 +526,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 491
+    y: 561
     width: 907
-    height: 466
+    height: 396
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 2}
@@ -594,9 +594,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 900b0100
-      m_LastClickedID: 68496
-      m_ExpandedIDs: aaadfdff4ec2fdff4ef1fdffa221feff5851feffe865feff0c96feffd691ffff5cc1ffff30c7ffff74f20000c6f60000980a0100c60d0100
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 86b9f8ff24bff8ffb4bff8fffcc0f8ff1eedf8ff30f3f8ffcef8f8ffd2f8f8ffdc1df9ffde1df9ff64b1f9ff3cb2f9ff6ab2f9ffc0b8f9ff98c4f9ff70c5f9ff9ec5f9ffb670fbff8e71fbffbc71fbff36bffbffe6f0fbff14f1fbff0457fcff0657fcff8686fcffdab6fcff0a4cfdff0e7cfdffaaadfdff4ec2fdff4ef1fdffa221feff5851feffe865feff0c96feffd691ffff5cc1ffff30c7fffff4ffffff74f20000c6f60000980a0100c60d010056350100463d01009c660500
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -612,7 +612,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 7}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -637,7 +637,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1215
     y: 0
-    width: 275
+    width: 176
     height: 957
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -668,7 +668,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1215
     y: 73
-    width: 273
+    width: 174
     height: 936
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -686,7 +686,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scenes
+    - Assets/UIView/EquipmentChildStructureView/Resources
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
@@ -702,7 +702,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 48b40000
     m_LastClickedID: 46152
-    m_ExpandedIDs: ffffffff0000000048b400004ab400004cb400004eb4000050b4000052b4000056b4000058b400005ab400005cb400005eb4000064b4000000ca9a3b
+    m_ExpandedIDs: ffffffff0000000048b400004ab400004cb400004eb4000050b4000052b4000054b4000056b4000058b400005eb4000060b4000064b4000008b500009a5a050000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -727,10 +727,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 120}
-    m_SelectedIDs: 900b0100
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff0000000048b400004ab400004cb400004eb4000050b4000052b4000056b4000058b400005ab400005cb400005eb4000064b4000000ca9a3b
+    m_ExpandedIDs: ffffffff0000000048b400004ab400004cb400004eb4000050b4000052b4000054b4000056b4000058b400005eb4000060b4000064b4000008b500009a5a050000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -755,8 +755,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 900b0100
-    m_LastClickedInstanceID: 68496
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
@@ -801,12 +801,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1490
+    x: 1391
     y: 0
-    width: 430
+    width: 529
     height: 957
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 12}
@@ -832,9 +832,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1490
+    x: 1391
     y: 73
-    width: 429
+    width: 528
     height: 936
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas: