From 5a91f10875caffa1cdc6f0e4de4a2b9b5b3c51cd Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Thu, 5 Sep 2024 15:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Tools/三相四线电能表.prefab | 6 ++-- Assets/Scenes/05_LiveScene.unity | 30 +++++++++++++------ .../Device_3Phase4WireMeter.cs | 2 +- .../直接接入式电能计量装置/Device_Cover.cs | 2 +- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab index e040593..8c49cee 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab @@ -6937,8 +6937,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.154481, y: 0.0841517, z: 0.25103334} - m_Center: {x: 0.000013098121, y: 0.012870543, z: -0.012511089} + m_Size: {x: 0.15143502, y: 0.08120962, z: 0.24823262} + m_Center: {x: -0.0002512671, y: 0.041110534, z: -0.013091452} --- !u!114 &4834241782207447596 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8087,7 +8087,7 @@ MeshCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 - m_Convex: 1 + m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 3704420492699352537, guid: 3022de55b8046f04485b93331386de5f, type: 3} --- !u!114 &2576541080985544080 diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index e1c924a..f4cd3f7 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -377,7 +377,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 238725083} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.0416, z: 0.009} m_LocalScale: {x: 0.15237045, y: 0.08276367, z: 0.20296991} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1665,7 +1665,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &478648693 Transform: m_ObjectHideFlags: 0 @@ -1673,14 +1673,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 478648692} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0.14690018, y: -0.17933655, z: 0.5191498} + m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} + m_LocalPosition: {x: 0.14690018, y: -0.12649536, z: 0.5191498} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 238725084} m_Father: {fileID: 543450652271447145} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!65 &478648694 BoxCollider: @@ -1693,8 +1693,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.15237045, y: 0.08276367, z: 0.20296991} - m_Center: {x: 0.0008945465, y: 0.012161255, z: 0.010730207} + m_Size: {x: 0.15237045, y: 0.083618164, z: 0.20449376} + m_Center: {x: 0, y: 0.041763306, z: 0.009041309} --- !u!114 &478648695 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6324,8 +6324,8 @@ Transform: - {fileID: 543450652554360468} - {fileID: 6919098456697261524} - {fileID: 2118256940} - - {fileID: 640886981} - {fileID: 478648693} + - {fileID: 640886981} - {fileID: 950850338} m_Father: {fileID: 0} m_RootOrder: 4 @@ -7169,6 +7169,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 543450652271447145} m_Modifications: + - target: {fileID: 3826880031792330742, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalPosition.x + value: -0.06473 + objectReference: {fileID: 0} + - target: {fileID: 3826880031792330742, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_LocalPosition.z + value: -0.10885 + objectReference: {fileID: 0} - target: {fileID: 4675619581299266311, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: m_Name value: "\u4E09\u76F8\u56DB\u7EBF\u7535\u8868" @@ -7183,7 +7191,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: m_LocalPosition.y - value: -0.17933655 + value: -0.1265 objectReference: {fileID: 0} - target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: m_LocalPosition.z @@ -7217,6 +7225,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} + - target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2921358948653541, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} - {fileID: 4834241782207447596, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs index 08335e4..c13c372 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs @@ -95,7 +95,7 @@ public class Device_3Phase4WireMeter : Device_Base { //Ӹ cover.isOpen = false; - cover.transform.localPosition = new Vector3(0.0001220703f, -0.01112366f, -0.09854126f); + cover.transform.localPosition = new Vector3(0.0001220703f, 0.04167634f, -0.09854126f); //˿š cover.cover_screw_Left.isInstall = true; cover.cover_screw_Left.transform.localPosition = new Vector3(cover.cover_screw_Left.transform.localPosition.x, -0.01405334f, -0.1012321f); diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs index d36b876..5f02214 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs @@ -191,7 +191,7 @@ public class Device_Cover : Device_Base Transform parent = cover_screw_Left.transform.parent; cover_screw_Left.transform.parent = transform; cover_screw_Right.transform.parent = transform; - transform.DOLocalMove(new Vector3(transform.localPosition.x, -0.01112366f, -0.09854126f), 2).OnComplete(() => + transform.DOLocalMove(new Vector3(transform.localPosition.x, 0.04167634f, -0.09854126f), 2).OnComplete(() => { isOpen = false; cover_screw_Left.transform.parent = parent;