Compare commits

..

No commits in common. "a49d45718e8d956237e76b1cace49347b0980bcc" and "ce63dea44eff00ad0c6fbceb0a1bcdf3cb9d7914" have entirely different histories.

2 changed files with 22 additions and 41 deletions

View File

@ -47,8 +47,6 @@ public class Device_3Phase4WireMeter : Device_Base
Debug.Log("电能表设置为初始状态"); Debug.Log("电能表设置为初始状态");
//盖子装上的状态 //盖子装上的状态
CoverInstallState(); CoverInstallState();
//封印安装上
CoverSealInstallState();
//接线螺丝全部拧上状态 //接线螺丝全部拧上状态
JieXianScrewInstallState(); JieXianScrewInstallState();
//铭牌 //铭牌
@ -62,8 +60,6 @@ public class Device_3Phase4WireMeter : Device_Base
Debug.Log("电能表设置为拆下状态"); Debug.Log("电能表设置为拆下状态");
//盖子拆下状态 //盖子拆下状态
CoverUnstallState(); CoverUnstallState();
//封印拆掉
CoverSealUninstallState();
//接线螺丝拧下状态 //接线螺丝拧下状态
JieXianScrewUninstallState(); JieXianScrewUninstallState();
//固定螺丝拧下状态 //固定螺丝拧下状态
@ -85,6 +81,13 @@ public class Device_3Phase4WireMeter : Device_Base
//右螺丝拧下 //右螺丝拧下
cover.cover_screw_Right.isInstall = false; 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_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);
} }
/// <summary> /// <summary>
/// 盖子装上的状态 /// 盖子装上的状态
@ -100,13 +103,6 @@ public class Device_3Phase4WireMeter : Device_Base
//右螺丝拧上 //右螺丝拧上
cover.cover_screw_Right.isInstall = true; 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); 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);
}
/// <summary>
/// 盖子封印装上
/// </summary>
public void CoverSealInstallState()
{
//左封印安装 //左封印安装
cover.cover_seal_Left.isCut = false; cover.cover_seal_Left.isCut = false;
cover.cover_seal_Left.gameObject.SetActive(true); cover.cover_seal_Left.gameObject.SetActive(true);
@ -115,18 +111,6 @@ public class Device_3Phase4WireMeter : Device_Base
cover.cover_seal_Right.gameObject.SetActive(true); cover.cover_seal_Right.gameObject.SetActive(true);
} }
/// <summary> /// <summary>
/// 封印卸载
/// </summary>
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);
}
/// <summary>
/// 接线螺丝拧上状态 /// 接线螺丝拧上状态
/// </summary> /// </summary>
public void JieXianScrewInstallState() public void JieXianScrewInstallState()

View File

@ -7,28 +7,25 @@ public class Tool_BoxSeal : Tool_Base
{ {
private void Update() private void Update()
{ {
if (Input.GetMouseButton(0)) //点击螺丝验电
Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(tmpray, out RaycastHit hit))
{ {
//点击螺丝验电 //点击的是电能表盒子螺丝
Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition); if(hit.transform.GetComponent<Tool_Screw>()!=null)
if (Physics.Raycast(tmpray, out RaycastHit hit))
{ {
//点击的是电能表盒子螺丝 Tool_Screw screw= hit.transform.GetComponent<Tool_Screw>();
if (hit.transform.GetComponent<Tool_Screw>() != null) //盖上了盖子
if(SiteManager.instance.measuringCabinet.meteringDevice!=null && !SiteManager.instance.measuringCabinet.meteringDevice.cover.isOpen)
{ {
Tool_Screw screw = hit.transform.GetComponent<Tool_Screw>(); //螺丝拧上了就安装封印
//盖上了盖子 if(screw==SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left.isInstall)
if (SiteManager.instance.measuringCabinet.meteringDevice != null && !SiteManager.instance.measuringCabinet.meteringDevice.cover.isOpen)
{ {
//螺丝拧上了就安装封印 SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install();
if (screw == SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left && SiteManager.instance.measuringCabinet.meteringDevice.fix_screw_left.isInstall) }
{ 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_Left.Install(); {
} SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.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();
}
} }
} }
} }