diff --git a/Game/.vscode/extensions.json b/Game/.vscode/extensions.json new file mode 100644 index 0000000..ddb6ff8 --- /dev/null +++ b/Game/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/Game/.vscode/launch.json b/Game/.vscode/launch.json new file mode 100644 index 0000000..da60e25 --- /dev/null +++ b/Game/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/Game/.vscode/settings.json b/Game/.vscode/settings.json new file mode 100644 index 0000000..346e89e --- /dev/null +++ b/Game/.vscode/settings.json @@ -0,0 +1,72 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.vs": true, + "**/.gitmodules": true, + "**/.vsconfig": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "Logs/": true, + "logs/": true, + "ProjectSettings/": true, + "UserSettings/": true, + "temp/": true, + "Temp/": true + }, + "files.associations": { + "*.asset": "yaml", + "*.meta": "yaml", + "*.prefab": "yaml", + "*.unity": "yaml", + }, + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.patterns": { + "*.sln": "*.csproj", + "*.slnx": "*.csproj" + }, + "dotnet.defaultSolution": "Game.slnx", + "dotnet.enableWorkspaceBasedDevelopment": false +} \ No newline at end of file diff --git a/Game/Assets/Images/idle sprites.PNG b/Game/Assets/Images/idle sprites.PNG new file mode 100644 index 0000000..2ea3442 Binary files /dev/null and b/Game/Assets/Images/idle sprites.PNG differ diff --git a/Game/Assets/Images/idle sprites.PNG.meta b/Game/Assets/Images/idle sprites.PNG.meta new file mode 100644 index 0000000..a678d88 --- /dev/null +++ b/Game/Assets/Images/idle sprites.PNG.meta @@ -0,0 +1,468 @@ +fileFormatVersion: 2 +guid: 640e946956ffb084c8d0f325a978f7be +TextureImporter: + internalIDToNameTable: + - first: + 213: -5254763888643210246 + second: idle sprites_0 + - first: + 213: 6308160273899767728 + second: idle sprites_1 + - first: + 213: -8810144250521748931 + second: idle sprites_2 + - first: + 213: 8716055518302679110 + second: idle sprites_3 + - first: + 213: -2831101797488401219 + second: idle sprites_4 + - first: + 213: 7011392334922980725 + second: idle sprites_5 + - first: + 213: 2847488349268310368 + second: idle sprites_6 + - first: + 213: -7052100710175725327 + second: idle sprites_7 + - first: + 213: 9099921138643276957 + second: idle sprites_8 + - first: + 213: 9079650132197346216 + second: idle sprites_9 + - first: + 213: -2803174831038805257 + second: idle sprites_10 + - first: + 213: -4434201147178631899 + second: idle sprites_11 + - first: + 213: 2832486465855652433 + second: idle sprites_12 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: idle sprites_0 + rect: + serializedVersion: 2 + x: 0 + y: 729 + width: 6 + height: 13 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: af30fde85145317b0800000000000000 + internalID: -5254763888643210246 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_1 + rect: + serializedVersion: 2 + x: 11 + y: 700 + width: 156 + height: 104 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 0b7c608d8561b8750800000000000000 + internalID: 6308160273899767728 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_2 + rect: + serializedVersion: 2 + x: 182 + y: 702 + width: 155 + height: 92 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d3a73b77b741cb580800000000000000 + internalID: -8810144250521748931 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_3 + rect: + serializedVersion: 2 + x: 343 + y: 702 + width: 155 + height: 87 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 640b3037056a5f870800000000000000 + internalID: 8716055518302679110 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_4 + rect: + serializedVersion: 2 + x: 506 + y: 702 + width: 163 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: db4ebbd3ae7e5b8d0800000000000000 + internalID: -2831101797488401219 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_5 + rect: + serializedVersion: 2 + x: 674 + y: 699 + width: 168 + height: 81 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 57d1bff3e287d4160800000000000000 + internalID: 7011392334922980725 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_6 + rect: + serializedVersion: 2 + x: 852 + y: 699 + width: 177 + height: 76 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 0697338219f448720800000000000000 + internalID: 2847488349268310368 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_7 + rect: + serializedVersion: 2 + x: 1045 + y: 704 + width: 182 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1f822b984c7e12e90800000000000000 + internalID: -7052100710175725327 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_8 + rect: + serializedVersion: 2 + x: 1241 + y: 706 + width: 176 + height: 68 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d9496e8ef0a694e70800000000000000 + internalID: 9099921138643276957 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_9 + rect: + serializedVersion: 2 + x: 1427 + y: 703 + width: 163 + height: 84 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8ab837e60b5610e70800000000000000 + internalID: 9079650132197346216 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_10 + rect: + serializedVersion: 2 + x: 1596 + y: 706 + width: 154 + height: 92 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7facd90d75f1919d0800000000000000 + internalID: -2803174831038805257 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_11 + rect: + serializedVersion: 2 + x: 1751 + y: 728 + width: 7 + height: 13 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 52db9cfcc8d8672c0800000000000000 + internalID: -4434201147178631899 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: idle sprites_12 + rect: + serializedVersion: 2 + x: 1763 + y: 699 + width: 156 + height: 104 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1528d6cfe630f4720800000000000000 + internalID: 2832486465855652433 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + idle sprites_0: -5254763888643210246 + idle sprites_1: 6308160273899767728 + idle sprites_10: -2803174831038805257 + idle sprites_11: -4434201147178631899 + idle sprites_12: 2832486465855652433 + idle sprites_2: -8810144250521748931 + idle sprites_3: 8716055518302679110 + idle sprites_4: -2831101797488401219 + idle sprites_5: 7011392334922980725 + idle sprites_6: 2847488349268310368 + idle sprites_7: -7052100710175725327 + idle sprites_8: 9099921138643276957 + idle sprites_9: 9079650132197346216 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index cd8b0b6..400991a 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -125,6 +125,7 @@ public class DropletMovement : MonoBehaviour private IEnumerator DropRoutine() { Collider2D playerCollider = GetComponent(); + rb = GetComponent(); playerCollider.isTrigger = true; @@ -137,12 +138,15 @@ public class DropletMovement : MonoBehaviour while (elapsed < duration) { + rb.gravityScale = 0; transform.Translate(Vector3.down * speed * Time.deltaTime); elapsed += Time.deltaTime; //update time yield return null; } //enable collider --> not a trigger anymore + rb.gravityScale = 1; playerCollider.isTrigger = false; + } } \ No newline at end of file