From 4bca00761d13b86344410168443c74ecd82dd90c Mon Sep 17 00:00:00 2001 From: Ajwad Shaikh <37571185+ajwad-shaikh@users.noreply.github.com> Date: Sun, 25 Oct 2020 01:22:02 +0530 Subject: [PATCH] Health Bar Added for both players (#11) --- Assets/AmongUsSprites/Bar.png | 3 + Assets/AmongUsSprites/Bar.png.meta | 92 ++ .../Ghost/ghostbob0001.png.meta | 3 +- .../Ghost/ghostbob0002.png.meta | 3 +- .../Ghost/ghostbob0003.png.meta | 3 +- .../Ghost/ghostbob0004.png.meta | 3 +- .../Ghost/ghostbob0005.png.meta | 3 +- .../Ghost/ghostbob0006.png.meta | 3 +- .../Ghost/ghostbob0007.png.meta | 3 +- .../Ghost/ghostbob0008.png.meta | 3 +- .../Ghost/ghostbob0009.png.meta | 3 +- .../Ghost/ghostbob0010.png.meta | 3 +- .../Ghost/ghostbob0011.png.meta | 3 +- .../Ghost/ghostbob0012.png.meta | 3 +- .../Ghost/ghostbob0013.png.meta | 3 +- .../Ghost/ghostbob0014.png.meta | 3 +- .../Ghost/ghostbob0015.png.meta | 3 +- .../Ghost/ghostbob0016.png.meta | 3 +- .../Ghost/ghostbob0017.png.meta | 3 +- .../Ghost/ghostbob0018.png.meta | 3 +- .../Ghost/ghostbob0019.png.meta | 3 +- .../Ghost/ghostbob0020.png.meta | 3 +- .../Ghost/ghostbob0021.png.meta | 3 +- .../Ghost/ghostbob0022.png.meta | 3 +- .../Ghost/ghostbob0023.png.meta | 3 +- .../Ghost/ghostbob0024.png.meta | 3 +- .../Ghost/ghostbob0025.png.meta | 3 +- .../Ghost/ghostbob0026.png.meta | 3 +- .../Ghost/ghostbob0027.png.meta | 3 +- .../Ghost/ghostbob0028.png.meta | 3 +- .../Ghost/ghostbob0029.png.meta | 3 +- .../Ghost/ghostbob0030.png.meta | 3 +- .../Ghost/ghostbob0031.png.meta | 3 +- .../Ghost/ghostbob0032.png.meta | 3 +- .../Ghost/ghostbob0033.png.meta | 3 +- .../Ghost/ghostbob0034.png.meta | 3 +- .../Ghost/ghostbob0035.png.meta | 3 +- .../Ghost/ghostbob0036.png.meta | 3 +- .../Ghost/ghostbob0037.png.meta | 3 +- .../Ghost/ghostbob0038.png.meta | 3 +- .../Ghost/ghostbob0039.png.meta | 3 +- .../Ghost/ghostbob0040.png.meta | 3 +- .../Ghost/ghostbob0041.png.meta | 3 +- .../Ghost/ghostbob0042.png.meta | 3 +- .../Ghost/ghostbob0043.png.meta | 3 +- .../Ghost/ghostbob0044.png.meta | 3 +- .../Ghost/ghostbob0045.png.meta | 3 +- .../Ghost/ghostbob0046.png.meta | 3 +- .../Ghost/ghostbob0047.png.meta | 3 +- .../Ghost/ghostbob0048.png.meta | 3 +- Assets/AmongUsSprites/Heart.png | 3 + Assets/AmongUsSprites/Heart.png.meta | 92 ++ .../Walk/walkcolor0001.png.meta | 3 +- Assets/Character/Animations/Player.controller | 96 +- Assets/Scenes/SampleScene.unity | 940 +++++++++++++++++- Assets/Scripts/Mechanics/DeathZone.cs | 2 +- Assets/Scripts/Mechanics/Health.cs | 10 + 57 files changed, 1326 insertions(+), 59 deletions(-) create mode 100644 Assets/AmongUsSprites/Bar.png create mode 100644 Assets/AmongUsSprites/Bar.png.meta create mode 100644 Assets/AmongUsSprites/Heart.png create mode 100644 Assets/AmongUsSprites/Heart.png.meta diff --git a/Assets/AmongUsSprites/Bar.png b/Assets/AmongUsSprites/Bar.png new file mode 100644 index 0000000..829be12 --- /dev/null +++ b/Assets/AmongUsSprites/Bar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1381c2d1754e5b8c213f038b0ad40d794e6371257b7a0c82b63f6a404b1e1050 +size 2358 diff --git a/Assets/AmongUsSprites/Bar.png.meta b/Assets/AmongUsSprites/Bar.png.meta new file mode 100644 index 0000000..b095826 --- /dev/null +++ b/Assets/AmongUsSprites/Bar.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 87d7374b17a90214fb97f493fe43c2f3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0001.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0001.png.meta index 38ce9b0..8021ee4 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0001.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0001.png.meta @@ -3,7 +3,7 @@ guid: a908985673a794e309c2b780c694bbb4 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0002.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0002.png.meta index 2c210f6..1c26859 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0002.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0002.png.meta @@ -3,7 +3,7 @@ guid: 9ebc8f604650d4dad82c1af3efc928d9 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0003.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0003.png.meta index ffc97a8..db3f4b0 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0003.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0003.png.meta @@ -3,7 +3,7 @@ guid: 3cc81ae54e40746e5a88e287024d120b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0004.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0004.png.meta index 9e14f1e..573a7b7 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0004.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0004.png.meta @@ -3,7 +3,7 @@ guid: dbfacf9900f4d4b089001223fe89d5f4 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0005.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0005.png.meta index bb70877..cc1c93d 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0005.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0005.png.meta @@ -3,7 +3,7 @@ guid: c5b78d3cdf601439683de4a17a930ccd TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0006.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0006.png.meta index d956ffc..2653de4 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0006.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0006.png.meta @@ -3,7 +3,7 @@ guid: 231a268a299da4b3c80dc0331aae7dc4 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0007.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0007.png.meta index 51fa1e4..41f5594 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0007.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0007.png.meta @@ -3,7 +3,7 @@ guid: fb9e67037b5f34795973db405e4d31c7 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0008.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0008.png.meta index 9a1dcf4..b90f0bb 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0008.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0008.png.meta @@ -3,7 +3,7 @@ guid: 4aa94fb7f1cf94fe7a7edbc497cdb062 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0009.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0009.png.meta index c17a882..c5c7a79 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0009.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0009.png.meta @@ -3,7 +3,7 @@ guid: 2cd4e5449bb304a3dad89893e616f82d TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0010.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0010.png.meta index c7eb488..06ab024 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0010.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0010.png.meta @@ -3,7 +3,7 @@ guid: 7c3e470a6845548df9143d4b6df713ef TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0011.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0011.png.meta index c36c002..3450c5d 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0011.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0011.png.meta @@ -3,7 +3,7 @@ guid: 7bf57ffcb69e948cd8c7f1ab65dc9cc1 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0012.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0012.png.meta index da3e812..2d64e46 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0012.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0012.png.meta @@ -3,7 +3,7 @@ guid: e51b31bfd8bed4bad8b69b8c966f6641 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0013.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0013.png.meta index 98ce278..af97ed2 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0013.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0013.png.meta @@ -3,7 +3,7 @@ guid: 756e2b21ad0954085986ec91762b9e8f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0014.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0014.png.meta index e219f7d..55f76b6 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0014.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0014.png.meta @@ -3,7 +3,7 @@ guid: 48900a17ea7304cfe8647e963833bc20 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0015.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0015.png.meta index 4d8afcd..53ccff4 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0015.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0015.png.meta @@ -3,7 +3,7 @@ guid: eb9484592d1e44222a3d559cec69f957 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0016.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0016.png.meta index b5545ae..857f3e3 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0016.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0016.png.meta @@ -3,7 +3,7 @@ guid: d5bba462ab5954eefaceac1cea7a2b9e TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0017.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0017.png.meta index 5359eb1..930840b 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0017.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0017.png.meta @@ -3,7 +3,7 @@ guid: fbf91dc7ae21347e98022c1f52e9acf7 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0018.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0018.png.meta index 7cd13fd..e7bb10c 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0018.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0018.png.meta @@ -3,7 +3,7 @@ guid: 927185a644fcd438cb4c32bf2c45a6c3 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0019.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0019.png.meta index 465066a..aa558e8 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0019.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0019.png.meta @@ -3,7 +3,7 @@ guid: b6c9ececde25241a7886a0b36e2409e1 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0020.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0020.png.meta index 7273e1b..839c4b1 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0020.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0020.png.meta @@ -3,7 +3,7 @@ guid: a9086cb88dfe148ffb8389b021070323 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0021.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0021.png.meta index cf08bea..b15bdb9 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0021.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0021.png.meta @@ -3,7 +3,7 @@ guid: 769dfafb636ca4a3c874d361c20359fe TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0022.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0022.png.meta index 632a7e8..9f67b96 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0022.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0022.png.meta @@ -3,7 +3,7 @@ guid: 1f78fabc9260340d0be3fedac8b45bd1 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0023.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0023.png.meta index ef2e918..4188d31 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0023.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0023.png.meta @@ -3,7 +3,7 @@ guid: c4a0980d8996d444fa5b049d402016ab TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0024.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0024.png.meta index d92e1c8..c9fbbb1 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0024.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0024.png.meta @@ -3,7 +3,7 @@ guid: 1d2970a83b340461fa9ebe702e6b9e3b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0025.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0025.png.meta index 33f820c..25579af 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0025.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0025.png.meta @@ -3,7 +3,7 @@ guid: b49e768261e804e93976c659be1d4ff5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0026.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0026.png.meta index 7afdbc0..7f55255 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0026.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0026.png.meta @@ -3,7 +3,7 @@ guid: 06f93ef87feb545bfb3c63d20718a909 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0027.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0027.png.meta index 33b9f6e..69d4dad 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0027.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0027.png.meta @@ -3,7 +3,7 @@ guid: 3aaa1334a35324d61968eddd8fa38ca5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0028.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0028.png.meta index 451177b..7e44014 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0028.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0028.png.meta @@ -3,7 +3,7 @@ guid: a23f249b9bdc348a5a320233930c34a3 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0029.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0029.png.meta index 3262629..7c59f79 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0029.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0029.png.meta @@ -3,7 +3,7 @@ guid: 76494f2cc906e4d498e026641a587b08 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0030.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0030.png.meta index bc3c0ba..4170c08 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0030.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0030.png.meta @@ -3,7 +3,7 @@ guid: 7515ce1856d5b431a9188ec2467131ea TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0031.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0031.png.meta index e7fb7ca..f36564a 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0031.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0031.png.meta @@ -3,7 +3,7 @@ guid: e2876b397b3654a2797fdc166f148c30 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0032.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0032.png.meta index e29e7f6..7090b97 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0032.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0032.png.meta @@ -3,7 +3,7 @@ guid: 18362dd430c5d48a993ffa440593c5f8 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0033.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0033.png.meta index a8cd961..469a54d 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0033.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0033.png.meta @@ -3,7 +3,7 @@ guid: 4377f12d686404061951296eeb82d7dc TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0034.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0034.png.meta index 8dd485c..e379ee8 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0034.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0034.png.meta @@ -3,7 +3,7 @@ guid: 963657c74aead4b7da5482d36316c097 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0035.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0035.png.meta index 53cd61c..7d93a31 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0035.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0035.png.meta @@ -3,7 +3,7 @@ guid: 545fe0d01783a49d6bccc6ac22ada0a1 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0036.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0036.png.meta index f60993b..8610844 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0036.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0036.png.meta @@ -3,7 +3,7 @@ guid: 3e94ec9a67cfa40d58c026e76f4bf5b1 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0037.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0037.png.meta index fa5a7b8..c72dd92 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0037.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0037.png.meta @@ -3,7 +3,7 @@ guid: a8041016c53f343c5834d77bca1c206b TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0038.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0038.png.meta index 153434d..520ce2c 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0038.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0038.png.meta @@ -3,7 +3,7 @@ guid: 3c6b6185c21f44ea488064a4cbeb96a5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0039.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0039.png.meta index 3fbe7e6..fb358ec 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0039.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0039.png.meta @@ -3,7 +3,7 @@ guid: 6d79a107d82ad4a468961c50ec9d6c78 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0040.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0040.png.meta index f4aa6e6..4013582 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0040.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0040.png.meta @@ -3,7 +3,7 @@ guid: 1140728f7ab67493495d6358a3b60d80 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0041.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0041.png.meta index 3d0092d..133a6cc 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0041.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0041.png.meta @@ -3,7 +3,7 @@ guid: 0e871760815b14a338216324fd1c49a5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0042.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0042.png.meta index b6e8149..76ac37d 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0042.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0042.png.meta @@ -3,7 +3,7 @@ guid: 287016010f54b411b8c1aa9b9200235f TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0043.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0043.png.meta index c4ad37c..a8041dd 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0043.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0043.png.meta @@ -3,7 +3,7 @@ guid: 95c081e2b6a754b458f01a5ec936fc77 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0044.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0044.png.meta index 6d77276..a9dcb28 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0044.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0044.png.meta @@ -3,7 +3,7 @@ guid: 45700b2f1bc10485c94829d21ef9ffc5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0045.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0045.png.meta index ddf9f44..b9db735 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0045.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0045.png.meta @@ -3,7 +3,7 @@ guid: 6522f136617554fde81db39f85d540e8 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0046.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0046.png.meta index 4981c0f..e781c7e 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0046.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0046.png.meta @@ -3,7 +3,7 @@ guid: 3b24d7776f25c426da1d8c38c1585d19 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0047.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0047.png.meta index f878b7b..ed9d844 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0047.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0047.png.meta @@ -3,7 +3,7 @@ guid: 351ff0db62ad2473dbcc5b7e014f5458 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Ghost/ghostbob0048.png.meta b/Assets/AmongUsSprites/Ghost/ghostbob0048.png.meta index 1014875..9f5487c 100644 --- a/Assets/AmongUsSprites/Ghost/ghostbob0048.png.meta +++ b/Assets/AmongUsSprites/Ghost/ghostbob0048.png.meta @@ -3,7 +3,7 @@ guid: 8c7fe55be4fec4871bd529f222ce4913 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/AmongUsSprites/Heart.png b/Assets/AmongUsSprites/Heart.png new file mode 100644 index 0000000..6dd45f0 --- /dev/null +++ b/Assets/AmongUsSprites/Heart.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50faa2ae0775d9dd86803ed41257cdaf90dc73b34e9c636ef081eb1828d4c0b8 +size 2430 diff --git a/Assets/AmongUsSprites/Heart.png.meta b/Assets/AmongUsSprites/Heart.png.meta new file mode 100644 index 0000000..bf48713 --- /dev/null +++ b/Assets/AmongUsSprites/Heart.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 25998a46ce6917443aa4153ab177a38a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmongUsSprites/Walk/walkcolor0001.png.meta b/Assets/AmongUsSprites/Walk/walkcolor0001.png.meta index 9518a4a..ca3176e 100644 --- a/Assets/AmongUsSprites/Walk/walkcolor0001.png.meta +++ b/Assets/AmongUsSprites/Walk/walkcolor0001.png.meta @@ -3,7 +3,7 @@ guid: 990172da1192a4bfa8489432e1340ca0 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,6 +57,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/Assets/Character/Animations/Player.controller b/Assets/Character/Animations/Player.controller index 566f605..afc226c 100644 --- a/Assets/Character/Animations/Player.controller +++ b/Assets/Character/Animations/Player.controller @@ -27,6 +27,55 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-2108473451159713952 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102433169737779366} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9833452 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-488254319435525451 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player-Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2108473451159713952} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 18f95f410194b8b4ba5ea2a20c40dd74, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -41,37 +90,43 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: velocityY m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: hurt m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: dead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: victory m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -201,6 +256,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1102101735027427872} m_Position: {x: 408, y: -360, z: 0} + - serializedVersion: 1 + m_State: {fileID: -488254319435525451} + m_Position: {x: 160, y: -440, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 1101020438278029396} @@ -721,6 +779,7 @@ AnimatorState: m_Transitions: - {fileID: 1101496968763563110} - {fileID: 1101650061105857342} + - {fileID: 7137875049214910004} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -943,6 +1002,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &7137875049214910004 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -488254319435525451} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.001299113 + m_TransitionOffset: 0.007604473 + m_ExitTime: 0.957794 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &8078540137998788633 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 0c004a9..7dbb74e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -121,6 +121,80 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &30116486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 30116487} + - component: {fileID: 30116489} + - component: {fileID: 30116488} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &30116487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30116486} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 119621580} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &30116488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30116486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &30116489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 30116486} + m_CullTransparentMesh: 0 --- !u!1 &30668784 GameObject: m_ObjectHideFlags: 0 @@ -187,6 +261,244 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &39887614 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 39887615} + - component: {fileID: 39887617} + - component: {fileID: 39887616} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &39887615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39887614} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 323331767} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &39887616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39887614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &39887617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39887614} + m_CullTransparentMesh: 0 +--- !u!1 &119621579 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 119621580} + - component: {fileID: 119621581} + m_Layer: 5 + m_Name: HealthBarImpostor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &119621580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119621579} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 30116487} + - {fileID: 1226992860} + - {fileID: 915727331} + - {fileID: 402120242} + m_Father: {fileID: 1569749304} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -200, y: 132.66} + m_SizeDelta: {x: 80, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &119621581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 119621579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 30116487} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 100 + m_WholeNumbers: 1 + m_Value: 80 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &124732000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 124732001} + - component: {fileID: 124732003} + - component: {fileID: 124732002} + m_Layer: 5 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &124732001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 124732000} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 323331767} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 13.400002, y: 0.0000019073} + m_SizeDelta: {x: 18, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &124732002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 124732000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9048e1725a9058b40bc84e23fbcd69a6, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &124732003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 124732000} + m_CullTransparentMesh: 0 --- !u!1001 &147844362 PrefabInstance: m_ObjectHideFlags: 0 @@ -485,7 +797,38 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ffad43bb006db4856a9c527b89b48db9, type: 3} m_Name: m_EditorClassIdentifier: - maxHP: 5 + maxHP: 15 + slider: {fileID: 119621581} + gradient: + serializedVersion: 2 + key0: {r: 0.90196085, g: 0.054901965, b: 0.1137255, a: 1} + key1: {r: 0.9100718, g: 0.9528302, b: 0, a: 1} + key2: {r: 0.033018887, g: 1, b: 0.13648736, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 19275 + ctime1: 50501 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 2 + fill: {fileID: 30116488} --- !u!1 &292457041 GameObject: m_ObjectHideFlags: 0 @@ -1045,6 +1388,170 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a1bd12ebb35d4dc997aa0c5494eda9b, type: 3} +--- !u!1 &323331766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 323331767} + - component: {fileID: 323331768} + m_Layer: 5 + m_Name: HealthBarCrewmate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &323331767 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323331766} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 39887615} + - {fileID: 869972690} + - {fileID: 1096123455} + - {fileID: 124732001} + m_Father: {fileID: 1569749304} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 200, y: 132.66} + m_SizeDelta: {x: 80, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &323331768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323331766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 39887615} + m_HandleRect: {fileID: 0} + m_Direction: 1 + m_MinValue: 0 + m_MaxValue: 100 + m_WholeNumbers: 1 + m_Value: 80 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &402120241 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 402120242} + - component: {fileID: 402120244} + - component: {fileID: 402120243} + m_Layer: 5 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &402120242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402120241} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 119621580} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -17.599998, y: -0.0000038147} + m_SizeDelta: {x: 18, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &402120243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402120241} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cdb9cab623eb1c84a927d5a99bde0894, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &402120244 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402120241} + m_CullTransparentMesh: 0 --- !u!1 &419576585 GameObject: m_ObjectHideFlags: 0 @@ -5326,6 +5833,80 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &869972689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 869972690} + - component: {fileID: 869972692} + - component: {fileID: 869972691} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &869972690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869972689} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 323331767} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &869972691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869972689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.41176474, g: 0.41176474, b: 0.41176474, a: 1} + m_RaycastTarget: 1 + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 87d7374b17a90214fb97f493fe43c2f3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &869972692 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869972689} + m_CullTransparentMesh: 0 --- !u!1 &901665978 GameObject: m_ObjectHideFlags: 0 @@ -5383,6 +5964,80 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &915727330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 915727331} + - component: {fileID: 915727333} + - component: {fileID: 915727332} + m_Layer: 5 + m_Name: Heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &915727331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915727330} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 119621580} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0.0000038146973, y: -0.0000066757} + m_SizeDelta: {x: 13, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &915727332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915727330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 25998a46ce6917443aa4153ab177a38a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &915727333 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915727330} + m_CullTransparentMesh: 0 --- !u!1 &1063126317 GameObject: m_ObjectHideFlags: 0 @@ -5497,6 +6152,254 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1096123454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1096123455} + - component: {fileID: 1096123457} + - component: {fileID: 1096123456} + m_Layer: 5 + m_Name: Heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1096123455 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096123454} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 323331767} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -2.0999985, y: -0.0000066757} + m_SizeDelta: {x: 13, y: 12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1096123456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096123454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 25998a46ce6917443aa4153ab177a38a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1096123457 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096123454} + m_CullTransparentMesh: 0 +--- !u!1 &1226992859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1226992860} + - component: {fileID: 1226992862} + - component: {fileID: 1226992861} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1226992860 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226992859} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 119621580} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1226992861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226992859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.41176474, g: 0.41176474, b: 0.41176474, a: 1} + m_RaycastTarget: 1 + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 87d7374b17a90214fb97f493fe43c2f3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1226992862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226992859} + m_CullTransparentMesh: 0 +--- !u!1 &1569749300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1569749304} + - component: {fileID: 1569749303} + - component: {fileID: 1569749302} + - component: {fileID: 1569749301} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1569749301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1569749300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1569749302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1569749300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1569749303 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1569749300} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 519420031} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 10 + m_TargetDisplay: 0 +--- !u!224 &1569749304 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1569749300} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 119621580} + - {fileID: 323331767} + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!60 &1665035850 stripped PolygonCollider2D: m_CorrespondingSourceObject: {fileID: 5102505034379151492, guid: 6f545478bd0fb7a478ed6f674a5210f5, @@ -5760,7 +6663,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: a0d529ab1f74ac44f92b43cf8c384f48, type: 3} m_Color: {r: 0, g: 1, b: 0.95156765, a: 1} m_FlipX: 1 @@ -5889,4 +6792,35 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ffad43bb006db4856a9c527b89b48db9, type: 3} m_Name: m_EditorClassIdentifier: - maxHP: 5 + maxHP: 15 + slider: {fileID: 323331768} + gradient: + serializedVersion: 2 + key0: {r: 0.90196085, g: 0.054901965, b: 0.1137255, a: 1} + key1: {r: 0.9100718, g: 0.9528302, b: 0, a: 1} + key2: {r: 0.033018887, g: 1, b: 0.13648736, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 19275 + ctime1: 50501 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 2 + fill: {fileID: 39887616} diff --git a/Assets/Scripts/Mechanics/DeathZone.cs b/Assets/Scripts/Mechanics/DeathZone.cs index 82d137c..8c5aaf0 100644 --- a/Assets/Scripts/Mechanics/DeathZone.cs +++ b/Assets/Scripts/Mechanics/DeathZone.cs @@ -20,7 +20,7 @@ void OnTriggerEnter2D(Collider2D collider) { var ev = Schedule(0); ev.deathzone = this; - health.Die(); + health.Decrement(); } } diff --git a/Assets/Scripts/Mechanics/Health.cs b/Assets/Scripts/Mechanics/Health.cs index 95bf9c4..060d6ea 100644 --- a/Assets/Scripts/Mechanics/Health.cs +++ b/Assets/Scripts/Mechanics/Health.cs @@ -1,6 +1,7 @@ using System; using Platformer.Gameplay; using UnityEngine; +using UnityEngine.UI; using static Platformer.Core.Simulation; namespace Platformer.Mechanics @@ -14,6 +15,9 @@ public class Health : MonoBehaviour /// The maximum hit points for the entity. /// public int maxHP = 1; + public Slider slider; + public Gradient gradient; + public Image fill; /// /// Indicates if the entity should be considered 'alive'. @@ -28,6 +32,8 @@ public class Health : MonoBehaviour public void Increment() { currentHP = Mathf.Clamp(currentHP + 1, 0, maxHP); + slider.value = currentHP; + fill.color = gradient.Evaluate(slider.normalizedValue); } /// @@ -42,6 +48,8 @@ public void Decrement() var ev = Schedule(); ev.health = this; } + slider.value = currentHP; + fill.color = gradient.Evaluate(slider.normalizedValue); } /// @@ -55,6 +63,8 @@ public void Die() void Awake() { currentHP = maxHP; + slider.maxValue = maxHP; + fill.color = gradient.Evaluate(slider.normalizedValue); } } }