From 23484bf7d8fed2cd51f85720d2b9f84407b03248 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 17:33:32 +0200 Subject: [PATCH 1/9] platform --- Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab | 2 +- Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab | 2 +- Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab index f3a91d5..3252715 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 6235131083360722891} m_Layer: 0 m_Name: Leaves_1 - m_TagString: Untagged + m_TagString: Platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab index ed6eecf..5b24ec4 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 1923657810568507940} m_Layer: 0 m_Name: Leaves_3 - m_TagString: Untagged + m_TagString: Platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab index 6f88f8c..784f316 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 8086476736474121134} m_Layer: 0 m_Name: Leaves_7 - m_TagString: Untagged + m_TagString: Platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 From 36c584e70d557559654f3970aa59b0e6cef2746d Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 17:37:51 +0200 Subject: [PATCH 2/9] fix --- Game/Assets/Scripts/DropletMovement.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 43c4356..8d33940 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -40,7 +40,7 @@ public class DropletMovement : MonoBehaviour { //dashing - if (isDashing || isGrounded == false) + if (isDashing) { return; } @@ -149,7 +149,7 @@ public class DropletMovement : MonoBehaviour private void OnCollisionEnter2D(Collision2D col) { - if (col.collider.CompareTag("Platform") && rb.linearVelocity.y == 0) + if (col.collider.CompareTag("Platform")) { isGrounded = true; } From b7b8c42979d71754eaa2c228e6c058b86d08833e Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 17:37:55 +0200 Subject: [PATCH 3/9] Update 0_MainScene.unity --- Game/Assets/Scenes/0_MainScene.unity | 316 +++++++++++++++++++++++++-- 1 file changed, 293 insertions(+), 23 deletions(-) diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index 97544fe..e0ac210 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -150,21 +150,26 @@ Transform: m_Children: [] m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &41000009 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + m_PrefabInstance: {fileID: 537994619} + m_PrefabAsset: {fileID: 0} --- !u!1001 &154636170 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1480429064} m_Modifications: - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalPosition.x - value: 6.027552 + value: 3.7465823 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalPosition.y - value: -2.3143702 + value: -7.15271 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalPosition.z @@ -176,15 +181,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -212,6 +217,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} m_PrefabInstance: {fileID: 1402929047} m_PrefabAsset: {fileID: 0} +--- !u!4 &201361116 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + m_PrefabInstance: {fileID: 987137326} + m_PrefabAsset: {fileID: 0} --- !u!1001 &237062206 PrefabInstance: m_ObjectHideFlags: 0 @@ -326,6 +336,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} +--- !u!1001 &270250172 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1480429064} + m_Modifications: + - target: {fileID: 3724115605263402928, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_Name + value: MiniDroplet (2) + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.07291341 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.y + value: 11.017646 + 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 &314874717 stripped Transform: m_CorrespondingSourceObject: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3} @@ -337,15 +404,15 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1480429064} m_Modifications: - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalPosition.x - value: -3.36 + value: -5.64097 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalPosition.y - value: 7.74 + value: 2.90166 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalPosition.z @@ -357,15 +424,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -388,6 +455,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} +--- !u!4 &486702964 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} + m_PrefabInstance: {fileID: 154636170} + m_PrefabAsset: {fileID: 0} --- !u!1 &505713147 GameObject: m_ObjectHideFlags: 0 @@ -594,6 +666,63 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8e2ad5a7116f03541a6489c22953c195, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::PatternSelecter +--- !u!1001 &537994619 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1480429064} + m_Modifications: + - target: {fileID: 3724115605263402928, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_Name + value: MiniDroplet (1) + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.x + value: -10.113095 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.y + value: 10.414858 + 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!1 &614828868 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} @@ -627,6 +756,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} m_PrefabInstance: {fileID: 2057699300} m_PrefabAsset: {fileID: 0} +--- !u!4 &727862959 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + m_PrefabInstance: {fileID: 270250172} + m_PrefabAsset: {fileID: 0} --- !u!1 &750131489 GameObject: m_ObjectHideFlags: 0 @@ -767,13 +901,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1480429064} m_Modifications: + - target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3} + propertyPath: m_LocalScale.x + value: 1.065425 + objectReference: {fileID: 0} + - target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3} + propertyPath: m_LocalScale.y + value: 1.105515 + objectReference: {fileID: 0} - target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3} propertyPath: m_LocalPosition.x - value: -5.15 + value: -5.02 objectReference: {fileID: 0} - target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3} propertyPath: m_LocalPosition.y - value: -3.7249894 + value: -2.77 objectReference: {fileID: 0} - target: {fileID: 175643639083584954, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3} propertyPath: m_LocalPosition.z @@ -816,6 +958,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cf4c8550450b2534a972d91ba9523ae3, type: 3} +--- !u!1001 &987137326 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1480429064} + m_Modifications: + - target: {fileID: 3724115605263402928, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_Name + value: MiniDroplet + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.x + value: -6.006606 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.y + value: 2.4467707 + 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!1 &1006275183 GameObject: m_ObjectHideFlags: 0 @@ -840,13 +1039,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1006275183} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.21, y: 5.1, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.9290302, y: 0.2616601, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1194303349371580766} - m_Father: {fileID: 0} + m_Father: {fileID: 1480429064} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1179986625 stripped Transform: @@ -858,6 +1057,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} m_PrefabInstance: {fileID: 261923894} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1360115010 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1480429064} + m_Modifications: + - target: {fileID: 3724115605263402928, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_Name + value: MiniDroplet (3) + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.x + value: -5.46097 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.y + value: -0.59834003 + 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!1001 &1402929047 PrefabInstance: m_ObjectHideFlags: 0 @@ -1035,7 +1291,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1480429064 Transform: m_ObjectHideFlags: 0 @@ -1057,6 +1313,13 @@ Transform: - {fileID: 667932119} - {fileID: 1194651306} - {fileID: 1437067316} + - {fileID: 486702964} + - {fileID: 2053013721} + - {fileID: 201361116} + - {fileID: 41000009} + - {fileID: 727862959} + - {fileID: 1722915993} + - {fileID: 1006275184} m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1626398478 @@ -1286,6 +1549,11 @@ Transform: m_Children: [] m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1722915993 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + m_PrefabInstance: {fileID: 1360115010} + m_PrefabAsset: {fileID: 0} --- !u!4 &1773649485 stripped Transform: m_CorrespondingSourceObject: {fileID: 4131646927061829268, guid: cf458f5551a9d1c4ba7451f43109aab3, type: 3} @@ -1558,6 +1826,11 @@ Transform: m_Children: [] m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2053013721 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} + m_PrefabInstance: {fileID: 456116103} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2057699300 PrefabInstance: m_ObjectHideFlags: 0 @@ -1638,11 +1911,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 1.67 objectReference: {fileID: 0} - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -1.48 objectReference: {fileID: 0} - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} propertyPath: m_LocalPosition.z @@ -1694,6 +1967,3 @@ SceneRoots: - {fileID: 1681788161} - {fileID: 1445156949} - {fileID: 750131492} - - {fileID: 1006275184} - - {fileID: 154636170} - - {fileID: 456116103} From b40b457c28275007f56fe9aa30d62c2e009c5f26 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 17:39:32 +0200 Subject: [PATCH 4/9] fix obsticle --- Game/Assets/Scenes/0_MainScene.unity | 72 ---------------------------- 1 file changed, 72 deletions(-) diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index 97544fe..433b54a 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -622,11 +622,6 @@ MonoBehaviour: health: 0 minSize: 0.4 maxFallingTime: 2 ---- !u!4 &667932119 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - m_PrefabInstance: {fileID: 2057699300} - m_PrefabAsset: {fileID: 0} --- !u!1 &750131489 GameObject: m_ObjectHideFlags: 0 @@ -1054,7 +1049,6 @@ Transform: - {fileID: 314874717} - {fileID: 806330341} - {fileID: 1773649485} - - {fileID: 667932119} - {fileID: 1194651306} - {fileID: 1437067316} m_Father: {fileID: 526821486} @@ -1558,72 +1552,6 @@ Transform: m_Children: [] m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2057699300 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1480429064} - m_Modifications: - - target: {fileID: 506203120349568739, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalPosition.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 506203120349568739, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalPosition.y - value: -0.93 - objectReference: {fileID: 0} - - target: {fileID: 7890225293042883908, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_Name - value: LeaveObstacle (1) - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalPosition.x - value: 0.55 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalPosition.y - value: -6.782097 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9198730630941053147, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 2987651900235802105, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} --- !u!1001 &1194303349371580765 PrefabInstance: m_ObjectHideFlags: 0 From 47d1816f7ef68ee1babc6042703caf7ccc2d465d Mon Sep 17 00:00:00 2001 From: go38coz Date: Sat, 6 Jun 2026 17:41:40 +0200 Subject: [PATCH 5/9] scene --- Game/Assets/Scripts/DropletMovement.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 8d33940..4b15f46 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -188,7 +188,7 @@ public class DropletMovement : MonoBehaviour { Collider2D playerCollider = GetComponent(); rb = GetComponent(); - rb.linearVelocityX = 0; + // rb.linearVelocityX = 0; playerCollider.isTrigger = true; From 4c68e91bf304d51bcc9526604ac6f946f993ffce Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 17:44:33 +0200 Subject: [PATCH 6/9] main screen --- .../Prefabs/ObstaclePreFabs/Leaves_1.prefab | 20 ++++++ .../Prefabs/ObstaclePreFabs/Leaves_3.prefab | 20 ++++++ .../Prefabs/ObstaclePreFabs/Leaves_7.prefab | 20 ++++++ Game/Assets/Scenes/0_MainScene.unity | 70 ++++++++++++++----- 4 files changed, 112 insertions(+), 18 deletions(-) diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab index 3252715..961774c 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 833263204665589715} - component: {fileID: 582920247277609636} - component: {fileID: 6235131083360722891} + - component: {fileID: 2602010359428409659} m_Layer: 0 m_Name: Leaves_1 m_TagString: Platform @@ -138,3 +139,22 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 5.295536, y: 2.0656996} m_EdgeRadius: 0 +--- !u!251 &2602010359428409659 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3205537500000339291} + m_Enabled: 1 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 180 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab index 5b24ec4..f86d22c 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 8152925854142091002} - component: {fileID: 2274135278997794241} - component: {fileID: 1923657810568507940} + - component: {fileID: -269556102554916535} m_Layer: 0 m_Name: Leaves_3 m_TagString: Platform @@ -232,3 +233,22 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 3.0952854, y: 0.557008} m_EdgeRadius: 0 +--- !u!251 &-269556102554916535 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 544218827178654494} + m_Enabled: 1 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 180 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab index 784f316..2c38d60 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1462546084721637470} - component: {fileID: 8319023647915240837} - component: {fileID: 8086476736474121134} + - component: {fileID: 6901454004669073730} m_Layer: 0 m_Name: Leaves_7 m_TagString: Platform @@ -138,3 +139,22 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 4.647211, y: 1.5164294} m_EdgeRadius: 0 +--- !u!251 &6901454004669073730 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6835703697940730854} + m_Enabled: 1 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 180 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index 433b54a..bc8aab3 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -150,21 +150,26 @@ Transform: m_Children: [] m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &153222217 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} + m_PrefabInstance: {fileID: 456116103} + m_PrefabAsset: {fileID: 0} --- !u!1001 &154636170 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1480429064} m_Modifications: - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalPosition.x - value: 6.027552 + value: 3.7465823 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalPosition.y - value: -2.3143702 + value: -7.15271 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalPosition.z @@ -176,15 +181,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -202,6 +207,14 @@ PrefabInstance: propertyPath: m_Name value: Leaves_7 objectReference: {fileID: 0} + - target: {fileID: 8086476736474121134, guid: dc0c575aad050644396810f6a909e144, type: 3} + propertyPath: m_Size.y + value: 0.9449017 + objectReference: {fileID: 0} + - target: {fileID: 8086476736474121134, guid: dc0c575aad050644396810f6a909e144, type: 3} + propertyPath: m_Offset.y + value: 1.882459 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -337,15 +350,15 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1480429064} m_Modifications: - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalPosition.x - value: -3.36 + value: -5.64097 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalPosition.y - value: 7.74 + value: 2.90166 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalPosition.z @@ -357,15 +370,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -383,6 +396,14 @@ PrefabInstance: propertyPath: m_Name value: Leaves_1 objectReference: {fileID: 0} + - target: {fileID: 6235131083360722891, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} + propertyPath: m_Size.y + value: 0.9071696 + objectReference: {fileID: 0} + - target: {fileID: 6235131083360722891, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} + propertyPath: m_Offset.y + value: 1.5733594 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -835,14 +856,19 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1006275183} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.21, y: 5.1, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.9290302, y: 0.2616601, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1194303349371580766} - m_Father: {fileID: 0} + m_Father: {fileID: 1480429064} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1105416512 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1462546084721637470, guid: dc0c575aad050644396810f6a909e144, type: 3} + m_PrefabInstance: {fileID: 154636170} + m_PrefabAsset: {fileID: 0} --- !u!4 &1179986625 stripped Transform: m_CorrespondingSourceObject: {fileID: 833263204665589715, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} @@ -1051,6 +1077,9 @@ Transform: - {fileID: 1773649485} - {fileID: 1194651306} - {fileID: 1437067316} + - {fileID: 1105416512} + - {fileID: 153222217} + - {fileID: 1006275184} m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1626398478 @@ -1428,6 +1457,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4831698672923518148, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3} + propertyPath: m_Size.y + value: 1.3899382 + objectReference: {fileID: 0} + - target: {fileID: 4831698672923518148, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3} + propertyPath: m_Offset.y + value: -0.54580206 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1622,6 +1659,3 @@ SceneRoots: - {fileID: 1681788161} - {fileID: 1445156949} - {fileID: 750131492} - - {fileID: 1006275184} - - {fileID: 154636170} - - {fileID: 456116103} From be20aacfd54b5529f46cc6b40146f08d422bcfed Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 17:46:02 +0200 Subject: [PATCH 7/9] used by effector --- Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab | 2 +- Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab | 2 +- Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab | 2 +- Game/Assets/Prefabs/ObstaclePreFabs/RealBranch 1.prefab | 2 +- Game/Assets/Prefabs/ObstaclePreFabs/RealBranch.prefab | 2 +- Game/Assets/Scenes/0_MainScene.unity | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab index 961774c..d76262e 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_1.prefab @@ -124,7 +124,7 @@ BoxCollider2D: serializedVersion: 2 m_Bits: 4294967295 m_IsTrigger: 0 - m_UsedByEffector: 0 + m_UsedByEffector: 1 m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: -0.6286421, y: 0.9940944} diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab index f86d22c..fef82ae 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_3.prefab @@ -126,7 +126,7 @@ BoxCollider2D: serializedVersion: 2 m_Bits: 4294967295 m_IsTrigger: 0 - m_UsedByEffector: 0 + m_UsedByEffector: 1 m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: 2.5341895, y: 2.7081985} diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab index 2c38d60..2dcfa2c 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/Leaves_7.prefab @@ -124,7 +124,7 @@ BoxCollider2D: serializedVersion: 2 m_Bits: 4294967295 m_IsTrigger: 0 - m_UsedByEffector: 0 + m_UsedByEffector: 1 m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: 0.31060886, y: 1.8824592} diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch 1.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch 1.prefab index 36b52dd..1612496 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch 1.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch 1.prefab @@ -124,7 +124,7 @@ BoxCollider2D: serializedVersion: 2 m_Bits: 4294967295 m_IsTrigger: 0 - m_UsedByEffector: 0 + m_UsedByEffector: 1 m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: 0, y: -0.61813337} diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch.prefab index 53c710f..77d19e6 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/RealBranch.prefab @@ -124,7 +124,7 @@ BoxCollider2D: serializedVersion: 2 m_Bits: 4294967295 m_IsTrigger: 0 - m_UsedByEffector: 0 + m_UsedByEffector: 1 m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: 0, y: -0.61813337} diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index bc8aab3..d44c2aa 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -404,6 +404,10 @@ PrefabInstance: propertyPath: m_Offset.y value: 1.5733594 objectReference: {fileID: 0} + - target: {fileID: 6235131083360722891, guid: 0df5ee43ace2acc4f90f9681570465d1, type: 3} + propertyPath: m_UsedByEffector + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] From 8a4cd6c930d9cbbdf903d35ddc0f011e423904b4 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 17:54:53 +0200 Subject: [PATCH 8/9] idk --- Game/Assets/Scenes/0_MainScene.unity | 60 +++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index d44c2aa..301eb07 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -1060,7 +1060,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1480429064 Transform: m_ObjectHideFlags: 0 @@ -1593,6 +1593,63 @@ Transform: m_Children: [] m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2132231508 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3724115605263402928, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_Name + value: MiniDroplet + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.x + value: 0.33395657 + objectReference: {fileID: 0} + - target: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} + propertyPath: m_LocalPosition.y + value: 8.79534 + 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!1001 &1194303349371580765 PrefabInstance: m_ObjectHideFlags: 0 @@ -1663,3 +1720,4 @@ SceneRoots: - {fileID: 1681788161} - {fileID: 1445156949} - {fileID: 750131492} + - {fileID: 2132231508} From e17e8ee6264d67e8e7154119bbe2e23da7f13d94 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 17:57:21 +0200 Subject: [PATCH 9/9] code fix --- Game/Assets/Scripts/DropletMovement.cs | 62 +++++++++++++++++--------- 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 4b15f46..0bb898a 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -33,20 +33,23 @@ public class DropletMovement : MonoBehaviour void Start() { rb = GetComponent(); + characterCollider = GetComponent(); } [System.Obsolete] void Update() { - - //dashing - if (isDashing) + if (isDashing || isDropping) { return; } + + //dashing movement.x = Input.GetAxisRaw("Horizontal"); if (movement.x < 0) facingDirection = -1; if (movement.x > 0) facingDirection = 1; + + //Jumping if (isGrounded && (Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown(KeyCode.UpArrow) || @@ -55,6 +58,8 @@ public class DropletMovement : MonoBehaviour { rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower); } + + //Jump animation if (rb.linearVelocityY > 1) { animator.SetBool("Jumping", true); @@ -62,6 +67,8 @@ public class DropletMovement : MonoBehaviour { animator.SetBool("Jumping", false); } + + //Walk animation if (movement.x > 0) { animator.SetBool("WalkingRight", true); animator.SetBool("WalkingLeft", false); @@ -74,14 +81,15 @@ public class DropletMovement : MonoBehaviour animator.SetBool("WalkingRight", false); animator.SetBool("WalkingLeft", false); } + + //Dashing if (Input.GetKeyDown(KeyCode.LeftShift) && canDash) { StartCoroutine(Dash()); } //dropdown - if (!isGrounded){return;} - if (Input.GetKeyDown(KeyCode.DownArrow) || Input.GetKeyDown(KeyCode.S)) + if (isGrounded && (Input.GetKeyDown(KeyCode.DownArrow) || Input.GetKeyDown(KeyCode.S))) { DropDown(); } @@ -106,7 +114,6 @@ public class DropletMovement : MonoBehaviour private void OnTriggerEnter2D(Collider2D other) { - //Hole if (other.CompareTag("Hole")) { @@ -149,13 +156,31 @@ public class DropletMovement : MonoBehaviour private void OnCollisionEnter2D(Collision2D col) { - if (col.collider.CompareTag("Platform")) + /*if (col.collider.CompareTag("Platform")) { isGrounded = true; } else { isGrounded = false; + }*/ + + CheckGrounded(col); + } + + private void CheckGrounded(Collision2D col) + { + if (col.collider.CompareTag("Platform")) + { + // Verify the character is actually standing on top of the platform + for (int i = 0; i < col.contactCount; i++) + { + if (col.GetContact(i).normal.y >= 0.5f) + { + isGrounded = true; + return; + } + } } } @@ -181,36 +206,33 @@ public class DropletMovement : MonoBehaviour animator.SetBool("WalkingLeft", false); StartCoroutine(DropRoutine()); } - } private IEnumerator DropRoutine() { - Collider2D playerCollider = GetComponent(); - rb = GetComponent(); - // rb.linearVelocityX = 0; - - playerCollider.isTrigger = true; + isDropping = true; // Lock out other actions immediately + rb.linearVelocityX = 0; // Strip horizontal momentum + + characterCollider.isTrigger = true; float duration = 1f; - float elapsed = 0f; //measure time + float elapsed = 0f; // measure time - //move down the height of the collider - float dropDistance = playerCollider.bounds.size.y; + // move down the height of the collider + float dropDistance = characterCollider.bounds.size.y; float speed = dropDistance / duration; while (elapsed < duration) { - isDropping = true; rb.gravityScale = 0; transform.Translate(Vector3.down * speed * Time.deltaTime); - elapsed += Time.deltaTime; //update time + elapsed += Time.deltaTime; // update time yield return null; } - //enable collider --> not a trigger anymore + // enable collider --> not a trigger anymore rb.gravityScale = 1; - playerCollider.isTrigger = false; + characterCollider.isTrigger = false; isDropping = false; isGrounded = false; animator.SetBool("Dropping", false);