diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs index 74812f2..94a87fd 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs @@ -56,7 +56,7 @@ public class Device_Switch : Device_Base public void CloseState() { isOpen = false; - transform.localEulerAngles = new Vector3(45, 0, 0); + transform.localEulerAngles = new Vector3(0, 45, 0); } diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs index 6a40b32..16fa77a 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs @@ -65,4 +65,24 @@ public class Device_CabinetDoor : Device_Base } } + /// + /// Ŵ״̬ + /// + public void OpenState() + { + SiteManager.instance.measuringCabinet.cabinetDoor.isOpen = true; + SiteManager.instance.measuringCabinet.cabinetDoor.transform.localEulerAngles = new Vector3(0, 0, 180); + SiteManager.instance.measuringCabinet.cabinetDoor.transform.Find("2/3").localEulerAngles = new Vector3(-45f, 0, 0); + } + + /// + /// Źر״̬ + /// + public void CloseState() + { + isOpen = false; + transform.localEulerAngles = Vector3.zero; + transform.Find("2/3").localEulerAngles = Vector3.zero; + } + } diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs index ee2c5b0..6b06c7f 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs @@ -71,14 +71,11 @@ public class Device_MeasuringCabinet : Device_Base //ԭߵܱ meteringDevice.Init(true); //ԭ - cabinetDoor.isOpen = false; - cabinetDoor.transform.localEulerAngles = Vector3.zero; - cabinetDoor.transform.Find("2/3").localEulerAngles = Vector3.zero; + cabinetDoor.CloseState(); //ԭ //ԭ߿ - inSwitch.isOpen = true; - inSwitch.transform.localEulerAngles = new Vector3(0, 0, 0); + inSwitch.OpenState(); //ԭܱ jieXian_screws.ForEach(screw => { diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs index 16185f2..21bc3ed 100644 --- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs +++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs @@ -124,9 +124,8 @@ public class StepState_1002 : StepState //ϿԴ //ſ - SiteManager.instance.measuringCabinet.cabinetDoor.isOpen = true; - SiteManager.instance.measuringCabinet.cabinetDoor.transform.localEulerAngles = new Vector3(0,0,180); - SiteManager.instance.measuringCabinet.cabinetDoor.transform.Find("2/3").localEulerAngles =new Vector3(-45f,0,0); + SiteManager.instance.measuringCabinet.cabinetDoor.OpenState(); + //Ӳ SiteManager.instance.measuringCabinet.meteringDevice.CoverUnstallState();