diff --git a/Assets/Physics/Bounce.physicsMaterial2D b/Assets/Physics/Bounce.physicsMaterial2D new file mode 100644 index 0000000..c9b57ca --- /dev/null +++ b/Assets/Physics/Bounce.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bounce + friction: 0.4 + bounciness: 0.8 diff --git a/Assets/Physics/Bounce.physicsMaterial2D.meta b/Assets/Physics/Bounce.physicsMaterial2D.meta new file mode 100644 index 0000000..10198f8 --- /dev/null +++ b/Assets/Physics/Bounce.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21a3f3d092f606549b98090aeb342352 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/water.prefab b/Assets/Prefabs/water.prefab index bcc309d..b0111da 100644 --- a/Assets/Prefabs/water.prefab +++ b/Assets/Prefabs/water.prefab @@ -28,9 +28,10 @@ Transform: m_LocalPosition: {x: -78.9733, y: -39.7433, z: 0} m_LocalScale: {x: 8.767016, y: 3.43332, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1307381679213458928} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8004311008239541573 SpriteRenderer: @@ -84,3 +85,115 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2587898580844709860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1307381679213458928} + - component: {fileID: 3190295003044267436} + - component: {fileID: 3996260041246843173} + m_Layer: 0 + m_Name: bounce + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1307381679213458928 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2587898580844709860} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.00261, y: -0.3062, z: 0} + m_LocalScale: {x: 0.95404494, y: 0.24974228, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8574288191223281125} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3190295003044267436 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2587898580844709860} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &3996260041246843173 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2587898580844709860} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 6200000, guid: 21a3f3d092f606549b98090aeb342352, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Assets/Scenes/ClarinetScene.unity b/Assets/Scenes/ClarinetScene.unity index 309f63a..ed277fe 100644 --- a/Assets/Scenes/ClarinetScene.unity +++ b/Assets/Scenes/ClarinetScene.unity @@ -31953,7 +31953,6 @@ MonoBehaviour: cymbalUI: {fileID: 518647109} stateText: {fileID: 1597618778} programmerHUD: {fileID: 1061595775} - stateController: {fileID: 0} --- !u!1001 &2176362525137642075 PrefabInstance: m_ObjectHideFlags: 0 @@ -32031,6 +32030,10 @@ PrefabInstance: propertyPath: m_Name value: water objectReference: {fileID: 0} + - target: {fileID: 3996260041246843173, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} - target: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} propertyPath: m_RootOrder value: -1 @@ -32078,13 +32081,81 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2587898580844709860, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + insertIndex: -1 + addedObject: {fileID: 6786427508792748235} + - targetCorrespondingSourceObject: {fileID: 2587898580844709860, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + insertIndex: -1 + addedObject: {fileID: 6786427508792748236} m_SourcePrefab: {fileID: 100100000, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} --- !u!4 &6786427508792748233 stripped Transform: m_CorrespondingSourceObject: {fileID: 8574288191223281125, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} m_PrefabInstance: {fileID: 6786427508792748232} m_PrefabAsset: {fileID: 0} +--- !u!1 &6786427508792748234 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2587898580844709860, guid: b7611ec9c156a6d40ae4a76a0def99dd, type: 3} + m_PrefabInstance: {fileID: 6786427508792748232} + m_PrefabAsset: {fileID: 0} +--- !u!61 &6786427508792748235 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6786427508792748234} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 21a3f3d092f606549b98090aeb342352, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &6786427508792748236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6786427508792748234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f11c011d93f67a140b0991fa94ea41c3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8529024255618899271 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BounceBehavior.cs b/Assets/Scripts/BounceBehavior.cs new file mode 100644 index 0000000..08b9007 --- /dev/null +++ b/Assets/Scripts/BounceBehavior.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WaterBehavior : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/BounceBehavior.cs.meta b/Assets/Scripts/BounceBehavior.cs.meta new file mode 100644 index 0000000..ddf4233 --- /dev/null +++ b/Assets/Scripts/BounceBehavior.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f11c011d93f67a140b0991fa94ea41c3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index d20fef5..4ec138f 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -19,10 +19,10 @@ public class PlayerBehavior : MonoBehaviour [Header("Clarinet:")] bool unlockedClarinet; - [SerializeField] private float maxDashTime = 3.0f; + [SerializeField] private float maxDashTime = 2.5f; [SerializeField] private float dashStopSpeed = 0.1f; public Vector3 moveDirection; - public float dashDistance = 0.2f; + public float dashDistance = 0.1f; private float currentDashTime; public bool isDash = false;