From be5850143afc29a97635867c7343d530684d2782 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Thu, 29 Aug 2024 15:45:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=AD=A5=E9=AA=A4triggerID=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/UI_Panel/UI_MessagePanel.prefab | 6 +-- .../Scripts/Project/Manager/ProcessManager.cs | 37 +++++++++++-------- .../Project/UI/UI_Panel/UI_MessagePanel.cs | 8 ++-- 3 files changed, 28 insertions(+), 23 deletions(-) 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/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs index fcb1512..9f5a90c 100644 --- a/Assets/Scripts/Project/Manager/ProcessManager.cs +++ b/Assets/Scripts/Project/Manager/ProcessManager.cs @@ -191,22 +191,29 @@ public class ProcessManager : BaseManager 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("+")) + Debug.Log($"当前步骤做完了"); + GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (p) => { - splitResult = triggerNameTemp.Split('+')[1]; - } - else - { - splitResult = triggerNameTemp; - } - subProcessStepTriggerID = splitResult; - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult); + p.Init("提示", "当前步骤已完成,即将进入下一步", E_MessageType.Normal, () => + { + 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("+")) + { + splitResult = triggerNameTemp.Split('+')[1]; + } + else + { + splitResult = triggerNameTemp; + } + subProcessStepTriggerID = splitResult; + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult); + } + }); + }); } return 0; } 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