Compare commits

...

2 Commits

Author SHA1 Message Date
YangHua f4a9c04e0a 添加所有流程 2024-08-26 21:50:05 +08:00
YangHua abe6d99b8d 修改流程 2024-08-26 20:37:56 +08:00
11 changed files with 62 additions and 236 deletions

Binary file not shown.

View File

@ -279,7 +279,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "\u96F6_\u5730_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:
@ -904,7 +904,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "C_in_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:
@ -1363,7 +1363,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "C_out_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:
@ -1656,7 +1656,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "A_in_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -2370,7 +2370,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "B_out_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -2662,8 +2662,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b817d2af1a955fc40bcde4e10b3d3db4, type: 3}
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerID: 5023
triggerName: "\u7535\u80FD\u8868\u5C01\u53701"
_highlight: {fileID: 0}
deviceType: 8
isCut: 0
@ -3629,7 +3629,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "B_out_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:
@ -4083,7 +4083,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "\u7535\u80FD\u8868\u62C6\u88C5\u87BA\u4E1D2"
_highlight: {fileID: 0}
toolType: 11
id:
@ -4376,7 +4376,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "A_out_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:
@ -4841,7 +4841,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "B_in_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -5210,8 +5210,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3}
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerID: 5025
triggerName: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1"
_highlight: {fileID: 0}
toolType: 11
id:
@ -5759,7 +5759,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "\u96F6_\u5730_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -5880,7 +5880,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "C_in_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -6632,7 +6632,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "\u7535\u80FD\u8868\u94ED\u724C"
_highlight: {fileID: 0}
deviceType: 6
isChecked: 0
@ -6783,7 +6783,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "B_in_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:
@ -7393,7 +7393,7 @@ GameObject:
- component: {fileID: 2576541080985544080}
- component: {fileID: 2576541080985544078}
m_Layer: 0
m_Name: "\u58F3"
m_Name: "\u7535\u80FD\u8868\u76D6\u5B50"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -7662,8 +7662,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6c33992bdd7946a45a5c38ce1a776e9b, type: 3}
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerID: 5024
triggerName: "\u7535\u80FD\u8868\u76D6\u5B50"
_highlight: {fileID: 0}
deviceType: 7
isOpen: 0
@ -7785,7 +7785,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "C_out_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -8161,7 +8161,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "A_out_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -8875,8 +8875,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3}
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerID: 5025
triggerName: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2"
_highlight: {fileID: 0}
toolType: 11
id:
@ -9252,7 +9252,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "\u7535\u80FD\u8868\u62C6\u88C5\u87BA\u4E1D1"
_highlight: {fileID: 0}
toolType: 11
id:
@ -9545,7 +9545,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "\u96F6_out_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:
@ -9832,7 +9832,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "\u96F6_out_\u87BA\u4E1Ddown"
_highlight: {fileID: 0}
toolType: 11
id:
@ -10545,8 +10545,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b817d2af1a955fc40bcde4e10b3d3db4, type: 3}
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerID: 5023
triggerName: "\u7535\u80FD\u8868\u5C01\u53702"
_highlight: {fileID: 0}
deviceType: 8
isCut: 0
@ -10919,7 +10919,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
triggerName: "A_in_\u87BA\u4E1Dup"
_highlight: {fileID: 0}
toolType: 11
id:

View File

Before

Width:  |  Height:  |  Size: 87 KiB

After

Width:  |  Height:  |  Size: 87 KiB

View File

