diff --git a/Assets/Scenes/CutsceneEnding.unity b/Assets/Scenes/CutsceneEnding.unity index de94474d1f12d6aad180b74d1e8c905e5bbf33da..d896099692574a27af7c0a31d802c60c73197847 100644 --- a/Assets/Scenes/CutsceneEnding.unity +++ b/Assets/Scenes/CutsceneEnding.unity @@ -3392,7 +3392,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1772904914 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/DialogueManager.cs b/Assets/Scripts/Managers/DialogueManager.cs index 1dc60d7c86f7a177627d5289b38930cd4f6b28bc..13af326b81fd51446ac5e1a525ea42cdac0a45e5 100644 --- a/Assets/Scripts/Managers/DialogueManager.cs +++ b/Assets/Scripts/Managers/DialogueManager.cs @@ -8,7 +8,7 @@ public class DialogueManager : MonoBehaviour [SerializeField] private NPC[] npc; private int currentDialogueIdx = 0; - + bool isTalking = false; bool onDistance = false; @@ -117,6 +117,7 @@ public class DialogueManager : MonoBehaviour isTalking = true; curResponseTracker = 0f; dialogueUI.SetActive(true); + currentDialogueIdx = GlobalStateManager.Instance.IdxQuest; npcName.text = npc[currentDialogueIdx].name; npcDialogueBox.text = npc[currentDialogueIdx].dialogues[0]; } @@ -125,6 +126,5 @@ public class DialogueManager : MonoBehaviour { isTalking = false; dialogueUI.SetActive(false); - currentDialogueIdx++; } }