From 8cc5f369f500e64ae7915a478ac816a3569a4e42 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 29 Aug 2024 17:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=A5=E9=AA=A4=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=B0=81?= =?UTF-8?q?=E5=8D=B0=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 24227 -> 24150 bytes .../Devices/杂/接线完好检查/Check_JieXian.cs | 33 ++++++---- Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs | 22 ++++--- Assets/Scripts/CXX/Tools/Tool_TestPen.cs | 4 +- Assets/Scripts/CXX/Tools/Tool_WireStripper.cs | 4 +- .../DataClass/ProcessData/D_Process.cs | 6 +- .../Project/DataClass/ProcessData/D_Scheme.cs | 2 +- .../DataClass/ProcessData/D_SubProcess.cs | 8 +-- .../DataClass/ProcessData/D_SubProcessStep.cs | 4 +- .../Scripts/Project/Manager/ProcessManager.cs | 60 ++++++++++++------ .../Project/Objects/Other/ImageTips.cs | 1 - .../Project/Objects/Other/MobileController.cs | 7 +- .../UI/UI_Panel/UI_CheckMyselfPanel.cs | 3 + .../BinaryData/TB_SubProcessStep.binary | Bin 5255 -> 5255 bytes 14 files changed, 95 insertions(+), 59 deletions(-) diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 9a56f3018ea23648e32a53e8bee16ceea7bb2a27..92f6f3572c12f3013a7603738cf974c5d2f5797c 100644 GIT binary patch delta 12750 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 public bool isChecked; - private void OnMouseDown() + protected override void OnMDown() { - if (SiteManager.instance.measuringCabinet.jieXian_lines.TrueForAll(a=>a.isConnected) && SiteManager.instance.measuringCabinet.meteringDevice.jieXian_screws.TrueForAll(a=>a.isInstall)) + base.OnMDown(); + if (SiteManager.instance.measuringCabinet.jieXian_lines.TrueForAll(a => a.isConnected) && SiteManager.instance.measuringCabinet.meteringDevice.jieXian_screws.TrueForAll(a => a.isInstall)) { Invoke("Check", 1); } @@ -24,19 +25,23 @@ public class Check_JieXian : PermanentTriggerBase /// public void Check() { - Debug.Log(""); - isChecked = true; - GetComponent().enabled = false; - - if (GameManager.UIMgr != null) + if (GameManager.ProcessMgr?.IsRightSubProcessStepsTriggerID(triggerName, true) == 0) { - GameObject tip2 = Instantiate(Resources.Load("UI/UI_Tip/TipPanel"),GameManager.UIMgr.canvas.transform); - TipPanel tipPanel = tip2.GetComponent(); - tipPanel.Init("ã"); + + Debug.Log(""); + isChecked = true; + GetComponent().enabled = false; + + if (GameManager.UIMgr != null) + { + GameObject tip2 = Instantiate(Resources.Load("UI/UI_Tip/TipPanel"), GameManager.UIMgr.canvas.transform); + TipPanel tipPanel = tip2.GetComponent(); + tipPanel.Init("ã"); + } + + //GameManager.ProcessMgr?.IsRightSubProcessStepsTriggerID(triggerName, true); + + base.CallScoreAction(true); } - - GameManager.ProcessMgr?.IsRightSubProcessStepsTriggerID(triggerName, true); - - base.CallScoreAction(true); } } diff --git a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs index c9a5cfc..998b261 100644 --- a/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs +++ b/Assets/Scripts/CXX/Tools/Tool_BoxSeal.cs @@ -23,17 +23,23 @@ public class Tool_BoxSeal : Tool_Base //˿š˾Ͱװӡ if (screw == SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Left && SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Left.isInstall) { - //ӡ - SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install(); - // - SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.CallScoreAction(true); + if ((triggerAction == null ? 0 : triggerAction.Invoke(screw.triggerName, true)) == 0) + { + //ӡ + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.Install(); + // + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.CallScoreAction(true); + } } else if (screw == SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Right && SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_screw_Right.isInstall) { - //ҷӡ - SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install(); - // - SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.CallScoreAction(true); + if ((triggerAction == null ? 0 : triggerAction.Invoke(screw.triggerName, true)) == 0) + { + //ҷӡ + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.Install(); + // + SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Right.CallScoreAction(true); + } } } } diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs index b8c82a9..20f2269 100644 --- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -70,7 +70,7 @@ public class Tool_TestPen : Tool_Base /// 豸 public void Test(Device_Base device_base) { - if ((triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true)) == 0) + if ((triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", false)) == 0) { if (device_base.deviceType == DeviceType._) { @@ -83,6 +83,7 @@ public class Tool_TestPen : Tool_Base Debug.Log("_ "); 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.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } @@ -98,6 +99,7 @@ public class Tool_TestPen : Tool_Base Debug.Log("_ "); 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.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}"); }); } diff --git a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs index b6bcdee..e737bd2 100644 --- a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs +++ b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs @@ -52,8 +52,8 @@ public class Tool_WireStripper : Tool_Base // device_Seal.Cut(); isCuning = false; - //int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); ReBackHead(); + int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true)); } private void Update() @@ -68,7 +68,7 @@ public class Tool_WireStripper : Tool_Base Device_Seal ds = hit.transform.GetComponent(); if (ds != null) { - if ((triggerAction == null ? 0 : triggerAction.Invoke(ds.triggerName, true))== 0) + if ((triggerAction == null ? 0 : triggerAction.Invoke(ds.triggerName, false))== 0) { CutOpen(ds); } diff --git a/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs b/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs index 0804211..3945eba 100644 --- a/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs +++ b/Assets/Scripts/Project/DataClass/ProcessData/D_Process.cs @@ -90,7 +90,7 @@ public class D_Process : I_Enter, I_Exit CurrentSubProcess.Exit(); CurrentSubProcess = GetSubProcess(subProcessId); CurrentSubProcess.Enter(); - UnityEngine.Debug.Log("切换子流程到:" + subProcessId); + //UnityEngine.Debug.Log("切换子流程到:" + subProcessId); if (subProcessStepId == 0) CurrentSubProcess.HandoverSubProcessStep(CurrentSubProcess.subProcessStepes[0].id); else @@ -127,7 +127,7 @@ public class D_Process : I_Enter, I_Exit /// public void Enter() { - UnityEngine.Debug.Log("进入当前流程:" + id + "_" + processName); + //UnityEngine.Debug.Log("进入当前流程:" + id + "_" + processName); } /// @@ -135,6 +135,6 @@ public class D_Process : I_Enter, I_Exit /// public void Exit() { - UnityEngine.Debug.Log("退出当前流程:" + id + "_" + processName); + //UnityEngine.Debug.Log("退出当前流程:" + id + "_" + processName); } } diff --git a/Assets/Scripts/Project/DataClass/ProcessData/D_Scheme.cs b/Assets/Scripts/Project/DataClass/ProcessData/D_Scheme.cs index 22788a2..5eadc76 100644 --- a/Assets/Scripts/Project/DataClass/ProcessData/D_Scheme.cs +++ b/Assets/Scripts/Project/DataClass/ProcessData/D_Scheme.cs @@ -83,7 +83,7 @@ public class D_Scheme CurrentProcess.Exit(); CurrentProcess = GetProcess(processId); CurrentProcess.Enter(); - UnityEngine.Debug.Log("切换流程到:" + processId); + //UnityEngine.Debug.Log("切换流程到:" + processId); if (subProcessId == 0) CurrentProcess.HandoverSubProcess(CurrentProcess.subProcesses[0].id, subProcessStepId); else diff --git a/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcess.cs b/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcess.cs index d78dff5..2cd0435 100644 --- a/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcess.cs +++ b/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcess.cs @@ -108,8 +108,8 @@ public class D_SubProcess : I_Enter, I_Exit CurrentSubProcessStep.Exit(); CurrentSubProcessStep = GetSubProcessStep(stepId); CurrentSubProcessStep.Enter(); - UnityEngine.Debug.Log("切换子流程步骤到:" + stepId); - UnityEngine.Debug.Log("切换子流程步骤TriggerID到:" + ProcessManager.Instance.subProcessStepTriggerID); + //UnityEngine.Debug.Log("切换子流程步骤到:" + stepId); + //UnityEngine.Debug.Log("切换子流程步骤TriggerID到:" + ProcessManager.Instance.subProcessStepTriggerID); } /// @@ -135,7 +135,7 @@ public class D_SubProcess : I_Enter, I_Exit /// public void Exit() { - UnityEngine.Debug.Log("退出当前子流程:" + id + "_" + subProcessName); + //UnityEngine.Debug.Log("退出当前子流程:" + id + "_" + subProcessName); } /// @@ -143,6 +143,6 @@ public class D_SubProcess : I_Enter, I_Exit /// public void Enter() { - UnityEngine.Debug.Log("进入当前子流程:" + id + "_" + subProcessName); + //UnityEngine.Debug.Log("进入当前子流程:" + id + "_" + subProcessName); } } diff --git a/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs b/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs index efa2707..b6f2e13 100644 --- a/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs +++ b/Assets/Scripts/Project/DataClass/ProcessData/D_SubProcessStep.cs @@ -66,7 +66,7 @@ public class D_SubProcessStep : I_Enter, I_Exit public void Enter() { //GetTriggerID(); - UnityEngine.Debug.Log("进入当前子流程步骤:" + id + "_" + subProcessStepName); + //UnityEngine.Debug.Log("进入当前子流程步骤:" + id + "_" + subProcessStepName); } /// /// 退出 @@ -75,6 +75,6 @@ public class D_SubProcessStep : I_Enter, I_Exit { //triggersId.Clear(); //triggersComplete.Clear(); - UnityEngine.Debug.Log("退出当前子流程步骤:" + id + "_" + subProcessStepName); + //UnityEngine.Debug.Log("退出当前子流程步骤:" + id + "_" + subProcessStepName); } } diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs index 9f5a90c..1845aef 100644 --- a/Assets/Scripts/Project/Manager/ProcessManager.cs +++ b/Assets/Scripts/Project/Manager/ProcessManager.cs @@ -137,7 +137,7 @@ public class ProcessManager : BaseManager { HandoverSubProcess(spID, 0); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, d_Scheme.CurrentProcess.CurrentSubProcessId); - + //Debug.Log($"进入下一步子流程"); //Debug.Log("进入下一步子流程"); return true; } @@ -188,33 +188,28 @@ public class ProcessManager : BaseManager if (triggerID == currentSubProcessStepTriggerID) { if (isRemove) + { d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.RemoveAt(0); + } if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count == 0) { - Debug.Log($"当前步骤做完了"); - GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => + if (triggerID != "工具间按钮" && triggerID != "现场按钮" && triggerID != "收回工具") { - p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () => + GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => { - CheckSubProcessSteps(subProcessStepId); - if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count != 0) + p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () => { - string triggerNameTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]; - string splitResult = ""; - if (triggerNameTemp.Contains("+")) - { - splitResult = triggerNameTemp.Split('+')[1]; - } - else - { - splitResult = triggerNameTemp; - } - subProcessStepTriggerID = splitResult; - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult); - } + CheckSubProcessSteps(subProcessStepId); + CurrentSubProcessStepTriggerNames(); + }); }); - }); + } + else + { + CheckSubProcessSteps(subProcessStepId); + } } + CurrentSubProcessStepTriggerNames(); return 0; } else @@ -236,6 +231,31 @@ public class ProcessManager : BaseManager } } + /// + /// 切换流程之后， 当前子流程步骤triggerName不等于0的时候操作 + /// + private void CurrentSubProcessStepTriggerNames() + { + if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count != 0) + { + string triggerNameTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]; + string splitResult = ""; + if (triggerNameTemp.Contains("+")) + { + splitResult = triggerNameTemp.Split('+')[1]; + } + else + { + splitResult = triggerNameTemp; + } + subProcessStepTriggerID = splitResult; + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult); + } + } + + /// + /// 操作错子流程步骤的triggerName的错误提示 + /// private void StepErrorTips() { if (GameManager.UIMgr.GetPanel()) diff --git a/Assets/Scripts/Project/Objects/Other/ImageTips.cs b/Assets/Scripts/Project/Objects/Other/ImageTips.cs index 7086a59..a947a85 100644 --- a/Assets/Scripts/Project/Objects/Other/ImageTips.cs +++ b/Assets/Scripts/Project/Objects/Other/ImageTips.cs @@ -31,7 +31,6 @@ public class ImageTips : MonoBehaviour { if (tween != null) tween.Kill(true); - //image.DOKill(); transform.parent = null; gameObject.SetActive(false); } diff --git a/Assets/Scripts/Project/Objects/Other/MobileController.cs b/Assets/Scripts/Project/Objects/Other/MobileController.cs index 6aa9bf4..df8c153 100644 --- a/Assets/Scripts/Project/Objects/Other/MobileController.cs +++ b/Assets/Scripts/Project/Objects/Other/MobileController.cs @@ -34,15 +34,16 @@ public class MobileController : PermanentTriggerBase } } - private void PlayerTalk(string triggerID) + private void PlayerTalk(string triggerName) { - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerID, true) == 0) + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false) == 0) { GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => { - panel.Init(triggerID, "õ", (intTemp) => + panel.Init(triggerName, "õ", (intTemp) => { ScoreManager.instance.Check(triggerName, "ԤԼ"); + GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true); GameManager.UIMgr.HidePanel(); }); }); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs index df119fe..76f4677 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs @@ -45,7 +45,10 @@ public class UI_CheckMyselfPanel : BasePanel private void OnWearState() { if (PacksackBagMgr.Instance.IsWeared(validToolNames)) + { + GameManager.UIMgr.imageTips.HideTips(); GameManager.UIMgr.HidePanel(); + } } protected override void OnClick(string btnName) diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index 98750f02772fdab9b557a1c877e438f9638d1f1b..ac65081b4524524b4064bcc1935eb492391b2f62 100644 GIT binary patch delta 292 zcmX}gyGsIb00;2j_s&=9(REsXf*?9Kg-b!ya$peB5CjH+TT82(MB?C=Uew~DVXwTHBpUUU*C(OLEx(QyQ{E82{W07!s^l3_ z)cULP1EoDK#HTF8n_Gw;3xQd5sHt&STvr#FR8@9W16`V$jyu*S61b;NGw@)~BY(9$ VJaIRmqsKuYfoH~o3!DsY{sAv_bDaPH delta 361 zcmYk1PbkB20L8!Wx7mKp*=BGRzhsMD{G0x!lMHLu^E6L$XW= zyO!n-1NrSpb~~K)`2PqPw8k|)?j9Md)Eui&i6%Cqx~dSE%Pn{`FuSx`Sl-Yyw>bam zi)fSxasqDbGL0cdB^x`WNrV`ah&^`cqS)uBt{-7K^?n>MqaVg0yGzy)Vanjb5gQF_ zh!#E5MwJfZ0c&MDUkojXvrg{AF{kB}`9%BjrW4}XD8wDDN(WB4Vj87hQR8yyH#nfE zv?=X4=a;FDGfEp0Oej7i<2`0c!UcORE?jcU(uXU4Se&?Kn;OFn-&GfG*=`-g9sSlF c+!qtpRM@y#K5KsXxBK+F`^c$^LAKhQKV{j5Bme*a