Stamping v0.3

diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
index 105abf382c54b66001ec20ba1537ee69fa99e9ec..e78055fce29261399dad7dd68b4ea4e02a303b77 100644 (file)
--- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
+++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs
@@ -45,10 +45,9 @@ public class Dialogue : MonoBehaviour
             {
                 skip = true;
             }
-            else
-            {
-                skip = false;
-            }
+        } else
+        {
+            skip = false;
         }
     }
 

diff --git a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs
index 1a861527905070a40da2f32d1e5d7b11564dfa86..78b12cc86ba4cc8fbdbd9d9e54b37cd67ab5a125 100644 (file)
--- a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs
+++ b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs
@@ -25,12 +25,13 @@ public class DialogueTrigger : MonoBehaviour
         }
     }
 
-    private void Update()
+    void Update()
     {
         if (dialogue.skip)
         {
             StopCoroutine(dialogue.Type());
             dialogue.Skip();
+            dialogue.skip = false;
         }
     }
 }
\ No newline at end of file

diff --git a/2DGame/Assets/Scripts/Mouse/Stamping.cs b/2DGame/Assets/Scripts/Mouse/Stamping.cs
index 7022e67feca09ea9287a63068505b418870923df..0f1160bf4a9b9ee959be7ab755c4e095ad21c376 100644 (file)
--- a/2DGame/Assets/Scripts/Mouse/Stamping.cs
+++ b/2DGame/Assets/Scripts/Mouse/Stamping.cs
@@ -32,7 +32,7 @@ public class Stamping : MonoBehaviour
                 rb.velocity = Vector2.down * stampingSpeed;
             }
         }
-        else
+        else if (mouseController.isGrounded)
         {
             isStamping = false;
         }