From 951b815f5c359cfc2e80550786bcff236c8c5bfc Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 10:30:04 +0200 Subject: [PATCH 1/3] bottom border --> destroy object --- Game/Assets/Materials.meta | 8 + .../Materials/droplet_mat.physicsMaterial2D | 14 ++ .../droplet_mat.physicsMaterial2D.meta | 8 + Game/Assets/Prefabs/BottomBorder.prefab | 140 ++++++++++++++++++ Game/Assets/Prefabs/BottomBorder.prefab.meta | 7 + Game/Assets/Prefabs/PlayerDroplet.prefab | 2 +- Game/Assets/Scripts/DropletMovement.cs | 11 +- Game/Packages/manifest.json | 2 + Game/Packages/packages-lock.json | 50 ++++++- .../com.unity.ai.assistant/Settings.json | 8 + 10 files changed, 243 insertions(+), 7 deletions(-) create mode 100644 Game/Assets/Materials.meta create mode 100644 Game/Assets/Materials/droplet_mat.physicsMaterial2D create mode 100644 Game/Assets/Materials/droplet_mat.physicsMaterial2D.meta create mode 100644 Game/Assets/Prefabs/BottomBorder.prefab create mode 100644 Game/Assets/Prefabs/BottomBorder.prefab.meta create mode 100644 Game/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json diff --git a/Game/Assets/Materials.meta b/Game/Assets/Materials.meta new file mode 100644 index 0000000..bbeecda --- /dev/null +++ b/Game/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e256b7a17137934da05d27d3fe43269 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Materials/droplet_mat.physicsMaterial2D b/Game/Assets/Materials/droplet_mat.physicsMaterial2D new file mode 100644 index 0000000..c6e2ef8 --- /dev/null +++ b/Game/Assets/Materials/droplet_mat.physicsMaterial2D @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: droplet_mat + serializedVersion: 2 + friction: 0.4 + bounciness: 0.4 + m_FrictionCombine: 1 + m_BounceCombine: 4 diff --git a/Game/Assets/Materials/droplet_mat.physicsMaterial2D.meta b/Game/Assets/Materials/droplet_mat.physicsMaterial2D.meta new file mode 100644 index 0000000..00bdf41 --- /dev/null +++ b/Game/Assets/Materials/droplet_mat.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 337b322827b169942b2fc112eaecc384 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Prefabs/BottomBorder.prefab b/Game/Assets/Prefabs/BottomBorder.prefab new file mode 100644 index 0000000..d5ab937 --- /dev/null +++ b/Game/Assets/Prefabs/BottomBorder.prefab @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2217298787221768457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6697231539295441165} + - component: {fileID: 5414581434838103820} + - component: {fileID: -5774478715409898150} + m_Layer: 0 + m_Name: BottomBorder + m_TagString: Border + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6697231539295441165 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217298787221768457} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -4.5, z: 0} + m_LocalScale: {x: 22.340736, y: 0.9602, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5414581434838103820 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217298787221768457} + 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.49019608} + 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!61 &-5774478715409898150 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2217298787221768457} + 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: 1 + 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 diff --git a/Game/Assets/Prefabs/BottomBorder.prefab.meta b/Game/Assets/Prefabs/BottomBorder.prefab.meta new file mode 100644 index 0000000..15692b2 --- /dev/null +++ b/Game/Assets/Prefabs/BottomBorder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index 4763d82..088b6b5 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -133,7 +133,7 @@ BoxCollider2D: m_Enabled: 1 serializedVersion: 3 m_Density: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 337b322827b169942b2fc112eaecc384, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 16ae113..a8b8166 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -75,11 +75,14 @@ public class DropletMovement : MonoBehaviour rb.linearVelocity = new Vector2(movement.x * moveSpeed, rb.linearVelocity.y); } - /*void OnCollisionEnter2D(Collision2D collision) + private void OnTriggerEnter2D(Collider2D other) { - //if (collision.collider.GetType() == typeof(BoxCollider) && collision.collider.GetComponent == ) { - Destroy(gameObject); //base: destroys the game object - }*/ + if (other.CompareTag("Border")) + { + Destroy(gameObject); //for now it destroys the droplet + Debug.Log("Droplet dropped down, animation, game end!"); + } + } private IEnumerator Dash() { diff --git a/Game/Packages/manifest.json b/Game/Packages/manifest.json index a81a312..6b54c04 100644 --- a/Game/Packages/manifest.json +++ b/Game/Packages/manifest.json @@ -8,6 +8,8 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap.extras": "7.0.1", "com.unity.2d.tooling": "2.0.2", + "com.unity.ai.assistant": "2.11.0-pre.1", + "com.unity.ai.inference": "2.6.1", "com.unity.collab-proxy": "2.12.4", "com.unity.ide.rider": "3.0.40", "com.unity.ide.visualstudio": "2.0.27", diff --git a/Game/Packages/packages-lock.json b/Game/Packages/packages-lock.json index fecc0d9..bfe6091 100644 --- a/Game/Packages/packages-lock.json +++ b/Game/Packages/packages-lock.json @@ -99,9 +99,36 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.assistant": { + "version": "2.11.0-pre.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.mathematics": "1.3.2", + "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.modules.uielements": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ai.inference": { + "version": "2.6.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.17", + "com.unity.dt.app-ui": "1.3.6", + "com.unity.collections": "2.4.3", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.imageconversion": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.29", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", @@ -128,6 +155,18 @@ "com.unity.test-framework.performance": "3.0.3" } }, + "com.unity.dt.app-ui": { + "version": "2.1.1", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.screencapture": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, @@ -178,7 +217,14 @@ }, "com.unity.nuget.mono-cecil": { "version": "1.11.6", - "depth": 2, + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.2", + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" diff --git a/Game/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json b/Game/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json new file mode 100644 index 0000000..84a24e4 --- /dev/null +++ b/Game/ProjectSettings/Packages/com.unity.ai.assistant/Settings.json @@ -0,0 +1,8 @@ +{ + "CustomInstructionsGUID": "", + "CheckpointEnabled": false, + "GitInstanceTypeValue": 0, + "CustomGitPath": "", + "CheckpointRetentionWeeks": 2, + "PlanExecutionPromptDismissed": false +} \ No newline at end of file From 5d1f7794dc4308224981bb36943074d2f5c37792 Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 10:53:59 +0200 Subject: [PATCH 2/3] animation (i messed up smth) --- Game/Assets/Prefabs/PlayerDroplet.prefab | 8 +- Game/Assets/Scenes/MainScene.unity | 356 ++++++------------ Game/Assets/Scenes/cems scene.unity | 4 + .../ProjectSettings/EditorBuildSettings.asset | 1 + Game/ProjectSettings/ProjectSettings.asset | 3 +- Game/ProjectSettings/TagManager.asset | 6 +- 6 files changed, 136 insertions(+), 242 deletions(-) diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index 088b6b5..2ec6d8f 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -82,8 +82,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -925020913 + m_SortingLayer: 1 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3} @@ -157,7 +157,7 @@ BoxCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0, y: 0.6} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -181,7 +181,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64d83d81ffe9aeb419af4eb171357948, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::DropletMovement - jumpingPower: 2 + jumpingPower: 6 moveSpeed: 5 dashingPower: 24 dashingTime: 0.2 diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index eeb7fe3..ef562bd 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -119,97 +119,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &85557396 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 85557398} - - component: {fileID: 85557397} - m_Layer: 0 - m_Name: BottomBorder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &85557397 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 85557396} - 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: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 ---- !u!4 &85557398 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 85557396} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -4.5, z: 0} - m_LocalScale: {x: 22.340736, y: 0.9602, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &274994935 PrefabInstance: m_ObjectHideFlags: 0 @@ -267,149 +176,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} ---- !u!1001 &279662124 -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: 10 - objectReference: {fileID: 0} - - target: {fileID: -8535381027169538, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: jumpingPower - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 218454750066863599, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_SpriteTilingProperty.pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 218454750066863599, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 1.5615249 - objectReference: {fileID: 0} - - target: {fileID: 218454750066863599, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 1.04 - 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_Constraints - value: 4 - 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: 5 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalScale.y - value: 0.5957 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalPosition.x - value: -4.63 - objectReference: {fileID: 0} - - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_LocalPosition.y - value: 3.74 - 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} - - target: {fileID: 8298564220872302505, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: -7792483657037416151, guid: 3f7d9158938a30f4fb279dac54851345, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - insertIndex: -1 - addedObject: {fileID: 279662126} - - targetCorrespondingSourceObject: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - insertIndex: -1 - addedObject: {fileID: 279662132} - m_SourcePrefab: {fileID: 100100000, guid: d56297e435f8410a584581d73d99d2e4, type: 3} ---- !u!1 &279662125 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} - m_PrefabInstance: {fileID: 279662124} - m_PrefabAsset: {fileID: 0} ---- !u!114 &279662126 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 279662125} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b3b9fc97a2d39d2d84c4be43a79247a, type: 3} - m_Name: - m_EditorClassIdentifier: '::' - threshold: 0.05 - multiplier: 5 ---- !u!111 &279662132 -Animation: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 279662125} - m_Enabled: 1 - serializedVersion: 4 - m_Animation: {fileID: 0} - m_Animations: - - {fileID: 7400000, guid: 9c05e7e3341328e45b70c952167a4bfd, type: 2} - m_WrapMode: 0 - m_PlayAutomatically: 1 - m_AnimatePhysics: 0 - m_UpdateMode: 0 - m_CullingType: 0 --- !u!1 &357828117 GameObject: m_ObjectHideFlags: 0 @@ -666,6 +432,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} m_PrefabInstance: {fileID: 274994935} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1445156949 +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: -4.361964 + objectReference: {fileID: 0} + - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_LocalPosition.y + value: 4.1920695 + 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!4 &1710653547 stripped Transform: m_CorrespondingSourceObject: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3} @@ -824,12 +647,73 @@ Transform: - {fileID: 1710653547} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3635665845719097076 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2217298787221768457, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_Name + value: BottomBorder + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalScale.y + value: 1.4184074 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalPosition.y + value: -4.2709 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6697231539295441165, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dd4bf1c5ed97e7440aee00bd7e3ac1b6, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 505713151} - - {fileID: 279662124} - {fileID: 357828119} - {fileID: 2072448676} - - {fileID: 85557398} + - {fileID: 3635665845719097076} + - {fileID: 1445156949} diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index 4f44f2c..51b032d 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -131,6 +131,10 @@ PrefabInstance: propertyPath: moveSpeed value: 5 objectReference: {fileID: 0} + - target: {fileID: 218454750066863599, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Offset.y + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 2141180002423843430, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_Name value: PlayerDroplet diff --git a/Game/ProjectSettings/EditorBuildSettings.asset b/Game/ProjectSettings/EditorBuildSettings.asset index 835c33f..035080d 100644 --- a/Game/ProjectSettings/EditorBuildSettings.asset +++ b/Game/ProjectSettings/EditorBuildSettings.asset @@ -9,4 +9,5 @@ EditorBuildSettings: path: Assets/Scenes/SampleScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 m_configObjects: + com.unity.dt.app-ui: {fileID: 11400000, guid: 1b1c20d82303e4b5781c3ef50ac1449f, type: 2} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} diff --git a/Game/ProjectSettings/ProjectSettings.asset b/Game/ProjectSettings/ProjectSettings.asset index 5af14e7..00319d1 100644 --- a/Game/ProjectSettings/ProjectSettings.asset +++ b/Game/ProjectSettings/ProjectSettings.asset @@ -777,7 +777,8 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 webEnableSubmoduleStrippingCompatibility: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + WebGL: SENTIS_ANALYTICS_ENABLED;APP_UI_EDITOR_ONLY additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: diff --git a/Game/ProjectSettings/TagManager.asset b/Game/ProjectSettings/TagManager.asset index 9b79b97..5ce7257 100644 --- a/Game/ProjectSettings/TagManager.asset +++ b/Game/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 3 - tags: [] + tags: + - Border layers: - Default - TransparentFX @@ -44,6 +45,9 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + - name: front + uniqueID: 3369946383 + locked: 0 m_RenderingLayers: - Default m_MigratedRenderPipelines: [] From c62acdf968e9a2fff0b141d8ccab96df3a94aacc Mon Sep 17 00:00:00 2001 From: orsolya-st Date: Sat, 6 Jun 2026 11:01:04 +0200 Subject: [PATCH 3/3] bug fix --- Game/Assets/Prefabs/PlayerDroplet.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Game/Assets/Prefabs/PlayerDroplet.prefab b/Game/Assets/Prefabs/PlayerDroplet.prefab index 2ec6d8f..116eab7 100644 --- a/Game/Assets/Prefabs/PlayerDroplet.prefab +++ b/Game/Assets/Prefabs/PlayerDroplet.prefab @@ -122,7 +122,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!61 &218454750066863599 BoxCollider2D: m_ObjectHideFlags: 0 @@ -181,7 +181,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64d83d81ffe9aeb419af4eb171357948, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::DropletMovement - jumpingPower: 6 + jumpingPower: 7 moveSpeed: 5 dashingPower: 24 dashingTime: 0.2