From 50c3cf8998568034bb610ee918c93aee94b9f8a9 Mon Sep 17 00:00:00 2001 From: sizhongzhan <2287711279@qq.com> Date: Fri, 10 Apr 2026 10:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=B7=A5=E5=85=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=87=E6=8D=A2=E8=AE=BE=E5=A4=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Models ppp.unity | 221 +++++++++++++++++- .../Resources/DiagnosticToolsView.prefab | 2 +- .../Scripts/UIView/DiagnosticToolsView.cs | 46 +++- UserSettings/EditorUserSettings.asset | 16 +- .../Layouts/CurrentMaximizeLayout.dwlt | 74 +++--- 5 files changed, 309 insertions(+), 50 deletions(-) diff --git a/Assets/Scenes/Models ppp.unity b/Assets/Scenes/Models ppp.unity index 582a933..7a74f88 100644 --- a/Assets/Scenes/Models ppp.unity +++ b/Assets/Scenes/Models ppp.unity @@ -242,6 +242,57 @@ Transform: m_Father: {fileID: 1143766383} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &213221107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 213221109} + - component: {fileID: 213221108} + m_Layer: 0 + m_Name: "\u5E93\u5B58\u7BA1\u7406\u5668" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &213221108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 213221107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a3da4d09dff18f242b3b7d40d5721d31, type: 3} + m_Name: + m_EditorClassIdentifier: + fileName: inventory.json + onInventoryLoaded: + m_PersistentCalls: + m_Calls: [] + onInventoryUpdated: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &213221109 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 213221107} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.2514097, y: 0.6696475, z: -0.15979826} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &222722634 PrefabInstance: m_ObjectHideFlags: 0 @@ -1610,6 +1661,56 @@ Transform: m_Father: {fileID: 1143766383} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &872142258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 872142260} + - component: {fileID: 872142259} + m_Layer: 0 + m_Name: "Modbus\u63A7\u5236\u5668" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &872142259 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872142258} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21766cb5ef385fb4ea8a5e28c36c993c, type: 3} + m_Name: + m_EditorClassIdentifier: + portName: COM3 + baudRate: 9600 + deviceList: [] + enableDebug: 1 + commandInterval: 0.1 + deviceStatus: [] +--- !u!4 &872142260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872142258} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.098803386, y: 1.045672, z: 0.118324734} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &918270854 GameObject: m_ObjectHideFlags: 0 @@ -1988,7 +2089,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027018822} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1c6ea55b26539849ac893385c9f79b4, type: 3} m_Name: @@ -4388,6 +4489,50 @@ Transform: m_Father: {fileID: 519640836} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1727190917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1727190919} + - component: {fileID: 1727190918} + m_Layer: 0 + m_Name: UIUtils + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1727190918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727190917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ae149ee06340544ebab5db7719eff8f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1727190919 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727190917} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.11419064, y: 0.110360235, z: -0.06653039} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1809386692 PrefabInstance: m_ObjectHideFlags: 0 @@ -4407,6 +4552,30 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 2575405122300987958, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3} propertyPath: m_RootOrder value: 4 @@ -4528,6 +4697,54 @@ PrefabInstance: propertyPath: m_Name value: "\u529F\u7387\u5206\u6790\u4EEA" objectReference: {fileID: 0} + - target: {fileID: 374605308445035511, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalPosition.y + value: 2.31 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3} --- !u!1001 &1922206143 @@ -5627,5 +5844,5 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/UIView/DiagnosticToolsView/Resources/DiagnosticToolsView.prefab b/Assets/UIView/DiagnosticToolsView/Resources/DiagnosticToolsView.prefab index bda8562..dc2b498 100644 --- a/Assets/UIView/DiagnosticToolsView/Resources/DiagnosticToolsView.prefab +++ b/Assets/UIView/DiagnosticToolsView/Resources/DiagnosticToolsView.prefab @@ -8505,7 +8505,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5037894687301674914} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: diff --git a/Assets/Zion/Scripts/UIView/DiagnosticToolsView.cs b/Assets/Zion/Scripts/UIView/DiagnosticToolsView.cs index 236fd6c..41a5883 100644 --- a/Assets/Zion/Scripts/UIView/DiagnosticToolsView.cs +++ b/Assets/Zion/Scripts/UIView/DiagnosticToolsView.cs @@ -35,15 +35,37 @@ public class DiagnosticToolsView : UIView private float typingSpeed = 0.05f; #endregion + private List models = new List(); + private EnhancedModelViewerOrbitCamera enhancedModelViewerOrbitCamera; + protected override void OnInit(IViewData data) { base.OnInit(data); variables.Set("my_DiagnosticTools", this); lineChart = variables.Get("LineChart").GetComponent(); + ModelsInit(); BtnInit(); InitLeftBtns(); } + void ModelsInit() + { + models.Clear(); + GameObject trans = GameObject.Find("Tools"); + if (trans != null) + { + for (int i = 0; i < trans.transform.childCount; i++) + { + models.Add(trans.transform.GetChild(i).gameObject); + models[i].SetActive(false); + } + } + + models.RemoveAt(0); + models[0].Activate(); + enhancedModelViewerOrbitCamera = Camera.main.GetComponent(); + enhancedModelViewerOrbitCamera.enabled = true; + } void InitLeftBtns() { @@ -86,6 +108,25 @@ public class DiagnosticToolsView : UIView } } + for (int i = 0; i < models.Count; i++) + { + if (i == index) + { + models[i].Activate(); + + enhancedModelViewerOrbitCamera.SetTarget(models[i].transform); + + //modelSpreadController.SetTarget(models[i].transform); + } + else + { + models[i].Deactivate(); + + // 设置新按钮的选中 + //SetSelectedButton(selectedButton); + } + } + //需要把模型加进来 //HideAllObjs(); //tools[index].Activate(); @@ -155,10 +196,10 @@ public class DiagnosticToolsView : UIView variables.Get