WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
YangHua 2024-08-26 13:51:59 +08:00
parent 763501987f 8df378d1cd
commit addab0d363
13 changed files with 3258 additions and 2402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ArtRes/Models/Device/计量柜/空开.fbx
View File

Binary file not shown.

3098
Assets/Resources/Prefabs/Objects/空开.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Resources/Prefabs/Objects/空开.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c80ccdb516dbab94083bd57fa1650eda
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2481
Assets/Scenes/05_LiveScene.unity
View File

File diff suppressed because it is too large Load Diff

1
Assets/Scripts/CXX/Devices/Device_Base.cs
View File

@ -19,6 +19,7 @@ public class Device_Base : PermanentTriggerBase
if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnStart();
AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);
}
}

4
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs
View File

@ -30,7 +30,7 @@ public class Device_Cover : Device_Base
private void OnMouseDown()
{
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)) == 0)
{
Debug.Log("½ÓÏßÍêºÃ");
isCheckOK = true;
@ -59,7 +59,7 @@ public class Device_Cover : Device_Base
transform.DOLocalMoveY(-0.1388763f, 2);
transform.DOLocalMoveZ(-0.2485413f, 2).OnComplete(() =>
{
GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true);
int result=(triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
});
}

2
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Switch.cs
View File

@ -26,7 +26,7 @@ public class Device_Switch : Device_Base
if(isOpen)
{
isOpen = false;
transform.localEulerAngles = new Vector3(45, 0, 0);
transform.localEulerAngles = new Vector3(0, 45, 0);
}
else
{

2
Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
View File

@ -51,7 +51,7 @@ public class Device_CabinetDoor : Device_Base
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê")
return;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
if ((triggerAction==null?0: triggerAction.Invoke(triggerName, true)) == 0)
{
base.OnMDown();
if (isOpen)

9
Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
View File

@ -37,6 +37,10 @@ public class Device_MeasuringCabinet : Device_Base
/// 电能表安装完成后的杂物
/// </summary>
public Device_Sundries sundries;
/// <summary>
/// 进电开关接线螺丝
/// </summary>
public List<Tool_Screw> inSwitchScrews;
private void Awake()
{
@ -142,6 +146,11 @@ public class Device_MeasuringCabinet : Device_Base
}
}
});
//进电开关螺丝是否带电
inSwitchScrews.ForEach(a =>
{
a.hasElectricity = inSwitch.isOpen;
});
}
private void Update()

1
Assets/Scripts/CXX/Tools/Tool_Base.cs
View File

@ -23,6 +23,7 @@ public class Tool_Base : PermanentTriggerBase
if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnStart();
AddTriggerAction(GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID);
}
}
protected override void OnMEnter()

3
Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
View File

@ -55,7 +55,8 @@ public class Tool_Screwdriver : Tool_Base
Debug.Log("·âӡδ¼ô¶Ï");
return;
}
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ts.triggerName, true) == 0)
if ((triggerAction == null ? 0 : triggerAction.Invoke(ts.triggerName, true)) == 0)
{
if (ts.isInstall)
{

50
Assets/Scripts/CXX/Tools/Tool_TestPen.cs
View File

@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
/// <summary>
@ -16,34 +17,35 @@ public class Tool_TestPen : Tool_Base
private void Update()
{
if (GameManager.RunModelMgr.SceneType != E_SceneType.Site) return;
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "验电笔")
{
if (Input.GetMouseButtonDown(0))
{
//点击螺丝验电
Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(tmpray, out RaycastHit hit))
{
//插座/柜门
Device_Base db = hit.transform.GetComponent<Device_Base>();
if (db != null)
{
Test(db);
return;
}
if (GameManager.RunModelMgr!=null && GameManager.RunModelMgr.SceneType != E_SceneType.Site)
return;
//螺丝
Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
if (tb != null)
{
Test(tb);
return;
}
if (Input.GetMouseButtonDown(0))
{
//点击螺丝验电
Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(tmpray, out RaycastHit hit))
{
//插座/柜门
Device_Base db = hit.transform.GetComponent<Device_Base>();
if (db != null)
{
Test(db);
return;
}
//螺丝
Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
if (tb != null)
{
Test(tb);
return;
}
}
}
if (isFlicker)
{
time += Time.deltaTime * 3;
@ -67,7 +69,7 @@ public class Tool_TestPen : Tool_Base
/// <param name="device_base">被验电设备</param>
public void Test(Device_Base device_base)
{
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0)
if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName + device_base.triggerName, true)) == 0)
{
if (device_base.deviceType == DeviceType.计量柜_插座)
{

2
Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
View File

@ -60,7 +60,7 @@ public class Tool_WireStripper : Tool_Base
Device_Seal ds = hit.transform.GetComponent<Device_Seal>();
if (ds != null)
{
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ds.triggerName, true) == 0)
if ((triggerAction == null ? 0 : triggerAction.Invoke(ds.triggerName, true)) == 0)
{
CutOpen(ds);
}