diff --git a/Game/Assets/Images/idle sprites fixed.png.meta b/Game/Assets/Images/idle sprites fixed.png.meta index dfc4277..616ac20 100644 --- a/Game/Assets/Images/idle sprites fixed.png.meta +++ b/Game/Assets/Images/idle sprites fixed.png.meta @@ -172,8 +172,8 @@ TextureImporter: y: 39 width: 155 height: 92 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -194,8 +194,8 @@ TextureImporter: y: 37 width: 155 height: 87 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -216,8 +216,8 @@ TextureImporter: y: 38 width: 163 height: 83 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -238,8 +238,8 @@ TextureImporter: y: 36 width: 168 height: 80 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -260,8 +260,8 @@ TextureImporter: y: 35 width: 177 height: 76 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -282,8 +282,8 @@ TextureImporter: y: 37 width: 182 height: 64 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -304,8 +304,8 @@ TextureImporter: y: 38 width: 176 height: 68 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -326,8 +326,8 @@ TextureImporter: y: 40 width: 163 height: 84 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -348,8 +348,8 @@ TextureImporter: y: 37 width: 161 height: 92 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -370,8 +370,8 @@ TextureImporter: y: 38 width: 164 height: 104 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 98b9a5b..16ae113 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -31,6 +31,9 @@ public class DropletMovement : MonoBehaviour void Update() { + + //collision + //dashing if (isDashing) @@ -72,6 +75,12 @@ public class DropletMovement : MonoBehaviour rb.linearVelocity = new Vector2(movement.x * moveSpeed, rb.linearVelocity.y); } + /*void OnCollisionEnter2D(Collision2D collision) + { + //if (collision.collider.GetType() == typeof(BoxCollider) && collision.collider.GetComponent == ) { + Destroy(gameObject); //base: destroys the game object + }*/ + private IEnumerator Dash() { canDash = false;