diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs index 02f64d2..7706600 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs @@ -47,6 +47,8 @@ public class Device_3Phase4WireMeter : Device_Base Debug.Log("ܱΪʼ״̬"); //װϵ״̬ CoverInstallState(); + //ӡװ + CoverSealInstallState(); //˿ȫš״̬ JieXianScrewInstallState(); // @@ -60,6 +62,8 @@ public class Device_3Phase4WireMeter : Device_Base Debug.Log("ܱΪ״̬"); //Ӳ״̬ CoverUnstallState(); + //ӡ + CoverSealUninstallState(); //˿š״̬ JieXianScrewUninstallState(); //̶˿š״̬ @@ -81,13 +85,6 @@ public class Device_3Phase4WireMeter : Device_Base //˿š cover.cover_screw_Right.isInstall = false; 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); - //ҷӡ - cover.cover_seal_Right.isCut = true; - cover.cover_seal_Right.gameObject.SetActive(false); - } /// /// װϵ״̬ @@ -103,6 +100,13 @@ public class Device_3Phase4WireMeter : Device_Base //˿š cover.cover_screw_Right.isInstall = true; cover.cover_screw_Right.transform.localPosition = new Vector3(cover.cover_screw_Right.transform.localPosition.x, cover.cover_screw_Right.initPostionY, cover.cover_screw_Right.transform.localPosition.z); + } + + /// + /// ӷӡװ + /// + public void CoverSealInstallState() + { //ӡװ cover.cover_seal_Left.isCut = false; cover.cover_seal_Left.gameObject.SetActive(true); @@ -111,6 +115,18 @@ public class Device_3Phase4WireMeter : Device_Base cover.cover_seal_Right.gameObject.SetActive(true); } /// + /// ӡж + /// + public void CoverSealUninstallState() + { + //ӡ + cover.cover_seal_Left.isCut = true; + cover.cover_seal_Left.gameObject.SetActive(false); + //ҷӡ + cover.cover_seal_Right.isCut = true; + cover.cover_seal_Right.gameObject.SetActive(false); + } + /// /// ˿š״̬ /// public void JieXianScrewInstallState() diff --git a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs index dd19a91..65c31fa 100644 --- a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs +++ b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs @@ -7,25 +7,28 @@ public class Tool_BoxSeal : Tool_Base { private void Update() { - //˿ - Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition); - if (Physics.Raycast(tmpray, out RaycastHit hit)) + if (Input.GetMouseButton(0)) { - //ǵܱ˿ - if(hit.transform.GetComponent()!=null) + //˿ + Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition); + if (Physics.Raycast(tmpray, out RaycastHit hit)) { - Tool_Screw screw= hit.transform.GetComponent(); - //˸ - if(SiteManager.instance.measuringCabinet.meteringDevice!=null && !SiteManager.instance.measuringCabinet.meteringDevice.cover.isOpen) + //ǵܱ˿ + if (hit.transform.GetComponent() != null) { - //˿š˾Ͱװӡ - if(screw==SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left.isInstall) + Tool_Screw screw = hit.transform.GetComponent(); + //˸ + if (SiteManager.instance.measuringCabinet.meteringDevice != null && !SiteManager.instance.measuringCabinet.meteringDevice.cover.isOpen) { - SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install(); - } - else if(screw == SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_right && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_right.isInstall) - { - SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install(); + //˿š˾Ͱװӡ + if (screw == SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left.isInstall) + { + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install(); + } + else if (screw == SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_right && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_right.isInstall) + { + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install(); + } } } }