fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hi sammy

Browse Source
This commit is contained in:
allylikesfrogs 2023-05-05 21:37:59 -07:00
parent 89ae237941
commit a1cfe23993
3 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
Assets/Scenes/ClarinetScene.unity
View File

@ -9472,8 +9472,8 @@ Tilemap:
- first: {x: -75, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 20
m_TileSpriteIndex: 20
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -9482,28 +9482,28 @@ Tilemap:
- first: {x: -74, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileIndex: 22
m_TileSpriteIndex: 22
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483649
m_AllTileFlags: 1073741825
- first: {x: -73, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileIndex: 22
m_TileSpriteIndex: 22
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483649
m_AllTileFlags: 1073741825
- first: {x: -72, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileIndex: 22
m_TileSpriteIndex: 22
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -9512,8 +9512,8 @@ Tilemap:
- first: {x: -71, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileIndex: 22
m_TileSpriteIndex: 22
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -9522,8 +9522,8 @@ Tilemap:
- first: {x: -70, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 19
m_TileSpriteIndex: 19
m_TileIndex: 22
m_TileSpriteIndex: 22
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -9532,8 +9532,8 @@ Tilemap:
- first: {x: -69, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileIndex: 22
m_TileSpriteIndex: 22
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -9542,8 +9542,8 @@ Tilemap:
- first: {x: -68, y: -37, z: 0}
second:
serializedVersion: 2
m_TileIndex: 19
m_TileSpriteIndex: 19
m_TileIndex: 23
m_TileSpriteIndex: 23
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -10302,8 +10302,8 @@ Tilemap:
- first: {x: -75, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 16
m_TileSpriteIndex: 16
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -10312,8 +10312,8 @@ Tilemap:
- first: {x: -74, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -10322,18 +10322,18 @@ Tilemap:
- first: {x: -73, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483649
m_AllTileFlags: 1073741825
- first: {x: -72, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -10342,8 +10342,8 @@ Tilemap:
- first: {x: -71, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -10352,28 +10352,28 @@ Tilemap:
- first: {x: -70, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483649
m_AllTileFlags: 1073741825
- first: {x: -69, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 2147483649
m_AllTileFlags: 1073741825
- first: {x: -68, y: -36, z: 0}
second:
serializedVersion: 2
m_TileIndex: 22
m_TileSpriteIndex: 22
m_TileIndex: 19
m_TileSpriteIndex: 19
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
@ -11142,43 +11142,43 @@ Tilemap:
- first: {x: -74, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -73, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -72, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -71, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -70, y: -35, z: 0}
second:
serializedVersion: 2
@ -11202,63 +11202,63 @@ Tilemap:
- first: {x: -68, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -67, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -66, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -65, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 19
m_TileSpriteIndex: 19
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -64, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 18
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -63, y: -35, z: 0}
second:
serializedVersion: 2
m_TileIndex: 19
m_TileSpriteIndex: 19
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 2147483649
- first: {x: -62, y: -35, z: 0}
second:
serializedVersion: 2
@ -29793,31 +29793,31 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 26
m_Data: {fileID: 11400000, guid: 45175e3d4466c674fb6c13ca38ce840f, type: 2}
- m_RefCount: 317
- m_RefCount: 308
m_Data: {fileID: 11400000, guid: f0167dfba7d78444ba833f64ca4007d2, type: 2}
- m_RefCount: 33
m_Data: {fileID: 11400000, guid: 2fd777b86deeec247bf3576fbd149d00, type: 2}
- m_RefCount: 142
- m_RefCount: 145
m_Data: {fileID: 11400000, guid: 798041ec2cd3c584bab050019dc27b84, type: 2}
- m_RefCount: 164
- m_RefCount: 166
m_Data: {fileID: 11400000, guid: 52a05c9a292a7cb4999c15d18c3f0f30, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 198
- m_RefCount: 199
m_Data: {fileID: 11400000, guid: 37f612fe02448514a96bd94a2b5defc1, type: 2}
- m_RefCount: 38
m_Data: {fileID: 11400000, guid: 501bac8dfe52a0346bfa1eb91a6a2ab4, type: 2}
- m_RefCount: 138
- m_RefCount: 137
m_Data: {fileID: 11400000, guid: 0ee3b34e4fb5ee54fb57e02d06d65095, type: 2}
- m_RefCount: 90
- m_RefCount: 87
m_Data: {fileID: 11400000, guid: c22f654c8aa9aa944b5d693ca9103328, type: 2}
- m_RefCount: 339
- m_RefCount: 340
m_Data: {fileID: 11400000, guid: 83b63dbb237157d499ccae84db32bbff, type: 2}
- m_RefCount: 48
m_Data: {fileID: 11400000, guid: 3246eecec4010e846a1b9f2581ede5ce, type: 2}
- m_RefCount: 513
- m_RefCount: 518
m_Data: {fileID: 11400000, guid: 0e60b89cec4828f4ea1b1b30424c0259, type: 2}
- m_RefCount: 145
- m_RefCount: 146
m_Data: {fileID: 11400000, guid: 9b586a46b81e0b34daf969de8ca99491, type: 2}
- m_RefCount: 61
m_Data: {fileID: 11400000, guid: 2a531f8e22611b3448f1faa2234cb6bb, type: 2}
@ -29888,31 +29888,31 @@ Tilemap:
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 317
- m_RefCount: 308
m_Data: {fileID: 1877226299, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 33
m_Data: {fileID: 967020061, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 142
- m_RefCount: 145
m_Data: {fileID: -1084513563, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 164
- m_RefCount: 166
m_Data: {fileID: -776105136, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 198
- m_RefCount: 199
m_Data: {fileID: -266210932, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 38
m_Data: {fileID: -1748505736, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 138
- m_RefCount: 137
m_Data: {fileID: 462095006, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 90
- m_RefCount: 87
m_Data: {fileID: -853772880, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 339
- m_RefCount: 340
m_Data: {fileID: -1210549817, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 48
m_Data: {fileID: 462183523, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 513
- m_RefCount: 518
m_Data: {fileID: 233751764, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 145
- m_RefCount: 146
m_Data: {fileID: 534927881, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}
- m_RefCount: 61
m_Data: {fileID: -260359440, guid: 4cb21af0a9075ef45b61c7e97d0162f4, type: 3}

12
Assets/Scripts/PlayerBehavior.cs
View File

@ -5,8 +5,6 @@ using UnityEngine.InputSystem;
public class PlayerBehavior : MonoBehaviour
{
public PlayerData Data;
[Header("Physics:")]
private float _hInput;
private Rigidbody2D _rb;
@ -29,11 +27,11 @@ public class PlayerBehavior : MonoBehaviour
private float currentDash = 0.0f;
Vector2 dashVec;
// things for bounce
public float reflectForce = 1.5f;
public float reflectForce = 1.1f;
private Vector2 saveVelocity;
private bool isInWater = false;
private bool hasBounced = false;
public float waterGravity = 0.3f;
public float waterGravity = 0.5f;
[Header("Cymbals:")]
private float cymbalActiveTime = 0f;
@ -132,7 +130,7 @@ public class PlayerBehavior : MonoBehaviour
}
currentDash += dashInc;
}
else if (!isInWater)
else if ((currentDash == dashTime || currentDash > dashTime) && !isInWater)
{
isDash = false;
currentDash = 0.0f;
@ -273,7 +271,8 @@ public class PlayerBehavior : MonoBehaviour
}
else
{
reflect = new Vector2(saveVelocity.x * 1.1f, -(saveVelocity.y) * reflectForce);
reflect = new Vector2(saveVelocity.x * reflectForce, -(saveVelocity.y) * reflectForce);
//reflect = new Vector2(saveVelocity.x * 1.1f, -(saveVelocity.y) * reflectForce);
hasBounced = true;
}
_rb.AddForce(reflect, ForceMode2D.Impulse);
@ -283,6 +282,7 @@ public class PlayerBehavior : MonoBehaviour
void Water()
{
print("water dash " + isDash);
if(isDash)
{
saveVelocity = _rb.velocity;

2
Assets/Scripts/PlayerController.cs
View File

@ -228,7 +228,7 @@ public class PlayerMovement : MonoBehaviour
_isJumpFalling = false;
bool inCoyoteTime = LastOnGroundTime > 0;
print("coyote time: " + inCoyoteTime);
//print("coyote time: " + inCoyoteTime);
Jump();