diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 9a56f30..92f6f35 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Resources/UI/UI_Panel/UI_MessagePanel.prefab b/Assets/Resources/UI/UI_Panel/UI_MessagePanel.prefab index 27542a7..4b7558c 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MessagePanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MessagePanel.prefab @@ -292,7 +292,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 314.875, y: -224} + m_AnchoredPosition: {x: 236, y: -224} m_SizeDelta: {x: 100, y: 29} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5143475168080495406 @@ -395,7 +395,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5143475168199256130 RectTransform: m_ObjectHideFlags: 0 @@ -863,7 +863,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 236, y: -224} + m_AnchoredPosition: {x: 157.125, y: -224} m_SizeDelta: {x: 100, y: 29} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5143475170184534651 diff --git a/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs index a79ef80..d21b6de 100644 --- a/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs +++ b/Assets/Scripts/CXX/Devices/杂/接线完好检查/Check_JieXian.cs @@ -11,9 +11,10 @@ public class Check_JieXian : PermanentTriggerBase /// ǷѼ /// 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 fcb1512..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,26 +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) { - CheckSubProcessSteps(subProcessStepId); - } - if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count != 0) - { - string triggerNameTemp = d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]; - string splitResult = ""; - if (triggerNameTemp.Contains("+")) + if (triggerID != "工具间按钮" && triggerID != "现场按钮" && triggerID != "收回工具") { - splitResult = triggerNameTemp.Split('+')[1]; + GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => + { + p.Init("提示", "当前步骤已完成，即将进入下一步", E_MessageType.Normal, () => + { + CheckSubProcessSteps(subProcessStepId); + CurrentSubProcessStepTriggerNames(); + }); + }); } else { - splitResult = triggerNameTemp; + CheckSubProcessSteps(subProcessStepId); } - subProcessStepTriggerID = splitResult; - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult); } + CurrentSubProcessStepTriggerNames(); return 0; } else @@ -229,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/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs index 329463f..6938877 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.Events; @@ -43,24 +41,24 @@ public class UI_MessagePanel : BasePanel { case E_MessageType.Normal: GetControl("Image_NormalBackGround").gameObject.SetActive(true); - GetControl("Image_WarnBackGround").gameObject.SetActive(false); GetControl