From 436a5c221374730e6785453d030827fac20c2b34 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Fri, 30 Aug 2024 11:14:02 +0800 Subject: [PATCH] d --- Assets/Scenes/04_ToolMaterialScene.unity | 4 ++++ .../直接接入式电能计量装置/Device_3Phase4WireMeter.cs | 3 ++- Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs | 8 +++++--- Assets/Scripts/CXX/Tools/Tool_Base.cs | 3 ++- Assets/Scripts/CXX/Tools/Tool_TestPen.cs | 5 +++++ Assets/Scripts/CXX/Tools/Tool_WireStripper.cs | 8 +++++--- Assets/Scripts/Project/Manager/LiveSceneManager.cs | 5 +++-- 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/04_ToolMaterialScene.unity b/Assets/Scenes/04_ToolMaterialScene.unity index a7df05d..a7d4e82 100644 --- a/Assets/Scenes/04_ToolMaterialScene.unity +++ b/Assets/Scenes/04_ToolMaterialScene.unity @@ -694,6 +694,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 1342273091210630203, guid: fe4c1814d44af964c94c33808b704426, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: b9f45527b9d758746ba04747688797b6, type: 2} - target: {fileID: 1711505207429034123, guid: fe4c1814d44af964c94c33808b704426, type: 3} propertyPath: m_Layer value: 6 diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs index 7240442..01e56f2 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs @@ -211,7 +211,8 @@ public class Device_3Phase4WireMeter : Device_Base transform.localEulerAngles = Vector3.zero; }).OnComplete(() => { - LiveSceneManager.Instance.currentTool = null; + LiveSceneManager.Instance.OnCheckSubProcess(false); + Debug.Log("ܱѰװ"); CallScoreAction(true); endAction?.Invoke(); diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs index b929175..a6af7a9 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs @@ -31,6 +31,7 @@ public class Device_CabinetDoor : Device_Base transform.DOLocalRotate(new Vector3(0, 0, 180), 3).OnComplete(() => { isOpen = true; + int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); endAction?.Invoke(); }); }); @@ -46,16 +47,17 @@ public class Device_CabinetDoor : Device_Base transform.Find("2/3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() => { isOpen = false; + int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); endAction?.Invoke(); }); }); } protected override void OnMDown() { - if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "") + if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "") return; - if ((triggerAction==null?0: triggerAction.Invoke(triggerName, true)) == 0) + if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0) { base.OnMDown(); if (isOpen) @@ -82,7 +84,7 @@ public class Device_CabinetDoor : Device_Base /// /// Źر״̬ /// - public void CloseState() + public void CloseState() { isOpen = false; transform.localEulerAngles = Vector3.zero; diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs b/Assets/Scripts/CXX/Tools/Tool_Base.cs index 7e19832..bc223d2 100644 --- a/Assets/Scripts/CXX/Tools/Tool_Base.cs +++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs @@ -87,7 +87,7 @@ public class Tool_Base : PermanentTriggerBase /// /// ߻ص /// - public void ReBackHead() + public void ReBackHead(Action back=null) { isMoving = true; transform.parent = Camera.main.transform; @@ -98,6 +98,7 @@ public class Tool_Base : PermanentTriggerBase transform.localEulerAngles = head_LocalEulerAnglesl; isMoving = false; endAction?.Invoke(); + back?.Invoke(); }); } } diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs index 829bbc4..87c71d2 100644 --- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -75,6 +75,7 @@ public class Tool_TestPen : Tool_Base { var tmp = ((Device_Socket)device_base); //λƶ + base.startAction?.Invoke(); transform.parent = null; transform.DORotate(tmp.testPosAndRot.eulerAngles, 0.5f); transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() => @@ -83,6 +84,7 @@ public class Tool_TestPen : Tool_Base isFlicker = tmp.hasElectricity; screem.materials[0].color = isFlicker ? Color.red : Color.white; int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true)); + base.endAction?.Invoke(); base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } @@ -91,6 +93,7 @@ public class Tool_TestPen : Tool_Base var tmp = ((Device_CabinetDoor)device_base); //λƶ + base.startAction?.Invoke(); transform.parent = null; transform.DOLocalRotate(tmp.testPosAndRot.localEulerAngles, 0.5f); transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() => @@ -99,6 +102,7 @@ public class Tool_TestPen : Tool_Base isFlicker = tmp.hasElectricity; screem.materials[0].color = isFlicker ? Color.red : Color.white; int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true)); + base.endAction?.Invoke(); base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } @@ -125,6 +129,7 @@ public class Tool_TestPen : Tool_Base Debug.Log("˿ "); isFlicker = tmp.hasElectricity; screem.materials[0].color = isFlicker ? Color.red : Color.white; + base.endAction?.Invoke(); base.CallScoreAction(null, $"{triggerName}+{tool_base.triggerName}"); }); } diff --git a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs index ab9f553..e2ca51f 100644 --- a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs +++ b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs @@ -52,9 +52,11 @@ public class Tool_WireStripper : Tool_Base // device_Seal.Cut(); isMoving = false; - - ReBackHead(); - int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true)); + + ReBackHead(() => + { + int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true)); + }); } private void Update() diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs index b87f62d..63408ff 100644 --- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs +++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs @@ -88,9 +88,10 @@ public class LiveSceneManager : SingletonMono } } - public void OnCheckSubProcess() + public void OnCheckSubProcess(bool ifdestroy=true) { tMDTips.gameObject.SetActive(false); - Destroy(currentTool); + if (ifdestroy) + Destroy(currentTool); } }