From 383af005d88b5a7f63d7643f0d390fc0e2a4ff80 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Sun, 25 Aug 2024 18:25:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 21257 -> 21260 bytes Assets/Scripts/CXX/Devices/Device_Base.cs | 1 + .../CXX/Devices/计量柜/Device_CabinetDoor.cs | 2 +- Assets/Scripts/CXX/Tools/Tool_TestPen.cs | 39 ++++++++++-------- .../Scripts/Project/Manager/ProcessManager.cs | 32 ++++++++------ .../Project/UI/UI_Panel/UI_MiddleTipPanel.cs | 4 +- .../BinaryData/TB_SubProcessStep.binary | Bin 2257 -> 2286 bytes 7 files changed, 45 insertions(+), 33 deletions(-) diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index ad37bca4d73b83f20697d4610f97b84badf67bc9..6d54e67d34053a982a395cde88a2d33cac492c85 100644 GIT binary patch delta 4553 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 delta 4525 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 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 d5b7a41aadc00bcfb7b2d64cedd9b00d5ec1e30b..cf84bc59d121cdfbed43dc3e1eed22f7c8dbbf35 100644 GIT binary patch delta 51 zcmV-30L=f<5$+MN!36=Plfnf<9O#3L<&1^qjEU)zt}N%fo#(um=$^XdxSi#QfRiBx J9J3$>u>#N38#e#| delta 18 acmaDScu{b}K~~1j$%j~-H!HE7VFCb4uLmdq