diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index fcaf0f5..7d799df 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ 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 229dec5..9c4aa09 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary and b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary differ