Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626
This commit is contained in:
@@ -43,7 +43,8 @@ public class DropletMovement : MonoBehaviour
|
|||||||
if (isGrounded &&
|
if (isGrounded &&
|
||||||
(Input.GetKeyDown(KeyCode.Space) ||
|
(Input.GetKeyDown(KeyCode.Space) ||
|
||||||
Input.GetKeyDown(KeyCode.UpArrow) ||
|
Input.GetKeyDown(KeyCode.UpArrow) ||
|
||||||
Input.GetKeyDown(KeyCode.W)))
|
Input.GetKeyDown(KeyCode.W))
|
||||||
|
&& !isDropping)
|
||||||
{
|
{
|
||||||
rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower);
|
rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower);
|
||||||
}
|
}
|
||||||
@@ -150,6 +151,5 @@ public class DropletMovement : MonoBehaviour
|
|||||||
rb.gravityScale = 1;
|
rb.gravityScale = 1;
|
||||||
playerCollider.isTrigger = false;
|
playerCollider.isTrigger = false;
|
||||||
isDropping = false;
|
isDropping = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,7 +27,7 @@ EditorSettings:
|
|||||||
m_UnlockBlockShaders: 0
|
m_UnlockBlockShaders: 0
|
||||||
m_PrefabModeAllowAutoSave: 1
|
m_PrefabModeAllowAutoSave: 1
|
||||||
m_EnterPlayModeOptionsEnabled: 1
|
m_EnterPlayModeOptionsEnabled: 1
|
||||||
m_EnterPlayModeOptions: 0
|
m_EnterPlayModeOptions: 3
|
||||||
m_GameObjectNamingDigits: 1
|
m_GameObjectNamingDigits: 1
|
||||||
m_GameObjectNamingScheme: 0
|
m_GameObjectNamingScheme: 0
|
||||||
m_AssetNamingUsesSpace: 1
|
m_AssetNamingUsesSpace: 1
|
||||||
|
|||||||
Reference in New Issue
Block a user