diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index c8dfe9b..5707698 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index b41fb14..25124e6 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -2960,7 +2960,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: triggerID: 5021 - triggerName: + triggerName: "\u7A7A\u5F002" _highlight: {fileID: 0} deviceType: 4 isOpen: 1 @@ -3162,7 +3162,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: triggerID: 0 - triggerName: + triggerName: "\u7A7A\u5F002" _highlight: {fileID: 0} deviceType: 4 isOpen: 1 diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs index 64cafe0..852d3e9 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs @@ -30,19 +30,22 @@ public class Device_Cover : Device_Base private void OnMouseDown() { - Debug.Log(""); - isCheckOK = true; - - if(!isOpen) + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0) { - if (!cover_screw_Left.isInstall && !cover_screw_Right.isInstall) + Debug.Log(""); + isCheckOK = true; + + if (!isOpen) { - Open(); + if (!cover_screw_Left.isInstall && !cover_screw_Right.isInstall) + { + Open(); + } + } + else if (isOpen) + { + Close(); } - } - else if(isOpen) - { - Close(); } } @@ -54,7 +57,10 @@ public class Device_Cover : Device_Base Debug.Log("򿪸"); isOpen = true; transform.DOLocalMoveY(-0.1388763f, 2); - transform.DOLocalMoveZ(-0.2485413f, 2); + transform.DOLocalMoveZ(-0.2485413f, 2).OnComplete(() => + { + GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true); + }); } /// diff --git a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs index 7dcebaf..01ddd54 100644 --- a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs +++ b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs @@ -55,7 +55,7 @@ public class Tool_Screwdriver : Tool_Base Debug.Log("ӡδ"); return; } - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ts.triggerName, false) == 0) + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ts.triggerName, true) == 0) { if (ts.isInstall) { diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs index 5d8e8f2..523044d 100644 --- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -69,7 +69,6 @@ public class Tool_TestPen : Tool_Base { if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(device_base.triggerName, true) == 0) { - Debug.Log("Test(Device_Base device_base)"); if (device_base.deviceType == DeviceType._) { var tmp = ((Device_Socket)device_base); diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcess.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcess.binary index 2332f1d..527147f 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_SubProcess.binary and b/Assets/StreamingAssets/BinaryData/TB_SubProcess.binary differ diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index cf84bc5..40af26e 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary and b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary differ