Merge remote-tracking branch 'origin/main' into damage-handling

2026-06-06 02:47:22 +02:00
parent 2b6a1ebdf3 2104957e34
commit bdfc3eec0b
8 changed files with 447 additions and 3 deletions
@@ -43,7 +43,8 @@ public class DropletMovement : MonoBehaviour
        if (isGrounded &&
            (Input.GetKeyDown(KeyCode.Space) ||
             Input.GetKeyDown(KeyCode.UpArrow) ||
-             Input.GetKeyDown(KeyCode.W)))
+             Input.GetKeyDown(KeyCode.W))
+             && !isDropping)
        {
            rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower);
        }
@@ -143,7 +144,5 @@ public class DropletMovement : MonoBehaviour
        rb.gravityScale = 1;
        playerCollider.isTrigger = false;
        isDropping = false;
->>>>>>> origin/main
-
    }
 }