diff --git a/Assets/Scripts/CXX/Devices/Device_Base.cs b/Assets/Scripts/CXX/Devices/Device_Base.cs index 78735ae..3c22536 100644 --- a/Assets/Scripts/CXX/Devices/Device_Base.cs +++ b/Assets/Scripts/CXX/Devices/Device_Base.cs @@ -61,11 +61,11 @@ public class Device_Base : PermanentTriggerBase public void AddStartAction(Action callback) { - startAction += callback; + hand_out_action += callback; } public void AddEndAction(Action callback) { - endAction += callback; + hand_back_action += callback; } /// diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs index 117521c..9ab6b16 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs @@ -184,13 +184,12 @@ public class Device_3Phase4WireMeter : Device_Base //µܱ if (!fix_screw_left.isInstall && !fix_screw_right.isInstall) { - startAction?.Invoke(); + hand_out_action?.Invoke(); SiteManager.instance.measuringCabinet.meteringDevice = null; Debug.Log("ܱѲ"); transform.DOLocalMove(transform.localPosition - new Vector3(0, 0.2f, 0.2f), 2).OnComplete(() => { CallScoreAction(false); - endAction?.Invoke(); gameObject.SetActive(false); }); } @@ -205,16 +204,16 @@ public class Device_3Phase4WireMeter : Device_Base SiteManager.instance.measuringCabinet.meteringDevice = this; //ĬDz״̬ Init(false); - startAction?.Invoke(); + hand_out_action?.Invoke(); transform.DOLocalMove(new Vector3(0.1469002f, -0.1793365f, 0.5191498f), 2).OnStart(() => { transform.localEulerAngles = Vector3.zero; }).OnComplete(() => { LiveSceneManager.Instance.OnCheckSubProcess(false); + Debug.Log("ܱѰװ"); CallScoreAction(true); - //endAction?.Invoke(); }); } } diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs index 50d2df9..042d7ba 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs @@ -63,7 +63,6 @@ public class Device_Cover : Device_Base { isMoving = true; Debug.Log("򿪸"); - startAction?.Invoke(); Transform parent = cover_screw_Left.transform.parent; cover_screw_Left.transform.parent = transform; cover_screw_Right.transform.parent = transform; @@ -75,7 +74,6 @@ public class Device_Cover : Device_Base isMoving = false; int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); - endAction?.Invoke(); }); } } @@ -90,7 +88,6 @@ public class Device_Cover : Device_Base { isMoving=true; Debug.Log("ϸ"); - startAction?.Invoke(); Transform parent = cover_screw_Left.transform.parent; cover_screw_Left.transform.parent = transform; cover_screw_Right.transform.parent = transform; @@ -102,7 +99,6 @@ public class Device_Cover : Device_Base isMoving = false; int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); - endAction?.Invoke(); }); } } diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs index 4fe5d69..ecb116a 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_NamePlate.cs @@ -34,7 +34,6 @@ public class Device_NamePlate : Device_Base GameObject tip = Instantiate(checkUiPrefb, GameManager.UIMgr.canvas.transform); ProcessTipPanel processTipPanel = tip.GetComponent(); - startAction?.Invoke(); //ʼ߽ processTipPanel.StartProcess(result => { @@ -50,7 +49,6 @@ public class Device_NamePlate : Device_Base } int state = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); CallScoreAction(); - endAction?.Invoke(); } }); } diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs index a6af7a9..5810600 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs @@ -23,7 +23,7 @@ public class Device_CabinetDoor : Device_Base public void Open() { Debug.Log(""); - startAction?.Invoke(); + hand_out_action?.Invoke(); // transform.Find("2/3").DOLocalRotate(new Vector3(-45f, 0, 0), 1).OnComplete(() => { @@ -32,14 +32,13 @@ public class Device_CabinetDoor : Device_Base { isOpen = true; int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); - endAction?.Invoke(); }); }); } public void Close() { Debug.Log(""); - startAction?.Invoke(); + hand_out_action?.Invoke(); // transform.DOLocalRotate(new Vector3(0, 0, 0), 3).OnComplete(() => { @@ -48,7 +47,6 @@ public class Device_CabinetDoor : Device_Base { isOpen = false; int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); - endAction?.Invoke(); }); }); } diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs b/Assets/Scripts/CXX/Tools/Tool_Base.cs index bc223d2..4404c81 100644 --- a/Assets/Scripts/CXX/Tools/Tool_Base.cs +++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs @@ -67,11 +67,11 @@ public class Tool_Base : PermanentTriggerBase } public void AddStartAction(Action callback) { - startAction += callback; + hand_out_action += callback; } public void AddEndAction(Action callback) { - endAction += callback; + hand_back_action += callback; } /// /// ù߻صеλ @@ -97,7 +97,7 @@ public class Tool_Base : PermanentTriggerBase transform.localPosition = head_LocalPos; transform.localEulerAngles = head_LocalEulerAnglesl; isMoving = false; - endAction?.Invoke(); + hand_back_action?.Invoke(); back?.Invoke(); }); } diff --git a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs index fabc7ac..89afb60 100644 --- a/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs +++ b/Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs @@ -19,7 +19,7 @@ public class Tool_Screwdriver : Tool_Base screw.isMoving = true; isMoving = true; Debug.Log("ʼš˿"); - startAction?.Invoke(); + hand_out_action?.Invoke(); //˿Ƶ˿ transform.parent = null; transform.DOLocalRotate(screw.installPos.localEulerAngles, 0.5f); @@ -41,7 +41,7 @@ public class Tool_Screwdriver : Tool_Base screw.isMoving = true; isMoving = true; Debug.Log("ʼж˿"); - startAction?.Invoke(); + hand_out_action?.Invoke(); //˿Ƶ˿ transform.parent = null; transform.DOLocalRotate(screw.installPos.localEulerAngles, 0.5f); diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs index 87c71d2..648f9dd 100644 --- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -75,7 +75,7 @@ public class Tool_TestPen : Tool_Base { var tmp = ((Device_Socket)device_base); //λƶ - base.startAction?.Invoke(); + base.hand_out_action?.Invoke(); transform.parent = null; transform.DORotate(tmp.testPosAndRot.eulerAngles, 0.5f); transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() => @@ -84,7 +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.hand_back_action?.Invoke(); base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } @@ -93,7 +93,7 @@ public class Tool_TestPen : Tool_Base var tmp = ((Device_CabinetDoor)device_base); //λƶ - base.startAction?.Invoke(); + base.hand_out_action?.Invoke(); transform.parent = null; transform.DOLocalRotate(tmp.testPosAndRot.localEulerAngles, 0.5f); transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() => @@ -102,7 +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.hand_back_action?.Invoke(); base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } @@ -120,7 +120,7 @@ public class Tool_TestPen : Tool_Base if (tool_base.toolType == ToolType.˿) { var tmp = ((Tool_Screw)tool_base); - base.startAction?.Invoke(); + base.hand_out_action?.Invoke(); //λƶ transform.parent = null; transform.DOLocalRotate(tmp.installPos.localEulerAngles, 0.5f); @@ -129,7 +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.hand_back_action?.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 e2ca51f..2f6e459 100644 --- a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs +++ b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs @@ -15,7 +15,7 @@ public class Tool_WireStripper : Tool_Base /// public void CutOpen(Device_Seal device_Seal) { - base.startAction?.Invoke(); + base.hand_out_action?.Invoke(); base.isMoving = true; transform.parent = null; transform.DORotate(device_Seal.testPosAndRot.eulerAngles, 0.5f); diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs index dbc3672..68ae1bb 100644 --- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs +++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs @@ -41,11 +41,9 @@ public class LiveSceneManager : SingletonMono currentTool.GetComponent().SetHeadPosAndEulerang(currentTool.transform.localPosition, currentTool.transform.localEulerAngles); currentTool.GetComponent().AddStartAction(() => { - tMDTips.gameObject.SetActive(false); }); currentTool.GetComponent().AddEndAction(() => { - tMDTips.gameObject.SetActive(true); }); } tMDTips.gameObject.SetActive(true); diff --git a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs index d769552..860cf8f 100644 --- a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs +++ b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs @@ -19,13 +19,13 @@ public class PermanentTriggerBase : MonoBehaviour /// private Action scoreAction; /// - /// ʼĻصΪ↑ʼʹʱã豸Ϊʼʱã + /// зɳʱĻص /// - protected Action startAction; + protected Action hand_out_action; /// - /// صΪصʱã豸Ϊʱã + /// ջĻص /// - protected Action endAction; + protected Action hand_back_action; private void Awake() {