From 724d5428125676034b591a5c3c0e83b15a2036d4 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Fri, 23 Aug 2024 09:50:02 +0800 Subject: [PATCH] a --- .../Prefabs/Objects/Tools/万用表.prefab | 6 +- .../Prefabs/Objects/Tools/三相四线电表.prefab | 32 +++++----- .../Devices/杂/万用表部件/Multimeter_pen.cs | 2 + .../Device_DirectAccessElectricEnergyMeteringDevice.cs | 10 ++-- .../Devices/计量柜/Device_MeasuringCabinet.cs | 59 +++++++++++++++++++ Assets/Scripts/CXX/SiteManager.cs | 53 ----------------- Assets/Scripts/CXX/Tools/Tool_Multimeter.cs | 4 +- 7 files changed, 87 insertions(+), 79 deletions(-) diff --git a/Assets/Resources/Prefabs/Objects/Tools/万用表.prefab b/Assets/Resources/Prefabs/Objects/Tools/万用表.prefab index 528b7f8..ba369ef 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/万用表.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/万用表.prefab @@ -240,7 +240,7 @@ GameObject: - component: {fileID: 4139865883083994037} - component: {fileID: 4800734424466799504} m_Layer: 0 - m_Name: "ND_\u4E07\u7528\u8868_02" + m_Name: "\u6863\u4F4D" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -528,7 +528,7 @@ GameObject: - component: {fileID: 6774997958504205085} - component: {fileID: 4316715026652588437} m_Layer: 0 - m_Name: "ND_\u4E07\u7528\u8868_04" + m_Name: "\u9ED1\u63D2\u5934" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -874,7 +874,7 @@ GameObject: - component: {fileID: 4926728448107073058} - component: {fileID: 2203297996672072483} m_Layer: 0 - m_Name: "ND_\u4E07\u7528\u8868_03" + m_Name: "\u7EA2\u63D2\u5934" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab b/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab index 5f10241..e3be4aa 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab @@ -285,7 +285,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080142119082} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541079962278358 MonoBehaviour: @@ -910,7 +910,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080266261661} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541080661371199 MonoBehaviour: @@ -1369,7 +1369,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541079990510656} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541080516725976 MonoBehaviour: @@ -1662,7 +1662,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080447090660} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541080325731228 MonoBehaviour: @@ -2376,7 +2376,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080224064224} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!1 &2537738450205131575 GameObject: @@ -3635,7 +3635,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081758559536} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541081429723931 MonoBehaviour: @@ -4382,7 +4382,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081645226417} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541080545036941 MonoBehaviour: @@ -4847,7 +4847,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080183327174} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!1 &3932947889739227106 GameObject: @@ -5765,7 +5765,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541079818901621} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!1 &4627208948562638019 GameObject: @@ -5886,7 +5886,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080163564030} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541080794005321 MonoBehaviour: @@ -6789,7 +6789,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541079818547023} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541080767639298 MonoBehaviour: @@ -7791,7 +7791,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081608891598} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541079857287480 MonoBehaviour: @@ -8167,7 +8167,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081575823058} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!114 &2576541080334431883 MonoBehaviour: @@ -9551,7 +9551,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081300379520} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.02220154 --- !u!1 &7847778419808227353 GameObject: @@ -9838,7 +9838,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541081225681401} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.02220154 --- !u!114 &2576541080563400542 MonoBehaviour: @@ -10925,7 +10925,7 @@ MonoBehaviour: id: isInstall: 1 installPos: {fileID: 2576541080299287560} - hasElectricity: 0 + hasElectricity: 1 initPostionY: 0.0256958 --- !u!1 &8963846282716106637 GameObject: diff --git a/Assets/Scripts/CXX/Devices/杂/万用表部件/Multimeter_pen.cs b/Assets/Scripts/CXX/Devices/杂/万用表部件/Multimeter_pen.cs index d3d82b0..54ee012 100644 --- a/Assets/Scripts/CXX/Devices/杂/万用表部件/Multimeter_pen.cs +++ b/Assets/Scripts/CXX/Devices/杂/万用表部件/Multimeter_pen.cs @@ -20,12 +20,14 @@ public class Multimeter_pen : MonoBehaviour, IPointerClickHandler { if(eventData.button== PointerEventData.InputButton.Left) { + //ѡ Debug.Log("ѡ"+ id+""); //ѡ isChose = true; } else if(eventData.button == PointerEventData.InputButton.Right) { + //Ҽ Debug.Log("ſ" + id + ""); //ȡѡ isChose = false; diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs index 04f2268..24650cb 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_DirectAccessElectricEnergyMeteringDevice.cs @@ -59,10 +59,10 @@ public class Device_DirectAccessElectricEnergyMeteringDevice : Device_Base cover.transform.localPosition = new Vector3(0.0001220703f, -0.1388763f, -0.2485413f); //˿š cover.cover_screw_Left.isInstall = false; - cover.cover_screw_Left.transform.localPosition = new Vector3(0.06128693f, -0.03405334f, -0.1012321f); + cover.cover_screw_Left.transform.localPosition = new Vector3(cover.cover_screw_Left.transform.localPosition.x, cover.cover_screw_Left.initPostionY-0.03f, cover.cover_screw_Left.transform.localPosition.z); //˿š cover.cover_screw_Right.isInstall = false; - cover.cover_screw_Right.transform.localPosition = new Vector3(-0.06129074f, -0.03405334f, -0.1012321f); + cover.cover_screw_Right.transform.localPosition = new Vector3(cover.cover_screw_Right.transform.localPosition.x, cover.cover_screw_Right.initPostionY-0.03f, cover.cover_screw_Right.transform.localPosition.z); //ӡ cover.cover_seal_Left.isCut = true; cover.cover_seal_Left.gameObject.SetActive(false); @@ -71,15 +71,15 @@ public class Device_DirectAccessElectricEnergyMeteringDevice : Device_Base cover.cover_seal_Right.gameObject.SetActive(false); //̶˿š fix_screw_left.isInstall = false; - fix_screw_left.transform.localPosition = new Vector3(0.06592941f, 0.03107117f, -0.1094047f); + fix_screw_left.transform.localPosition = new Vector3(fix_screw_left.transform.localPosition.x, fix_screw_left.initPostionY-0.03f, fix_screw_left.transform.localPosition.z); //ҹ̶˿š fix_screw_right.isInstall = false; - fix_screw_right.transform.localPosition = new Vector3(-0.06737137f, 0.03107117f, -0.1094047f); + fix_screw_right.transform.localPosition = new Vector3(fix_screw_right.transform.localPosition.x, fix_screw_right.initPostionY-0.03f, fix_screw_right.transform.localPosition.z); //˿ȫš jieXian_screws.ForEach(a => { a.isInstall = false; - a.transform.localPosition = new Vector3(a.transform.localPosition.x, 0.005695801f, a.transform.localPosition.z); + a.transform.localPosition = new Vector3(a.transform.localPosition.x, a.initPostionY-0.03f, a.transform.localPosition.z); }); } } diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs index 4eee857..893d027 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Unity.VisualScripting; using Unity.VisualScripting.Antlr3.Runtime; using UnityEngine; +using static UnityEngine.EventSystems.EventTrigger; /// /// @@ -30,6 +31,11 @@ public class Device_MeasuringCabinet : Device_Base /// public List jieXian_screws; + /// + /// ܱײ + /// + public BoxCollider dianCollider; + private void Awake() { //ӿлص @@ -107,4 +113,57 @@ public class Device_MeasuringCabinet : Device_Base } }); } + + private void Update() + { + //ǷԴܱIJжװ + if (meteringDevice == null) + { + dianCollider.enabled = true; + } + else + { + //̶ܱ˿ˣ߲ + if (!meteringDevice.fix_screw_left.isInstall && !meteringDevice.fix_screw_right.isInstall && jieXian_screws.TrueForAll(a => !a.isConnected)) + { + dianCollider.enabled = true; + } + else + { + dianCollider.enabled = false; + } + } + + //װܱ + if (Input.GetMouseButtonDown(0)) + { + if (Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out RaycastHit hit)) + { + if (hit.collider == dianCollider) + { + if (meteringDevice == null) + { + //װܱ + if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.GetComponent() != null) + { + meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent(); + meteringDevice.Add(); + //߹˿ + SetLineScrew(); + + //ˢ´״̬ + CheckHasElectricity(); + } + } + else + { + //µܱ + meteringDevice.Remove(); + //߹˿ + ClearLineScrew(); + } + } + } + } + } } diff --git a/Assets/Scripts/CXX/SiteManager.cs b/Assets/Scripts/CXX/SiteManager.cs index e773e8d..07aea16 100644 --- a/Assets/Scripts/CXX/SiteManager.cs +++ b/Assets/Scripts/CXX/SiteManager.cs @@ -14,61 +14,8 @@ public class SiteManager : MonoBehaviour /// /// public Device_MeasuringCabinet measuringCabinet; - /// - /// ܱײ - /// - public BoxCollider dianCollider; private void Awake() { instance = this; } - - private void Update() - { - //ʹܱܵײ - if (measuringCabinet.meteringDevice == null) - { - dianCollider.enabled = true; - } - else - { - //̶ܱ˿ˣ߲ - if (!measuringCabinet.meteringDevice.fix_screw_left.isInstall && !measuringCabinet.meteringDevice.fix_screw_right.isInstall && measuringCabinet.jieXian_screws.TrueForAll(a=>!a.isConnected)) - { - dianCollider.enabled = true; - } - else - { - dianCollider.enabled = false; - } - } - - if (Input.GetMouseButtonDown(0)) - { - if(Physics.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition),out RaycastHit hit)) - { - if(hit.collider== dianCollider) - { - if (measuringCabinet.meteringDevice==null) - { - //װܱ - if(LiveSceneManager.Instance.currentTool!=null && LiveSceneManager.Instance.currentTool.GetComponent()!=null) - { - measuringCabinet.meteringDevice = LiveSceneManager.Instance.currentTool.GetComponent(); - measuringCabinet.meteringDevice.Add(); - //߹˿ - measuringCabinet.SetLineScrew(); - } - } - else - { - //µܱ - measuringCabinet.meteringDevice.Remove(); - //߹˿ - measuringCabinet.ClearLineScrew(); - } - } - } - } - } } diff --git a/Assets/Scripts/CXX/Tools/Tool_Multimeter.cs b/Assets/Scripts/CXX/Tools/Tool_Multimeter.cs index f0dd140..d64abcf 100644 --- a/Assets/Scripts/CXX/Tools/Tool_Multimeter.cs +++ b/Assets/Scripts/CXX/Tools/Tool_Multimeter.cs @@ -17,8 +17,8 @@ public class Tool_Multimeter : Tool_Base /// λ /// public Multimeter_dangwei dangWei; - public Transform redPen; - public Transform blackPen; + public Multimeter_pen redPen; + public Multimeter_pen blackPen; /// /// лλ