Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626

2026-06-06 16:41:34 +02:00
parent c985d5a354 08874beee6
commit e99b9ea133
8 changed files with 335 additions and 7 deletions
@@ -94,9 +94,18 @@ public class DropletMovement : MonoBehaviour
        if (isDashing || isDropping)
    {
        return;
-    }
+        } // was here before

-        rb.linearVelocity = new Vector2(movement.x * moveSpeed, rb.linearVelocity.y);
+        float windForce = 0f;
+
+        if (WindManager.Instance != null)
+        {
+            windForce = WindManager.Instance.CurrentWindForce;
+        }
+
+        rb.linearVelocity = new Vector2(movement.x * moveSpeed + windForce, rb.linearVelocity.y);
+
+        //used to be rb.linearVelocity = new Vector2(movement.x * moveSpeed, rb.linearVelocity.y);
    }

    private void OnTriggerEnter2D(Collider2D other)
@@ -147,10 +156,6 @@ public class DropletMovement : MonoBehaviour
        isGrounded = true;
    }

-    private void OnCollisionExit2D(Collision2D col)
-    {
-        isGrounded = false;
-    }

    private void DropDown()
    {