From abe6d99b8dadc6830af87a90f5faebfdee2028e3 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Mon, 26 Aug 2024 20:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 21685 -> 21701 bytes .../Objects/Tools/三相四线电能表.prefab | 60 +++--- Assets/Scenes/05_LiveScene.unity | 198 +----------------- .../Devices/计量柜/Device_MeasuringCabinet.cs | 9 + .../BinaryData/TB_SubProcessStep.binary | Bin 3476 -> 3537 bytes 5 files changed, 40 insertions(+), 227 deletions(-) diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index fcaf0f5a208240ed86bbe977969d890182f5e526..7d799df67c399c34884b3c430579612fa3a678ec 100644 GIT binary patch delta 5158 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 diff --git a/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab index 16b132b..01c927e 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab @@ -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: diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index 573d666..302d851 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -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: diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs index a692aa8..822d949 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs @@ -234,4 +234,13 @@ public class Device_MeasuringCabinet : MonoBehaviour } } } + + private void OnDestroy() + { + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + } + private void OnDisable() + { + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + } } diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index 229dec5ae8d2e260f1dd2f9c8b76230dd6ffeb05..9c4aa094e25a67c197be94ac5bb0069884199312 100644 GIT binary patch delta 35 rcmbOteNlSDJTAsBljn2UPp;*VpDfR%xcNU<1>