diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 0727593..ad37bca 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 ecc6899..b41fb14 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -6373,7 +6373,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2576541079831587447, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: triggerName - value: "\u7535\u80FD\u8868\u5C01\u5370" + value: "\u7535\u80FD\u8868\u5C01\u53701" objectReference: {fileID: 0} - target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: triggerID @@ -6381,7 +6381,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2576541079831587450, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: triggerName - value: "\u7535\u80FD\u8868\u5C01\u5370" + value: "\u7535\u80FD\u8868\u5C01\u53702" objectReference: {fileID: 0} - target: {fileID: 2576541080106509928, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: hasElectricity @@ -6417,7 +6417,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2576541080563400544, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: triggerName - value: "\u7535\u80FD\u8868\u87BA\u4E1D" + value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1" objectReference: {fileID: 0} - target: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: hasElectricity @@ -6433,7 +6433,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2576541080772862035, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: triggerName - value: "\u7535\u80FD\u8868\u87BA\u4E1D" + value: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2" objectReference: {fileID: 0} - target: {fileID: 2576541080794005323, guid: 10f4454f32eb20e4298912d896f6020e, type: 3} propertyPath: hasElectricity @@ -6519,6 +6519,10 @@ 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 diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs index 770d589..89fb79a 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs @@ -39,25 +39,28 @@ public class Device_CabinetDoor : Device_Base // transform.DOLocalRotate(new Vector3(0, 0, 0), 3).OnComplete(() => { - // - transform.Find("2/3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() => - { - isOpen = false; - }); + // + transform.Find("2/3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() => + { + isOpen = false; + }); }); } protected override void OnMDown() { - base.OnMDown(); - if (LiveSceneManager.Instance.currentTool !=null && LiveSceneManager.Instance.currentTool.name == "") return; - if (isOpen) + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0) { - Close(); - } - else - { - Open(); + base.OnMDown(); + if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "") return; + if (isOpen) + { + Close(); + } + else + { + Open(); + } } } - + } diff --git a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs index 5bd92ee..f784983 100644 --- a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs +++ b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs @@ -27,7 +27,7 @@ public class Tool_WireStripper : Tool_Base /// IEnumerator PlayAnimi(Device_Seal device_Seal) { - SkinnedMeshRenderer renderer= GetComponentInChildren(); + SkinnedMeshRenderer renderer = GetComponentInChildren(); float vlaue = 0; // while (renderer.GetBlendShapeWeight(0) < 100) @@ -59,7 +59,10 @@ public class Tool_WireStripper : Tool_Base Device_Seal ds = hit.transform.GetComponent(); if (ds != null) { - CutOpen(ds); + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ds.triggerName, true) == 0) + { + CutOpen(ds); + } } } } diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index b31d263..d5b7a41 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary and b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary differ