diff --git a/Game/Assets/Prefabs/MiniDroplet.prefab b/Game/Assets/Prefabs/MiniDroplet.prefab new file mode 100644 index 0000000..47d1f56 --- /dev/null +++ b/Game/Assets/Prefabs/MiniDroplet.prefab @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3724115605263402928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7100472280186483774} + - component: {fileID: 8707174864638790277} + m_Layer: 0 + m_Name: MiniDroplet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7100472280186483774 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724115605263402928} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8707174864638790277 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3724115605263402928} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, 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_SpriteSortPoint: 0 diff --git a/Game/Assets/Prefabs/MiniDroplet.prefab.meta b/Game/Assets/Prefabs/MiniDroplet.prefab.meta new file mode 100644 index 0000000..e6e2d37 --- /dev/null +++ b/Game/Assets/Prefabs/MiniDroplet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5bb8206709807ff4cae9583b3ee3e67d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index 6aab5f6..31b5e96 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -1894,6 +1894,38 @@ Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} m_PrefabInstance: {fileID: 991606099} m_PrefabAsset: {fileID: 0} +--- !u!1 &1006275183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1006275184} + m_Layer: 0 + m_Name: MiniDroplets + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1006275184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006275183} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.07426, y: 3.48276, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1194303349371580766} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1124127124 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} @@ -3224,54 +3256,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} m_PrefabInstance: {fileID: 2034602594} m_PrefabAsset: {fileID: 0} ---- !u!1 &2060894012 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2060894014} - - component: {fileID: 2060894013} - m_Layer: 0 - m_Name: WindManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2060894013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2060894012} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 77a372e261eab9a4b9b6cf05e6c6e576, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::WindManager - windStrength: 2 - windDuration: 10 - minTimeBetweenWind: 5 - maxTimeBetweenWind: 20 ---- !u!4 &2060894014 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2060894012} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.7161, y: -1.98892, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2090136205 stripped Transform: m_CorrespondingSourceObject: {fileID: 33410884287286606, guid: 5e99c7748f96ea543ad4882124711a08, type: 3} @@ -3339,6 +3323,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} m_PrefabInstance: {fileID: 2145117925} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1194303349371580765 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1006275184} + m_Modifications: + - target: {fileID: 3724115605263402928, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_Name + value: MiniDroplet1 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} +--- !u!4 &1194303349371580766 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + m_PrefabInstance: {fileID: 1194303349371580765} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4353227734250816225 PrefabInstance: m_ObjectHideFlags: 0 @@ -3844,4 +3890,4 @@ SceneRoots: - {fileID: 1681788161} - {fileID: 1445156949} - {fileID: 750131492} - - {fileID: 2060894014} + - {fileID: 1006275184} diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 49dd0df..14a201d 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -1,5 +1,6 @@ using UnityEngine; using System.Collections; +using UnityEngine.SceneManagement; public class DropletMovement : MonoBehaviour { @@ -10,7 +11,6 @@ public class DropletMovement : MonoBehaviour private bool isGrounded = true; private float facingDirection = 1f; private bool isDropping = false; - // private float fallAngleThreshold = -45f; private float fallTimer; private bool isFalling; public float maxFallTime = 0.5f; @@ -38,28 +38,6 @@ public class DropletMovement : MonoBehaviour [System.Obsolete] void Update() { - - //reset falltimer when start the jump - // if ((Input.GetKeyDown(KeyCode.W) || Input.GetKeyDown(KeyCode.UpArrow)) && isGrounded) - // { - // fallTimer = 0f; //jump resets falltime - // } - - //fall damage - // if (isGrounded && fallTimer > 0.6f) - // { - // Destroy(gameObject); //TODO - // } - - //handle jump/midair variables - // if (isGrounded) - // { - // isFalling = false; - // } - // else - // { - // HandleMidairLogic(); - // } //dashing if (isDashing) @@ -125,44 +103,17 @@ public class DropletMovement : MonoBehaviour private void OnTriggerEnter2D(Collider2D other) { - /*if (other.CompareTag("Border")) - { - Destroy(gameObject); //for now it destroys the droplet - Debug.Log("Droplet dropped down, animation, game end!"); - }*/ //Hole if (other.CompareTag("Hole")) { + SceneManager.LoadScene(2, LoadSceneMode.Single); Destroy(gameObject); Debug.Log("Fell in hole!"); } } - // [System.Obsolete] - // private void HandleMidairLogic() - // { - // if (rb.linearVelocity.y >= 0) - // { - // isFalling = false; - // fallTimer = 0f; - // return; - // } - // - // float movementAngle = Mathf.Atan2(rb.velocity.y, rb.velocity.x) * Mathf.Rad2Deg; - // //Degrees: 0 - right, 90 - up, -90 - down --> downwards is beteen -90 and -180 - // //Standard treshhold (degree) = -45 --> between -45 and -135 degrees is falling (instead of jumping) - // bool fallingDown = (movementAngle < fallAngleThreshold && movementAngle > (-180f - fallAngleThreshold)); - // - // if (fallingDown || rb.velocity.x == 0) - // { - // isFalling = true; - // fallTimer += Time.deltaTime; - // Debug.Log($"Fall time: {fallTimer:F2} seconds"); - // } - // } - private IEnumerator Dash() { canDash = false; @@ -198,10 +149,6 @@ public class DropletMovement : MonoBehaviour isGrounded = true; } - private void OnCollisionExit2D(Collision2D col) - { - isGrounded = false; - } private void DropDown() { @@ -232,7 +179,7 @@ public class DropletMovement : MonoBehaviour //move down the height of the collider float dropDistance = playerCollider.bounds.size.y; - float speed = dropDistance/duration; + float speed = dropDistance / duration; while (elapsed < duration) { diff --git a/Game/Assets/Scripts/Patterns.meta b/Game/Assets/Scripts/Patterns.meta new file mode 100644 index 0000000..2d39e99 --- /dev/null +++ b/Game/Assets/Scripts/Patterns.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c75792f2507b4ad4193b0d02e0f844bb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scripts/Pattern1.prefab b/Game/Assets/Scripts/Patterns/Pattern1.prefab similarity index 100% rename from Game/Assets/Scripts/Pattern1.prefab rename to Game/Assets/Scripts/Patterns/Pattern1.prefab diff --git a/Game/Assets/Scripts/Pattern1.prefab.meta b/Game/Assets/Scripts/Patterns/Pattern1.prefab.meta similarity index 100% rename from Game/Assets/Scripts/Pattern1.prefab.meta rename to Game/Assets/Scripts/Patterns/Pattern1.prefab.meta diff --git a/Game/Assets/Scripts/Pattern2.prefab b/Game/Assets/Scripts/Patterns/Pattern2.prefab similarity index 100% rename from Game/Assets/Scripts/Pattern2.prefab rename to Game/Assets/Scripts/Patterns/Pattern2.prefab diff --git a/Game/Assets/Scripts/Pattern2.prefab.meta b/Game/Assets/Scripts/Patterns/Pattern2.prefab.meta similarity index 100% rename from Game/Assets/Scripts/Pattern2.prefab.meta rename to Game/Assets/Scripts/Patterns/Pattern2.prefab.meta diff --git a/Game/Assets/Scripts/Pattern3.prefab b/Game/Assets/Scripts/Patterns/Pattern3.prefab similarity index 100% rename from Game/Assets/Scripts/Pattern3.prefab rename to Game/Assets/Scripts/Patterns/Pattern3.prefab diff --git a/Game/Assets/Scripts/Pattern3.prefab.meta b/Game/Assets/Scripts/Patterns/Pattern3.prefab.meta similarity index 100% rename from Game/Assets/Scripts/Pattern3.prefab.meta rename to Game/Assets/Scripts/Patterns/Pattern3.prefab.meta diff --git a/Game/Assets/Scripts/Pattern4.prefab b/Game/Assets/Scripts/Patterns/Pattern4.prefab similarity index 100% rename from Game/Assets/Scripts/Pattern4.prefab rename to Game/Assets/Scripts/Patterns/Pattern4.prefab diff --git a/Game/Assets/Scripts/Pattern4.prefab.meta b/Game/Assets/Scripts/Patterns/Pattern4.prefab.meta similarity index 100% rename from Game/Assets/Scripts/Pattern4.prefab.meta rename to Game/Assets/Scripts/Patterns/Pattern4.prefab.meta diff --git a/Game/Assets/Scripts/Pattern5.prefab b/Game/Assets/Scripts/Patterns/Pattern5.prefab similarity index 100% rename from Game/Assets/Scripts/Pattern5.prefab rename to Game/Assets/Scripts/Patterns/Pattern5.prefab diff --git a/Game/Assets/Scripts/Pattern5.prefab.meta b/Game/Assets/Scripts/Patterns/Pattern5.prefab.meta similarity index 100% rename from Game/Assets/Scripts/Pattern5.prefab.meta rename to Game/Assets/Scripts/Patterns/Pattern5.prefab.meta diff --git a/Game/Assets/Scripts/SceneController.cs b/Game/Assets/Scripts/SceneController.cs deleted file mode 100644 index c932208..0000000 --- a/Game/Assets/Scripts/SceneController.cs +++ /dev/null @@ -1,14 +0,0 @@ -using UnityEngine; -using UnityEngine.SceneManagement; - -public class SceneController : MonoBehaviour -{ - // Start is called once before the first execution of Update after the MonoBehaviour is created - public int sceneIndex; - - private void OggerEnter2D(Collider2D collision) - { - Debug.Log("Hole"); - SceneManager.LoadScene(sceneIndex, LoadSceneMode.Single); - } -} \ No newline at end of file diff --git a/Game/Assets/Scripts/SceneController.cs.meta b/Game/Assets/Scripts/SceneController.cs.meta deleted file mode 100644 index c25c8bf..0000000 --- a/Game/Assets/Scripts/SceneController.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: bbf8ab4673d6bf447aab098a12320431 \ No newline at end of file