From 612336fe9211b1d395601c496b7e5812a4db8a01 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Fri, 5 Jun 2026 23:43:16 +0200 Subject: [PATCH 01/11] script into prefab game object --- Game/Assets/Prefabs/PlayerDroplet.prefab | 14 ++++++++++++++ Game/Assets/Scenes/cems scene.unity | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index 72dc1e9..891aee7 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 8298564220872302505} - component: {fileID: 4266476263824402640} - component: {fileID: 218454750066863599} + - component: {fileID: -8535381027169538} m_Layer: 0 m_Name: PlayerDroplet m_TagString: Untagged @@ -166,3 +167,16 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!114 &-8535381027169538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141180002423843430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64d83d81ffe9aeb419af4eb171357948, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::DropletMovement + moveSpeed: 5 diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index d116a7b..e4ba17f 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -364,8 +364,8 @@ Transform: m_GameObject: {fileID: 1163275671} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.14, y: 2.16, z: 0} - m_LocalScale: {x: 1.4699, y: 1.4092, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} From 651bb91014f3c2a02925ab027806c7c2def04012 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Fri, 5 Jun 2026 23:51:41 +0200 Subject: [PATCH 02/11] moving droplet --- Game/Assets/Scenes/cems scene.unity | 276 ++++++++------------- Game/ProjectSettings/ProjectSettings.asset | 2 +- 2 files changed, 104 insertions(+), 174 deletions(-) diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index e4ba17f..b1cd53a 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -119,6 +119,71 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &127014195 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8535381027169538, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: moveSpeed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Name + value: PlayerDroplet + objectReference: {fileID: 0} + - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_GravityScale + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.x + value: -4.270053 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.7652666 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d56297e435f8410a584581d73d99d2e4, type: 3} --- !u!1001 &906924948 PrefabInstance: m_ObjectHideFlags: 0 @@ -195,6 +260,7 @@ GameObject: - component: {fileID: 1033363058} - component: {fileID: 1033363057} - component: {fileID: 1033363056} + - component: {fileID: 1033363059} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -276,190 +342,54 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1163275671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1163275673} - - component: {fileID: 1163275672} - - component: {fileID: 1163275675} - - component: {fileID: 1163275674} - - component: {fileID: 1163275676} - m_Layer: 0 - m_Name: Droplet :3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1163275672 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163275671} - 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: 0.058680363, g: 0.7206627, b: 0.8113208, 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 ---- !u!4 &1163275673 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163275671} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &1163275674 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163275671} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 0} - 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 ---- !u!61 &1163275675 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163275671} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - 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_CompositeOperation: 0 - m_CompositeOrder: 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 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!114 &1163275676 +--- !u!114 &1033363059 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163275671} + m_GameObject: {fileID: 1033363055} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64d83d81ffe9aeb419af4eb171357948, type: 3} + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: - m_EditorClassIdentifier: Assembly-CSharp::DropletMovement - moveSpeed: 5 + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1033363058} - - {fileID: 1163275673} - {fileID: 906924948} + - {fileID: 127014195} diff --git a/Game/ProjectSettings/ProjectSettings.asset b/Game/ProjectSettings/ProjectSettings.asset index cd45408..5af14e7 100644 --- a/Game/ProjectSettings/ProjectSettings.asset +++ b/Game/ProjectSettings/ProjectSettings.asset @@ -874,7 +874,7 @@ PlayerSettings: qnxGraphicConfPath: apiCompatibilityLevel: 6 captureStartupLogs: {} - activeInputHandler: 1 + activeInputHandler: 2 windowsGamepadBackendHint: 0 enableDirectStorage: 0 cloudProjectId: da846bd4-d513-419e-af60-97574b519f94 From e25a720fba43af1bffd6a200dc31a904c0f53da0 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Fri, 5 Jun 2026 23:56:47 +0200 Subject: [PATCH 03/11] picture folder --- .../background draft.jpeg | Bin drop_draft.kra => pictures/drop_draft.kra | Bin drop_draft.psd => pictures/drop_draft.psd | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename background draft.jpeg => pictures/background draft.jpeg (100%) rename drop_draft.kra => pictures/drop_draft.kra (100%) rename drop_draft.psd => pictures/drop_draft.psd (100%) diff --git a/background draft.jpeg b/pictures/background draft.jpeg similarity index 100% rename from background draft.jpeg rename to pictures/background draft.jpeg diff --git a/drop_draft.kra b/pictures/drop_draft.kra similarity index 100% rename from drop_draft.kra rename to pictures/drop_draft.kra diff --git a/drop_draft.psd b/pictures/drop_draft.psd similarity index 100% rename from drop_draft.psd rename to pictures/drop_draft.psd From 74c628a9d18033f3c0b1b4dddc4b40938075671e Mon Sep 17 00:00:00 2001 From: go38coz Date: Fri, 5 Jun 2026 23:57:38 +0200 Subject: [PATCH 04/11] l --- Game/Assets/Scenes/NikolaScene.unity | 312 +++++++++++++++++++++- Game/Assets/Scenes/NikolaScene.unity.meta | 2 +- 2 files changed, 302 insertions(+), 12 deletions(-) diff --git a/Game/Assets/Scenes/NikolaScene.unity b/Game/Assets/Scenes/NikolaScene.unity index 9652c5d..f6909ce 100644 --- a/Game/Assets/Scenes/NikolaScene.unity +++ b/Game/Assets/Scenes/NikolaScene.unity @@ -119,7 +119,64 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1237729071 +--- !u!1001 &279662124 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Name + value: PlayerDroplet + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.02 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d56297e435f8410a584581d73d99d2e4, type: 3} +--- !u!1 &357828117 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -127,9 +184,101 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1237729074} - - component: {fileID: 1237729073} - - component: {fileID: 1237729072} + - component: {fileID: 357828119} + - component: {fileID: 357828118} + m_Layer: 0 + m_Name: Tree + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &357828118 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357828117} + 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: -85329693 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.627451, g: 0.3215686, b: 0.1764706, 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 +--- !u!4 &357828119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 357828117} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 12.6986265, y: 34.7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &505713147 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505713151} + - component: {fileID: 505713150} + - component: {fileID: 505713149} + - component: {fileID: 505713148} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -137,21 +286,65 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &1237729072 +--- !u!114 &505713148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505713147} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 +--- !u!81 &505713149 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1237729071} + m_GameObject: {fileID: 505713147} m_Enabled: 1 ---- !u!20 &1237729073 +--- !u!20 &505713150 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1237729071} + m_GameObject: {fileID: 505713147} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -196,13 +389,13 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &1237729074 +--- !u!4 &505713151 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1237729071} + m_GameObject: {fileID: 505713147} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -211,8 +404,105 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1065178480 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2072448676} + m_Modifications: + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalPosition.x + value: -1.69 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalPosition.y + value: -1.24 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8871780616060845038, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + propertyPath: m_Name + value: Branch + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} +--- !u!4 &1065178481 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} + m_PrefabInstance: {fileID: 1065178480} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2072448675 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2072448676} + m_Layer: 0 + m_Name: Obstacles + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2072448676 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2072448675} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.68753, y: 0.29336, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1065178481} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1237729074} + - {fileID: 505713151} + - {fileID: 279662124} + - {fileID: 357828119} + - {fileID: 2072448676} diff --git a/Game/Assets/Scenes/NikolaScene.unity.meta b/Game/Assets/Scenes/NikolaScene.unity.meta index 0094e7d..c72dc51 100644 --- a/Game/Assets/Scenes/NikolaScene.unity.meta +++ b/Game/Assets/Scenes/NikolaScene.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f04f2358acfad9836859c80048b54ef4 +guid: dc45e69e7bb8dc503a8a9407f8468b61 DefaultImporter: externalObjects: {} userData: From a909a58defe69a7f7bc283e1a715f4b35f58964c Mon Sep 17 00:00:00 2001 From: go38coz Date: Sat, 6 Jun 2026 00:09:10 +0200 Subject: [PATCH 05/11] adjusted gravity --- Game/Assets/Scenes/MainScene.unity | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index e7b428e..bbf0573 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -127,10 +127,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8535381027169538, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: moveSpeed + value: 10 + objectReference: {fileID: 0} - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_Name value: PlayerDroplet objectReference: {fileID: 0} + - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Mass + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_UseAutoMass + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_GravityScale + value: 25 + objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.x value: 0.05 From 0c966786407d6ce444207115ea64effe9ace30be Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:09:48 +0200 Subject: [PATCH 06/11] idk what i changed --- Game/Assets/Scenes/cems scene.unity | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index b1cd53a..5dc4bab 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -141,11 +141,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.x - value: -4.270053 + value: -2.56 objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.y - value: 0.7652666 + value: 1.91 objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.z @@ -202,11 +202,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.x - value: -4.73 + value: -6.02 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.y - value: -2.3359 + value: -0.82 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.z From 08e29b2e701f9ed57d8b0a898c24ea00f038e01c Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 00:14:04 +0200 Subject: [PATCH 07/11] script editing first push helper variables (player) --- Game/Assets/Scripts/DropletMovement.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 76b61a6..87f0946 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -2,11 +2,17 @@ using UnityEngine; public class DropletMovement : MonoBehaviour { - - public float moveSpeed = 5f; - private Rigidbody2D rb; + public float moveSpeed = 5f; private Vector2 movement; + private Animator playerAnim; //for animation + private float xInput; + + //helper variables + private bool isGrounded; + [SerializeField] private float dashSpeed; + [SerializeField] private float dashDuration; + private float dashTime; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() From 46c7885cabf46ee61c779a5c37826a0ff989caa3 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:32:10 +0200 Subject: [PATCH 08/11] trying to figure out how to jump --- Game/.vsconfig | 6 ++++++ Game/Assets/Scripts/DropletMovement.cs | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Game/.vsconfig diff --git a/Game/.vsconfig b/Game/.vsconfig new file mode 100644 index 0000000..f019fd0 --- /dev/null +++ b/Game/.vsconfig @@ -0,0 +1,6 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Workload.ManagedGame" + ] +} diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 76b61a6..a1a0a27 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -2,11 +2,26 @@ using UnityEngine; public class DropletMovement : MonoBehaviour { +<<<<<<< Updated upstream public float moveSpeed = 5f; private Rigidbody2D rb; private Vector2 movement; +======= + private Rigidbody2D rb; + public float moveSpeed = 5f; + public float jumpingPower = 5f; + private Vector2 movement; + private Animator playerAnim; //for animation + private float xInput; + + //helper variables + private bool isGrounded = true; + [SerializeField] private float dashSpeed; + [SerializeField] private float dashDuration; + private float dashTime; +>>>>>>> Stashed changes // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() @@ -19,10 +34,15 @@ public class DropletMovement : MonoBehaviour { movement.x = Input.GetAxisRaw("Horizontal"); movement.y = Input.GetAxisRaw("Vertical"); + if (isGrounded && Input.GetKeyDown(KeyCode.Space)) + { + rb.AddForce(Vector2.up * jumpingPower, ForceMode2D.Impulse); + } } private void FixedUpdate() { rb.linearVelocity = movement.normalized * moveSpeed; } + } From 1c6c3bd110ae98cd692689dd4adc0a7d01cef95d Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:36:37 +0200 Subject: [PATCH 09/11] jump merge conflict idk --- Game/Assets/Scripts/DropletMovement.cs | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index a1a0a27..477e3e6 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -2,47 +2,39 @@ using UnityEngine; public class DropletMovement : MonoBehaviour { -<<<<<<< Updated upstream - - public float moveSpeed = 5f; - - private Rigidbody2D rb; - private Vector2 movement; -======= private Rigidbody2D rb; + public float moveSpeed = 5f; public float jumpingPower = 5f; + private Vector2 movement; - private Animator playerAnim; //for animation + + private Animator playerAnim; private float xInput; - //helper variables private bool isGrounded = true; + [SerializeField] private float dashSpeed; [SerializeField] private float dashDuration; private float dashTime; ->>>>>>> Stashed changes - // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { rb = GetComponent(); } - // Update is called once per frame void Update() { movement.x = Input.GetAxisRaw("Horizontal"); - movement.y = Input.GetAxisRaw("Vertical"); + if (isGrounded && Input.GetKeyDown(KeyCode.Space)) { - rb.AddForce(Vector2.up * jumpingPower, ForceMode2D.Impulse); + rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower); } } private void FixedUpdate() { - rb.linearVelocity = movement.normalized * moveSpeed; + rb.linearVelocity = new Vector2(movement.x * moveSpeed, rb.linearVelocity.y); } - -} +} \ No newline at end of file From 3a4d5de03a34dbe5cc5df18f6864fd34dd708c96 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:41:23 +0200 Subject: [PATCH 10/11] current correct code inshallah --- Game/Assets/Scripts/DropletMovement.cs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index ca5702e..b070682 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -4,6 +4,7 @@ public class DropletMovement : MonoBehaviour { private Rigidbody2D rb; public float moveSpeed = 5f; + public float jumpingPower = 5f; private Vector2 movement; private Animator playerAnim; //for animation private float xInput; @@ -14,15 +15,6 @@ public class DropletMovement : MonoBehaviour [SerializeField] private float dashDuration; private float dashTime; - private Animator playerAnim; - private float xInput; - - private bool isGrounded = true; - - [SerializeField] private float dashSpeed; - [SerializeField] private float dashDuration; - private float dashTime; - void Start() { rb = GetComponent(); From 5c49f2b34b6377ad8177c6d806fce916c86ac815 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sat, 6 Jun 2026 00:49:10 +0200 Subject: [PATCH 11/11] baby is coming --- Game/Assets/Scenes/cems scene.unity | 6 +++--- Game/Assets/Scripts/DropletMovement.cs | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index 5dc4bab..f47f316 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -137,7 +137,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_GravityScale - value: 10 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.x @@ -202,11 +202,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.x - value: -6.02 + value: -3.39 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.y - value: -0.82 + value: -1 objectReference: {fileID: 0} - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} propertyPath: m_LocalPosition.z diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index b070682..9c47c33 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -10,7 +10,7 @@ public class DropletMovement : MonoBehaviour private float xInput; //helper variables - private bool isGrounded; + private bool isGrounded = true; [SerializeField] private float dashSpeed; [SerializeField] private float dashDuration; private float dashTime; @@ -24,6 +24,8 @@ public class DropletMovement : MonoBehaviour { movement.x = Input.GetAxisRaw("Horizontal"); + + if (isGrounded && Input.GetKeyDown(KeyCode.Space)) { rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower);