dialogue-system v0.9.1

diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity
index 5cdafa2bd4b635d9170ddcb2f8317a7aa50b2a31..9e7353b27a02fa50c918ef9074b05a7e1a82f71a 100644 (file)
--- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity
+++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity
@@ -10130,8 +10130,8 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: BossDialogue, Assembly-CSharp
+      - m_Target: {fileID: 1988001243}
+        m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp
         m_MethodName: Skip
         m_Mode: 1
         m_Arguments:
@@ -10620,7 +10620,6 @@ MonoBehaviour:
   DialogueManager: {fileID: 1988001242}
   stringFromFile:
   - {fileID: 4900000, guid: 99663c588e5c94c75bfaf569863566eb, type: 3}
-  - {fileID: 0}
 --- !u!4 &1091878262
 Transform:
   m_ObjectHideFlags: 0
@@ -12379,8 +12378,8 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: BossDialogue, Assembly-CSharp
+      - m_Target: {fileID: 1988001243}
+        m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp
         m_MethodName: NextSentence
         m_Mode: 1
         m_Arguments:

diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
index cf1184f18547bceecc015e5f0592e6b5aa5f07b9..3175a89602a603163de2cf50269c263731addd9e 100644 (file)
--- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
+++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
@@ -16,7 +16,8 @@ public class Dialogue : MonoBehaviour
 
     public Text dialogueText;
 
-    [HideInInspector] public int index;
+    int sffIndex = 0;
+    int dtIndex = 0;
 
     public float typingSpeed;
 
@@ -33,10 +34,14 @@ public class Dialogue : MonoBehaviour
 
     void Update()
     {
-        if (dialogueText.text == dialogueTriggerer[0].stringFromFile[0].text)
+        if (dialogueText.text == dialogueTriggerer[dtIndex].stringFromFile[sffIndex].text)
         {
             continueButton.SetActive(true);
             skipButton.SetActive(true);
+        } 
+        else 
+        {
+            continueButton.SetActive(false);
         }
     }
 
@@ -46,15 +51,9 @@ public class Dialogue : MonoBehaviour
         skipButton.SetActive(true);
         speechBubble.NextSpeaker();
         SpeechBubble.SetActive(true);
-        /*foreach (char letter in sentences[index].ToCharArray())
-        {
-            dialogueText.text += letter;
-            yield return new WaitForSeconds(typingSpeed);
-        }*/
-
-        //dialogueText.text = dialogueTrigger.stringFromFile[0].text;
+        dialogueText.text = "";
 
-        foreach (char letter in dialogueTriggerer[0].stringFromFile[1].text.ToCharArray())
+        foreach (char letter in dialogueTriggerer[dtIndex].stringFromFile[sffIndex].text.ToCharArray())
         {
             dialogueText.text += letter;
             yield return new WaitForSeconds(typingSpeed);
@@ -81,7 +80,10 @@ public class Dialogue : MonoBehaviour
             mouse.GetComponent<Rigidbody2D>().constraints = RigidbodyConstraints2D.FreezeRotation;
             mouse.GetComponent<MouseController>().enabled = true;
         }*/
-        dialogueText.text = dialogueTriggerer[0].stringFromFile[0].text;
+        if(index < dialogueTriggerer[dtIndex].stringFromFile.Length) {
+                    index += 1;
+        }
+        StartCoroutine(Type());
     }
 
     public void Skip()
@@ -105,6 +107,6 @@ public class Dialogue : MonoBehaviour
             mouse.GetComponent<Rigidbody2D>().constraints = RigidbodyConstraints2D.FreezeRotation;
             mouse.GetComponent<MouseController>().enabled = true;
         }*/
-        dialogueText.text = dialogueTriggerer[0].stringFromFile[0].text;
+        dialogueText.text = dialogueTriggerer[index].stringFromFile[index].text;
     }
 }
\ No newline at end of file

diff --git a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs
index feb4993cb39c3f0e5da4ec33bc6bf306dd1f1210..eb2f2c9ae3e2c9dcd6fb2c605d4c23e0110d0932 100644 (file)
--- a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs
+++ b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs
@@ -19,6 +19,7 @@ public class DialogueTrigger : MonoBehaviour
     {
         if(collision.tag == "Player")
         {
+            GetComponent<BoxCollider2D>().enabled = false;
             StartCoroutine(dialogue.Type());
         }
     }

diff --git a/2DGame/Packages/manifest.json b/2DGame/Packages/manifest.json
index 72e082396b9c6057995bffce83099b640df074f6..68894bc6b00042b6112b605afb78175f6481e860 100644 (file)
--- a/2DGame/Packages/manifest.json
+++ b/2DGame/Packages/manifest.json
@@ -11,6 +11,7 @@
     "com.unity.test-framework": "1.1.29",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
+    "com.unity.toolchain.linux-x86_64": "0.1.19-preview",
     "com.unity.toolchain.macos-x86_64-linux-x86_64": "0.1.22-preview",
     "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
     "com.unity.ugui": "1.0.0",

diff --git a/2DGame/Packages/packages-lock.json b/2DGame/Packages/packages-lock.json
index d3060018b573749a36ea2d226093bebb9aac62d3..a08d9097617dfe444c757ae4b931b9ac00fc10f2 100644 (file)
--- a/2DGame/Packages/packages-lock.json
+++ b/2DGame/Packages/packages-lock.json
@@ -185,6 +185,16 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.toolchain.linux-x86_64": {
+      "version": "0.1.19-preview",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.sysroot": "0.1.19-preview",
+        "com.unity.sysroot.linux-x86_64": "0.1.14-preview"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.toolchain.macos-x86_64-linux-x86_64": {
       "version": "0.1.22-preview",
       "depth": 0,