diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index ad37bca..6d54e67 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Scripts/CXX/Devices/Device_Base.cs b/Assets/Scripts/CXX/Devices/Device_Base.cs index b17ac48..31786b7 100644 --- a/Assets/Scripts/CXX/Devices/Device_Base.cs +++ b/Assets/Scripts/CXX/Devices/Device_Base.cs @@ -14,6 +14,7 @@ public class Device_Base : PermanentTriggerBase if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site) { base.OnStart(); + Debug.Log("Device_Base PermanentTriggerBase"); } } diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs index 89fb79a..96084dd 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs @@ -48,10 +48,10 @@ public class Device_CabinetDoor : Device_Base } protected override void OnMDown() { + if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "") return; if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0) { base.OnMDown(); - if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "") return; if (isOpen) { Close(); diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs index 600042a..7de1172 100644 --- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -31,7 +31,7 @@ public class Tool_TestPen : Tool_Base return; } - // + //˿ Tool_Base tb = hit.transform.GetComponent(); if (tb != null) { @@ -66,6 +66,7 @@ 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); @@ -74,10 +75,12 @@ public class Tool_TestPen : Tool_Base transform.eulerAngles = tmp.testPosAndRot.eulerAngles; Debug.Log("_ "); isFlicker = tmp.hasElectricity; + } else if (device_base.deviceType == DeviceType._) { var tmp = ((Device_CabinetDoor)device_base); + //λƶ transform.position = tmp.testPosAndRot.position; transform.localEulerAngles = tmp.testPosAndRot.localEulerAngles; @@ -89,24 +92,24 @@ public class Tool_TestPen : Tool_Base } } - /// - /// ִ - /// - /// 豸 - public void Test(Tool_Base tool_base) - { - if (tool_base.toolType == ToolType.˿) + /// + /// ִ + /// + /// 豸 + public void Test(Tool_Base tool_base) { - var tmp = ((Tool_Screw)tool_base); - //λƶ - transform.position = tmp.installPos.position; - transform.localEulerAngles = tmp.installPos.localEulerAngles; - Debug.Log("˿ "); - isFlicker = tmp.hasElectricity; + if (tool_base.toolType == ToolType.˿) + { + var tmp = ((Tool_Screw)tool_base); + //λƶ + transform.position = tmp.installPos.position; + transform.localEulerAngles = tmp.installPos.localEulerAngles; + Debug.Log("˿ "); + isFlicker = tmp.hasElectricity; + } + + screem.materials[0].color = isFlicker ? Color.red : Color.white; } - screem.materials[0].color = isFlicker ? Color.red : Color.white; + } - - -} diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs index b0b2df3..1d550fa 100644 --- a/Assets/Scripts/Project/Manager/ProcessManager.cs +++ b/Assets/Scripts/Project/Manager/ProcessManager.cs @@ -125,7 +125,7 @@ public class ProcessManager : BaseManager if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id) { HandoverSubProcessStep(spStepID); - + Debug.Log("进入下一步子流程步骤"); return true; } @@ -137,7 +137,7 @@ public class ProcessManager : BaseManager { HandoverSubProcess(spID, 0); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); - + Debug.Log("进入下一步子流程"); return true; } @@ -150,7 +150,7 @@ public class ProcessManager : BaseManager HandoverProcess(pID, 0, 0); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStep, d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStepId); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); - + Debug.Log("进入下一步流程"); return true; } @@ -166,10 +166,7 @@ public class ProcessManager : BaseManager else { Debug.Log("按照流程走"); - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => - { - panel.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}"); - }); + StepErrorTips(); return false; } @@ -204,10 +201,7 @@ public class ProcessManager : BaseManager } else { - GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => - { - p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}"); - }); + StepErrorTips(); return 1; } } @@ -218,12 +212,24 @@ public class ProcessManager : BaseManager } } else + { + StepErrorTips(); + return -1; + } + } + + private void StepErrorTips() + { + if (GameManager.UIMgr.GetPanel()) + { + GameManager.UIMgr.GetPanel().Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}"); + } + else { GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => { - p.Init($"错误,请前往{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.SceneName()}"); + p.Init($"错误,{d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.tipTitle}"); }); - return -1; } } diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MiddleTipPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MiddleTipPanel.cs index 17dcc2f..cbfba8e 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MiddleTipPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MiddleTipPanel.cs @@ -23,11 +23,13 @@ public class UI_MiddleTipPanel : BasePanel /// private void Hide() { + StopCoroutine(HideAsync()); StartCoroutine(HideAsync()); } + private IEnumerator HideAsync() { yield return new WaitForSeconds(disappear); - UIManager.Instance.HidePanel(); + GameManager.UIMgr.HidePanel(); } } diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index d5b7a41..cf84bc5 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary and b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary differ