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