From ecf9d7c1aa2f9d1a276130f788ac347d8789b336 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 15:38:14 +0200 Subject: [PATCH 1/6] player tage --- Game/Assets/Prefabs/Hole.prefab | 1 + Game/Assets/Prefabs/PlayerDroplet.prefab | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Game/Assets/Prefabs/Hole.prefab b/Game/Assets/Prefabs/Hole.prefab index af27d5d..0e78bab 100644 --- a/Game/Assets/Prefabs/Hole.prefab +++ b/Game/Assets/Prefabs/Hole.prefab @@ -142,3 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bbf8ab4673d6bf447aab098a12320431, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SceneController + sceneIndex: 1 diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index b297235..f76e71a 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -17,7 +17,7 @@ GameObject: - component: {fileID: 4218697106962905645} m_Layer: 0 m_Name: PlayerDroplet - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 From f944111a5208f5956649c26cbcab87d043df7715 Mon Sep 17 00:00:00 2001 From: go38coz Date: Sat, 6 Jun 2026 15:50:01 +0200 Subject: [PATCH 2/6] put branches in front --- Game/Assets/Scenes/0_MainScene.unity | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index a31bfd8..b9712b3 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -890,6 +890,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6893150318335556705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6893150318335556705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_SortingLayerID + value: -925020913 + objectReference: {fileID: 0} - target: {fileID: 8871780616060845038, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_Name value: Branch @@ -953,9 +961,17 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 6893150318335556705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} - propertyPath: m_SortingOrder + propertyPath: m_SortingLayer value: 1 objectReference: {fileID: 0} + - target: {fileID: 6893150318335556705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6893150318335556705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_SortingLayerID + value: -925020913 + objectReference: {fileID: 0} - target: {fileID: 8871780616060845038, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_Name value: Branch (2) From 6b31523ad280ea0848fb97432b438b0c82df29a6 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 15:50:53 +0200 Subject: [PATCH 3/6] scene transition, plattform for leafe --- Game/Assets/Prefabs/Hole.prefab | 2 +- Game/Assets/Prefabs/LeaveObstacle.prefab | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Game/Assets/Prefabs/Hole.prefab b/Game/Assets/Prefabs/Hole.prefab index 0e78bab..17398ff 100644 --- a/Game/Assets/Prefabs/Hole.prefab +++ b/Game/Assets/Prefabs/Hole.prefab @@ -142,4 +142,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bbf8ab4673d6bf447aab098a12320431, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::SceneController - sceneIndex: 1 + sceneIndex: 2 diff --git a/Game/Assets/Prefabs/LeaveObstacle.prefab b/Game/Assets/Prefabs/LeaveObstacle.prefab index 2572196..0e27230 100644 --- a/Game/Assets/Prefabs/LeaveObstacle.prefab +++ b/Game/Assets/Prefabs/LeaveObstacle.prefab @@ -102,6 +102,7 @@ GameObject: - component: {fileID: 9198730630941053147} - component: {fileID: 711765053222976334} - component: {fileID: 4924165898665643858} + - component: {fileID: 1462837664068369080} m_Layer: 0 m_Name: LeaveObstacle m_TagString: Untagged @@ -215,7 +216,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.46760708, y: 1.2761748} @@ -230,3 +231,22 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 4.656008, y: 0.5337138} m_EdgeRadius: 0 +--- !u!251 &1462837664068369080 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7890225293042883908} + 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 From 91942a8f79715444bb4cbd12afc58d70f1ac6a46 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 15:55:06 +0200 Subject: [PATCH 4/6] leafe update --- Game/Assets/Scenes/0_MainScene.unity | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index b9712b3..abd263f 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -1023,6 +1023,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 526821486} m_Modifications: + - target: {fileID: 4924165898665643858, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} + propertyPath: m_Offset.x + value: 0.3 + objectReference: {fileID: 0} - target: {fileID: 7890225293042883908, guid: 09646d5b25a07904aa2ddf7399b3b075, type: 3} propertyPath: m_Name value: LeaveObstacle From 26388ec2bb6218b2f824c6b317b7b610b01fa0ae Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 15:56:10 +0200 Subject: [PATCH 5/6] leafe2 --- Game/Assets/Prefabs/LeaveObstacle.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Game/Assets/Prefabs/LeaveObstacle.prefab b/Game/Assets/Prefabs/LeaveObstacle.prefab index 0e27230..29a5562 100644 --- a/Game/Assets/Prefabs/LeaveObstacle.prefab +++ b/Game/Assets/Prefabs/LeaveObstacle.prefab @@ -219,7 +219,7 @@ BoxCollider2D: m_UsedByEffector: 1 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: -0.46760708, y: 1.2761748} + m_Offset: {x: 0.3, y: 1.2761748} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} From bfd0ce923c5507859e9de49b210feca529b84add Mon Sep 17 00:00:00 2001 From: go38coz Date: Sat, 6 Jun 2026 16:05:21 +0200 Subject: [PATCH 6/6] fixed velocity handling for bounciness --- Game/Assets/Scripts/DamageHandler.cs | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Game/Assets/Scripts/DamageHandler.cs b/Game/Assets/Scripts/DamageHandler.cs index 4bdd404..12fc907 100644 --- a/Game/Assets/Scripts/DamageHandler.cs +++ b/Game/Assets/Scripts/DamageHandler.cs @@ -4,6 +4,7 @@ using Object = System.Object; public class DamageHandler : MonoBehaviour { + private Rigidbody2D rb; public float threshold = 2.5f; public float multiplier = 0.5f; @@ -11,23 +12,35 @@ public class DamageHandler : MonoBehaviour public float health; public float minSize = 0.4f; + private float lastYVelocity; + + + private void Awake() + { + rb = GetComponent(); + } private void Start() { - threshold = 2.5f; - multiplier = 0.5f; + threshold = 10f; + multiplier = 0.1f; maxHealth = 1f; minSize = 0.8f; health = maxHealth; } + private void FixedUpdate() + { + lastYVelocity = rb.linearVelocityY; + } + private void OnCollisionEnter2D(Collision2D other) { - float fallSpeed = GetComponent().linearVelocityY; - if (fallSpeed > threshold) + float fallSpeed = lastYVelocity; + if (fallSpeed < -threshold) { - float fallDamage = (fallSpeed - threshold) * multiplier; + float fallDamage = (-fallSpeed - threshold) * multiplier; Debug.Log($"Fell with velocity:{fallSpeed}. Fall damage{fallDamage}"); UpdateHealth(health - fallDamage); // Debug.Log($"New health:{health - fallDamage}"); @@ -37,6 +50,7 @@ public class DamageHandler : MonoBehaviour Debug.Log($"Fell with velocity:{fallSpeed}. No fall damage"); } } + public void UpdateHealth(float health) {