dialogue-system v0.9

[SuperMouseAdventure.git] / 2DGame / Assets / Scripts / Dialogue / Dialogue.cs

diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
index 146a87e2de7cf983f1f6a93d2f9a4936d7f3559e..cf1184f18547bceecc015e5f0592e6b5aa5f07b9 100644 (file)
--- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
+++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
@@ -7,6 +7,7 @@ using UnityEngine.UI;
 public class Dialogue : MonoBehaviour
 {
     public GameObject continueButton;
+    public GameObject skipButton;
     public GameObject dialogueBox;
     public GameObject SpeechBubble;
     public GameObject mouse;
@@ -15,65 +16,55 @@ public class Dialogue : MonoBehaviour
 
     public Text dialogueText;
 
-    public string[] sentences;
-
-    [HideInInspector]
-    public int index;
+    [HideInInspector] public int index;
 
     public float typingSpeed;
 
-    public bool skip;
+    [SerializeField] DialogueTrigger[] dialogueTriggerer;
 
     void Start()
     {
         dialogueBox.SetActive(false);
         continueButton.SetActive(false);
+        skipButton.SetActive(false);
         SpeechBubble.SetActive(false);
         speechBubble = SpeechBubble.GetComponent<SpeechBubble>();
     }
 
     void Update()
     {
-        if (dialogueText.text == sentences[index])
+        if (dialogueText.text == dialogueTriggerer[0].stringFromFile[0].text)
         {
             continueButton.SetActive(true);
-        }
-
-        if (dialogueText.text != sentences[index])
-        {
-            if (Input.GetKeyDown(KeyCode.Return) || Input.GetMouseButtonDown(0))
-            {
-                skip = true;
-            }
-            else
-            {
-                skip = false;
-            }
+            skipButton.SetActive(true);
         }
     }
 
     public IEnumerator Type()
     {
         dialogueBox.SetActive(true);
+        skipButton.SetActive(true);
         speechBubble.NextSpeaker();
         SpeechBubble.SetActive(true);
-        foreach (char letter in sentences[index].ToCharArray())
+        /*foreach (char letter in sentences[index].ToCharArray())
         {
             dialogueText.text += letter;
             yield return new WaitForSeconds(typingSpeed);
-        }
-    }
+        }*/
 
-    public void Skip()
-    {
-        dialogueText.text = sentences[index];
+        //dialogueText.text = dialogueTrigger.stringFromFile[0].text;
+
+        foreach (char letter in dialogueTriggerer[0].stringFromFile[1].text.ToCharArray())
+        {
+            dialogueText.text += letter;
+            yield return new WaitForSeconds(typingSpeed);
+        }
     }
 
     public void NextSentence()
     {
-        FindObjectOfType<AudioManager>().Play("click");
+        /*FindObjectOfType<AudioManager>().Play("click");
         continueButton.SetActive(false);
-        skip= false;
 
         if (index < sentences.Length - 1)
         {
@@ -89,6 +80,31 @@ public class Dialogue : MonoBehaviour
             SpeechBubble.SetActive(false);
             mouse.GetComponent<Rigidbody2D>().constraints = RigidbodyConstraints2D.FreezeRotation;
             mouse.GetComponent<MouseController>().enabled = true;
+        }*/
+        dialogueText.text = dialogueTriggerer[0].stringFromFile[0].text;
+    }
+
+    public void Skip()
+    {
+        /*StopCoroutine(Type());
+        FindObjectOfType<AudioManager>().Play("click");
+        skipButton.SetActive(false);
+
+        if (index < sentences.Length - 1)
+        {
+            index++;
+            dialogueText.text = "";
+            dialogueText.text = sentences[index];
+            speechBubble.NextSpeaker();
         }
+        else
+        {
+            dialogueText.text = "";
+            dialogueBox.SetActive(false);
+            SpeechBubble.SetActive(false);
+            mouse.GetComponent<Rigidbody2D>().constraints = RigidbodyConstraints2D.FreezeRotation;
+            mouse.GetComponent<MouseController>().enabled = true;
+        }*/
+        dialogueText.text = dialogueTriggerer[0].stringFromFile[0].text;
     }
-}
+}
\ No newline at end of file