@ -3438,7 +3438,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1180096483
Transform:
m_ObjectHideFlags: 0
@ -5841,198 +5841,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 543450652271447145}
m_Modifications:
- target: {fileID: 2576541079831587447, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerID
value: 5023
objectReference: {fileID: 0}
- target: {fileID: 2576541079831587447, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u5C01\u53701"
objectReference: {fileID: 0}
- target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerID
value: 5023
objectReference: {fileID: 0}
- target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u5C01\u53702"
objectReference: {fileID: 0}
- target: {fileID: 2576541079921355268, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u94ED\u724C"
objectReference: {fileID: 0}
- target: {fileID: 2576541079950677451, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u62C6\u88C5\u87BA\u4E1D1"
objectReference: {fileID: 0}
- target: {fileID: 2576541080106509928, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "C_in_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541080106509928, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080121702409, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "B_out_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541080121702409, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080135006610, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u96F6_\u5730_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541080135006610, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080207224026, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: id
value:
objectReference: {fileID: 0}
- target: {fileID: 2576541080207224026, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "C_out_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541080207224026, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080325731230, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "A_in_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541080325731230, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080334431885, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "A_out_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541080334431885, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080545036943, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "A_out_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541080545036943, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080563400544, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerID
value: 5025
objectReference: {fileID: 0}
- target: {fileID: 2576541080563400544, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1"
objectReference: {fileID: 0}
- target: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u96F6_out_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080767639300, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "B_in_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541080767639300, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080772862035, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerID
value: 5025
objectReference: {fileID: 0}
- target: {fileID: 2576541080772862035, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2"
objectReference: {fileID: 0}
- target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "C_in_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080876693594, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "B_out_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541080876693594, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541080985544078, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerID
value: 5024
objectReference: {fileID: 0}
- target: {fileID: 2576541080985544078, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u76D6\u5B50"
objectReference: {fileID: 0}
- target: {fileID: 2576541081049590947, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "C_out_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541081049590947, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541081131008877, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u7535\u80FD\u8868\u62C6\u88C5\u87BA\u4E1D2"
objectReference: {fileID: 0}
- target: {fileID: 2576541081226192895, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u96F6_\u5730_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541081226192895, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541081356017717, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "\u96F6_out_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541081356017717, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541081685985455, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "B_in_\u87BA\u4E1Ddown"
objectReference: {fileID: 0}
- target: {fileID: 2576541081685985455, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2576541081774396260, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: triggerName
value: "A_in_\u87BA\u4E1Dup"
objectReference: {fileID: 0}
- target: {fileID: 2576541081774396260, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: hasElectricity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4675619581299266311, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_Name
value: "\u4E09\u76F8\u56DB\u7EBF\u7535\u8868"
objectReference: {fileID: 0}
- target: {fileID: 4675619581299266311, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5209635747906703206, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_RootOrder
value: 0
@ -6077,17 +5889,9 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_Name
value: "\u7535\u80FD\u8868\u76D6\u5B50"
objectReference: {fileID: 0}
- target: {fileID: 6044607018453959887, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4834241782207447596, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
- {fileID: 2921358948653541, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
- {fileID: 4834241782207447596, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
--- !u!1 &2626639506843241922
GameObject:

View File

@ -64,7 +64,6 @@ public class Device_3Phase4WireMeter : Device_Base
JieXianScrewUninstallState();
//固定螺丝拧下状态
FixScrewUninstall();
gameObject.SetActive(false);
}
}
@ -184,6 +183,7 @@ public class Device_3Phase4WireMeter : Device_Base
public void Add()
{
transform.parent = SiteManager.instance.measuringCabinet.transform;
SiteManager.instance.measuringCabinet.meteringDevice = this;
//默认是拆除的状态
Init(false);
transform.DOLocalMove(new Vector3(0.1469002f, -0.1793365f, 0.5191498f), 2).OnStart(() =>
@ -191,7 +191,6 @@ public class Device_3Phase4WireMeter : Device_Base
transform.localEulerAngles = Vector3.zero;
}).OnComplete(() =>
{
SiteManager.instance.measuringCabinet.meteringDevice = this;
LiveSceneManager.Instance.currentTool = null;
Debug.Log("电能表已安装");
});

View File

@ -70,6 +70,9 @@ public class Device_Cover : Device_Base
Debug.Log("盖上盖子");
isOpen = false;
transform.DOLocalMoveY(0.01112366f, 2);
transform.DOLocalMoveZ(-0.09854126f, 2);
transform.DOLocalMoveZ(-0.09854126f, 2).OnComplete(() =>
{
int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
});
}
}

View File

@ -86,6 +86,10 @@ public class Device_MeasuringCabinet : MonoBehaviour
public void Init()
{
//还原三相四线电能表
if (meteringDevice == null)
{
meteringDevice = GameObject.FindObjectOfType<Device_3Phase4WireMeter>(true);
}
meteringDevice.Init(true);
//还原接线完好
check_JieXian.isChecked = false;
@ -234,4 +238,13 @@ public class Device_MeasuringCabinet : MonoBehaviour
}
}
}
private void OnDestroy()
{
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
private void OnDisable()
{
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
}

View File

@ -151,10 +151,11 @@ public class StepState_1002 : StepState
{
//安装电能表
//固定螺丝拧下了
SiteManager.instance.measuringCabinet.meteringDevice.FixScrewUninstall();
//接线螺丝拧下了
SiteManager.instance.measuringCabinet.meteringDevice.JieXianScrewUninstallState();
//²ð³ý״̬
SiteManager.instance.measuringCabinet.meteringDevice.Init(false);
SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(false);
SiteManager.instance.measuringCabinet.meteringDevice = null;
//电能表接线取下了
SiteManager.instance.measuringCabinet.jieXian_screws.ForEach(screw =>
{
@ -168,7 +169,8 @@ public class StepState_1002 : StepState
{
//安装检查
SiteManager.instance.measuringCabinet.meteringDevice = GameObject.FindObjectOfType<Device_3Phase4WireMeter>(true);
SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(true);
//接线未检查
SiteManager.instance.measuringCabinet.check_JieXian.isChecked = false;
SiteManager.instance.measuringCabinet.check_JieXian.gameObject.SetActive(true);

View File

@ -33,6 +33,11 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
tMDTips.gameObject.SetActive(false);
currentTool.transform.localEulerAngles = new Vector3(90, 0, 0);
}
if (currentTool.name.Equals("三相四线电能表"))
{
tMDTips.gameObject.SetActive(false);
currentTool.transform.localEulerAngles = new Vector3(-90, 0, -180);
}
}
private void Update()