From 0a618fea1e065c230591c2e44241691bf768b3cb Mon Sep 17 00:00:00 2001 From: yzx Date: Wed, 26 Jun 2024 17:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scenes/现场 _Test.unity | 4 ++++ .../StreamingAssets/DataConfig/SceneStepData.json | 8 ++------ .../Assets/concentrator.cs | 10 ++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity index 50e54c2f..699e13f6 100644 --- a/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity +++ b/SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity @@ -11397,6 +11397,10 @@ PrefabInstance: propertyPath: m_Name value: "JZQ_\u87BA\u4E1D002" objectReference: {fileID: 0} + - target: {fileID: 7661808200932631899, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} + propertyPath: m_Size.x + value: 0.11 + objectReference: {fileID: 0} - target: {fileID: 7661808200932631899, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3} propertyPath: m_Enabled value: 0 diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json index 25a1871d..79922fa0 100644 --- a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json +++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json @@ -192,7 +192,7 @@ "JZQ_螺丝004", "JZQ_螺丝0044", "JZQ_螺丝006", - "JZQ_螺丝007" + "JZQ_螺丝005" ] } ] @@ -250,14 +250,10 @@ "isSequential": false, "targetObjects": [ "JZQ_螺丝001", - "JZQ_螺丝0011", "JZQ_螺丝002", - "JZQ_螺丝0022", "JZQ_螺丝003", - "JZQ_螺丝0033", "JZQ_螺丝004", - "JZQ_螺丝0044", - "JZQ_螺丝005", + "JZQ_螺丝007", "JZQ_螺丝006" ] } diff --git a/SXElectricityInformationAcquisition/Assets/concentrator.cs b/SXElectricityInformationAcquisition/Assets/concentrator.cs index 73ceaaee..d4a5aa26 100644 --- a/SXElectricityInformationAcquisition/Assets/concentrator.cs +++ b/SXElectricityInformationAcquisition/Assets/concentrator.cs @@ -134,6 +134,16 @@ public class concentrator : MonoBehaviour MotionEngine.GetModule().HandleClick(hit.collider.gameObject.name); // Debug.Log("˿ʾ"); } + + if (hit.collider.gameObject.name == "JZQ_˿007s") + { + MotionEngine.GetModule().HandleClick(hit.collider.gameObject.name); + } + + + + + //if (hit.collider.gameObject.name == "pCylinder170") //{ // if (isplaying)