diff --git a/Assets/Resources/Berries/AntiBerry.png.meta b/Assets/Resources/Berries/AntiBerry.png.meta index 1e86ce3..94fded9 100644 --- a/Assets/Resources/Berries/AntiBerry.png.meta +++ b/Assets/Resources/Berries/AntiBerry.png.meta @@ -37,7 +37,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -75,7 +75,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -129,12 +129,12 @@ TextureImporter: name: AntiBerry_0 rect: serializedVersion: 2 - x: 7 - y: 3 - width: 114 - height: 122 + x: 0 + y: 0 + width: 128 + height: 128 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -151,7 +151,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: c6f1ee0bcf05d4bdf8b2997575eca0b5 internalID: 0 vertices: [] indices: diff --git a/Assets/Resources/Berries/Berry.png.meta b/Assets/Resources/Berries/Berry.png.meta index 02e43ae..0e8926a 100644 --- a/Assets/Resources/Berries/Berry.png.meta +++ b/Assets/Resources/Berries/Berry.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Berries/BerryBase.png b/Assets/Resources/Berries/BerryBase.png deleted file mode 100644 index 1127135..0000000 Binary files a/Assets/Resources/Berries/BerryBase.png and /dev/null differ diff --git a/Assets/Resources/Berries/BerryBlackAndWhite.png b/Assets/Resources/Berries/BerryBlackAndWhite.png deleted file mode 100644 index 3693aef..0000000 Binary files a/Assets/Resources/Berries/BerryBlackAndWhite.png and /dev/null differ diff --git a/Assets/Resources/Berries/BerryBlackAndWhite.png.meta b/Assets/Resources/Berries/BerryBlackAndWhite.png.meta deleted file mode 100644 index dbcbb5f..0000000 --- a/Assets/Resources/Berries/BerryBlackAndWhite.png.meta +++ /dev/null @@ -1,611 +0,0 @@ -fileFormatVersion: 2 -guid: 1e20ea4e93e07440892d798f17e41bad -TextureImporter: - internalIDToNameTable: - - first: - 213: -616364230193366849 - second: BerryBlackAndWhite_0 - - first: - 213: 6685362526263044540 - second: BerryBlackAndWhite_1 - - first: - 213: -9118840095360118304 - second: BerryBlackAndWhite_2 - - first: - 213: -615688528827855246 - second: BerryBlackAndWhite_3 - - first: - 213: -3463087151951401251 - second: BerryBlackAndWhite_4 - - first: - 213: 3862539080958380021 - second: BerryBlackAndWhite_5 - - first: - 213: 6057435354215509935 - second: BerryBlackAndWhite_6 - - first: - 213: -717543955234921905 - second: BerryBlackAndWhite_7 - - first: - 213: -3068219435190899181 - second: BerryBlackAndWhite_8 - - first: - 213: -3694163523274229928 - second: BerryBlackAndWhite_9 - - first: - 213: -184920096677565343 - second: BerryBlackAndWhite_10 - - first: - 213: 8060966420184180134 - second: BerryBlackAndWhite_11 - - first: - 213: -4736570087883412996 - second: BerryBlackAndWhite_12 - - first: - 213: -5456060970309705812 - second: BerryBlackAndWhite_13 - - first: - 213: 5313231529009540679 - second: BerryBlackAndWhite_14 - - first: - 213: -3377632519767745330 - second: BerryBlackAndWhite_15 - - first: - 213: -4940035662824615856 - second: BerryBlackAndWhite_16 - - first: - 213: 3984875955374476231 - second: BerryBlackAndWhite_17 - 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: Android - 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: iOS - 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: BerryBlackAndWhite_0 - rect: - serializedVersion: 2 - x: 9 - y: 71 - width: 28 - height: 30 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: fb8311f8ffb3277f0800000000000000 - internalID: -616364230193366849 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_1 - rect: - serializedVersion: 2 - x: 26 - y: 56 - width: 20 - height: 24 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: cb9ed9c0ccd27cc50800000000000000 - internalID: 6685362526263044540 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_2 - rect: - serializedVersion: 2 - x: 35 - y: 77 - width: 25 - height: 21 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 0e198783f3f537180800000000000000 - internalID: -9118840095360118304 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_3 - rect: - serializedVersion: 2 - x: 44 - y: 61 - width: 28 - height: 27 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 27eceea8b82a477f0800000000000000 - internalID: -615688528827855246 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_4 - rect: - serializedVersion: 2 - x: 60 - y: 75 - width: 29 - height: 27 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: ddea7b16594a0ffc0800000000000000 - internalID: -3463087151951401251 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_5 - rect: - serializedVersion: 2 - x: 69 - y: 61 - width: 26 - height: 22 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 5f7869b54de7a9530800000000000000 - internalID: 3862539080958380021 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_6 - rect: - serializedVersion: 2 - x: 89 - y: 78 - width: 22 - height: 18 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: faf68e96c55501450800000000000000 - internalID: 6057435354215509935 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_7 - rect: - serializedVersion: 2 - x: 92 - y: 67 - width: 10 - height: 11 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: f426e7d0395ca06f0800000000000000 - internalID: -717543955234921905 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_8 - rect: - serializedVersion: 2 - x: 98 - y: 57 - width: 19 - height: 21 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 31e2f780eae7b65d0800000000000000 - internalID: -3068219435190899181 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_9 - rect: - serializedVersion: 2 - x: 9 - y: 35 - width: 28 - height: 37 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 857b80d19d1bbbcc0800000000000000 - internalID: -3694163523274229928 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_10 - rect: - serializedVersion: 2 - x: 27 - y: 10 - width: 30 - height: 31 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 16ce3bdd6280f6df0800000000000000 - internalID: -184920096677565343 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_11 - rect: - serializedVersion: 2 - x: 35 - y: 40 - width: 25 - height: 23 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 6a52e65104e4edf60800000000000000 - internalID: 8060966420184180134 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_12 - rect: - serializedVersion: 2 - x: 54 - y: 33 - width: 24 - height: 31 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: cf9e7f9b992544eb0800000000000000 - internalID: -4736570087883412996 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_13 - rect: - serializedVersion: 2 - x: 74 - y: 36 - width: 25 - height: 31 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: caf11d7747d2844b0800000000000000 - internalID: -5456060970309705812 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_14 - rect: - serializedVersion: 2 - x: 75 - y: 25 - width: 11 - height: 15 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 74ee408cce36cb940800000000000000 - internalID: 5313231529009540679 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_15 - rect: - serializedVersion: 2 - x: 85 - y: 16 - width: 24 - height: 24 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: ecc9f656e1d3021d0800000000000000 - internalID: -3377632519767745330 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_16 - rect: - serializedVersion: 2 - x: 91 - y: 34 - width: 28 - height: 25 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 050d393fcb7717bb0800000000000000 - internalID: -4940035662824615856 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: BerryBlackAndWhite_17 - rect: - serializedVersion: 2 - x: 55 - y: 5 - width: 30 - height: 29 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 7cb4712919f1d4730800000000000000 - internalID: 3984875955374476231 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - BerryBlackAndWhite_0: -616364230193366849 - BerryBlackAndWhite_1: 6685362526263044540 - BerryBlackAndWhite_10: -184920096677565343 - BerryBlackAndWhite_11: 8060966420184180134 - BerryBlackAndWhite_12: -4736570087883412996 - BerryBlackAndWhite_13: -5456060970309705812 - BerryBlackAndWhite_14: 5313231529009540679 - BerryBlackAndWhite_15: -3377632519767745330 - BerryBlackAndWhite_16: -4940035662824615856 - BerryBlackAndWhite_17: 3984875955374476231 - BerryBlackAndWhite_2: -9118840095360118304 - BerryBlackAndWhite_3: -615688528827855246 - BerryBlackAndWhite_4: -3463087151951401251 - BerryBlackAndWhite_5: 3862539080958380021 - BerryBlackAndWhite_6: 6057435354215509935 - BerryBlackAndWhite_7: -717543955234921905 - BerryBlackAndWhite_8: -3068219435190899181 - BerryBlackAndWhite_9: -3694163523274229928 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Berries/BerryNoColor.png b/Assets/Resources/Berries/BerryNoColor.png new file mode 100644 index 0000000..3447a1a Binary files /dev/null and b/Assets/Resources/Berries/BerryNoColor.png differ diff --git a/Assets/Resources/Berries/BerryBase.png.meta b/Assets/Resources/Berries/BerryNoColor.png.meta similarity index 91% rename from Assets/Resources/Berries/BerryBase.png.meta rename to Assets/Resources/Berries/BerryNoColor.png.meta index fb8f2a5..f9c8a02 100644 --- a/Assets/Resources/Berries/BerryBase.png.meta +++ b/Assets/Resources/Berries/BerryNoColor.png.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: f3adb2f10adcc4086b98ff1510c621f2 +guid: 7b3886d91158d45c5a254ea85e772e16 TextureImporter: internalIDToNameTable: - first: - 213: -3628175555863346805 - second: BerryBase_0 + 213: 3416250205567451098 + second: BerryNoColor_0 externalObjects: {} serializedVersion: 13 mipmaps: @@ -37,7 +37,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -75,7 +75,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -126,7 +126,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: BerryBase_0 + name: BerryNoColor_0 rect: serializedVersion: 2 x: 7 @@ -141,8 +141,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: b81820a0e8126adc0800000000000000 - internalID: -3628175555863346805 + spriteID: adff3be3675f86f20800000000000000 + internalID: 3416250205567451098 vertices: [] indices: edges: [] @@ -151,7 +151,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: @@ -161,7 +161,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - BerryBase_0: -3628175555863346805 + BerryNoColor_0: 3416250205567451098 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/Berries/BerryUpArrow.png.meta b/Assets/Resources/Berries/BerryUpArrow.png.meta index 1b0a0ce..1b84701 100644 --- a/Assets/Resources/Berries/BerryUpArrow.png.meta +++ b/Assets/Resources/Berries/BerryUpArrow.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -138,7 +151,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Resources/Berries/CoinBerry.png.meta b/Assets/Resources/Berries/CoinBerry.png.meta index 933515a..67e7dda 100644 --- a/Assets/Resources/Berries/CoinBerry.png.meta +++ b/Assets/Resources/Berries/CoinBerry.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Berries/GoldenBerry.png.meta b/Assets/Resources/Berries/GoldenBerry.png.meta index d4d76f1..f7fd18c 100644 --- a/Assets/Resources/Berries/GoldenBerry.png.meta +++ b/Assets/Resources/Berries/GoldenBerry.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Berries/PoisonBerry.png.meta b/Assets/Resources/Berries/PoisonBerry.png.meta index 5d4528f..8d2f32b 100644 --- a/Assets/Resources/Berries/PoisonBerry.png.meta +++ b/Assets/Resources/Berries/PoisonBerry.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Berries/SlowBerry.png.meta b/Assets/Resources/Berries/SlowBerry.png.meta index ccfd70d..b265335 100644 --- a/Assets/Resources/Berries/SlowBerry.png.meta +++ b/Assets/Resources/Berries/SlowBerry.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Berries/SpeedyBerry.png.meta b/Assets/Resources/Berries/SpeedyBerry.png.meta index bd2e69a..9e6b4e8 100644 --- a/Assets/Resources/Berries/SpeedyBerry.png.meta +++ b/Assets/Resources/Berries/SpeedyBerry.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Berries/UltraBerry.png.meta b/Assets/Resources/Berries/UltraBerry.png.meta index e6680f2..d549e2f 100644 --- a/Assets/Resources/Berries/UltraBerry.png.meta +++ b/Assets/Resources/Berries/UltraBerry.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_-1.png.meta b/Assets/Resources/Icons/Icons/bird_-1.png.meta index 5c371b0..5dd53cd 100644 --- a/Assets/Resources/Icons/Icons/bird_-1.png.meta +++ b/Assets/Resources/Icons/Icons/bird_-1.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_-2.png.meta b/Assets/Resources/Icons/Icons/bird_-2.png.meta index 9985404..f078453 100644 --- a/Assets/Resources/Icons/Icons/bird_-2.png.meta +++ b/Assets/Resources/Icons/Icons/bird_-2.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_-3.png.meta b/Assets/Resources/Icons/Icons/bird_-3.png.meta index a1ed871..976acd0 100644 --- a/Assets/Resources/Icons/Icons/bird_-3.png.meta +++ b/Assets/Resources/Icons/Icons/bird_-3.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_-4.png.meta b/Assets/Resources/Icons/Icons/bird_-4.png.meta index 6cb1e1d..b138981 100644 --- a/Assets/Resources/Icons/Icons/bird_-4.png.meta +++ b/Assets/Resources/Icons/Icons/bird_-4.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_1.png.meta b/Assets/Resources/Icons/Icons/bird_1.png.meta index 233fae4..a228e17 100644 --- a/Assets/Resources/Icons/Icons/bird_1.png.meta +++ b/Assets/Resources/Icons/Icons/bird_1.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_2.png.meta b/Assets/Resources/Icons/Icons/bird_2.png.meta index 662dcdd..2f77aa3 100644 --- a/Assets/Resources/Icons/Icons/bird_2.png.meta +++ b/Assets/Resources/Icons/Icons/bird_2.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_3.png.meta b/Assets/Resources/Icons/Icons/bird_3.png.meta index 5123949..64a1e46 100644 --- a/Assets/Resources/Icons/Icons/bird_3.png.meta +++ b/Assets/Resources/Icons/Icons/bird_3.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_4.png.meta b/Assets/Resources/Icons/Icons/bird_4.png.meta index 9ae7b6c..f61c814 100644 --- a/Assets/Resources/Icons/Icons/bird_4.png.meta +++ b/Assets/Resources/Icons/Icons/bird_4.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_5.png.meta b/Assets/Resources/Icons/Icons/bird_5.png.meta index 9911e5a..b23b4be 100644 --- a/Assets/Resources/Icons/Icons/bird_5.png.meta +++ b/Assets/Resources/Icons/Icons/bird_5.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_6.png.meta b/Assets/Resources/Icons/Icons/bird_6.png.meta index d240d36..bbceaf4 100644 --- a/Assets/Resources/Icons/Icons/bird_6.png.meta +++ b/Assets/Resources/Icons/Icons/bird_6.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_7.png.meta b/Assets/Resources/Icons/Icons/bird_7.png.meta index b7a29b9..83f0694 100644 --- a/Assets/Resources/Icons/Icons/bird_7.png.meta +++ b/Assets/Resources/Icons/Icons/bird_7.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Icons/bird_8.png.meta b/Assets/Resources/Icons/Icons/bird_8.png.meta index f3a3b54..d959172 100644 --- a/Assets/Resources/Icons/Icons/bird_8.png.meta +++ b/Assets/Resources/Icons/Icons/bird_8.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_1.png.meta b/Assets/Resources/Icons/Overlays/overlay_1.png.meta index 67371ae..00c750b 100644 --- a/Assets/Resources/Icons/Overlays/overlay_1.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_1.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_10.png.meta b/Assets/Resources/Icons/Overlays/overlay_10.png.meta index 12e1690..52d0d63 100644 --- a/Assets/Resources/Icons/Overlays/overlay_10.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_10.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_11.png.meta b/Assets/Resources/Icons/Overlays/overlay_11.png.meta index 7b3bece..bfe59f7 100644 --- a/Assets/Resources/Icons/Overlays/overlay_11.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_11.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_12.png.meta b/Assets/Resources/Icons/Overlays/overlay_12.png.meta index e02d73d..af9cf88 100644 --- a/Assets/Resources/Icons/Overlays/overlay_12.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_12.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_13.png.meta b/Assets/Resources/Icons/Overlays/overlay_13.png.meta index 7b1fa60..d62d2cc 100644 --- a/Assets/Resources/Icons/Overlays/overlay_13.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_13.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_14.png.meta b/Assets/Resources/Icons/Overlays/overlay_14.png.meta index fb0d805..c63a2db 100644 --- a/Assets/Resources/Icons/Overlays/overlay_14.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_14.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_2.png.meta b/Assets/Resources/Icons/Overlays/overlay_2.png.meta index 892a3a0..1b5fae3 100644 --- a/Assets/Resources/Icons/Overlays/overlay_2.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_2.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_3.png.meta b/Assets/Resources/Icons/Overlays/overlay_3.png.meta index 91e9ac9..b814a05 100644 --- a/Assets/Resources/Icons/Overlays/overlay_3.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_3.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_4.png.meta b/Assets/Resources/Icons/Overlays/overlay_4.png.meta index bbe137f..8b44bda 100644 --- a/Assets/Resources/Icons/Overlays/overlay_4.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_4.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_5.png.meta b/Assets/Resources/Icons/Overlays/overlay_5.png.meta index 97cac43..cfcded6 100644 --- a/Assets/Resources/Icons/Overlays/overlay_5.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_5.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_6.png.meta b/Assets/Resources/Icons/Overlays/overlay_6.png.meta index fd0c88b..3831fd0 100644 --- a/Assets/Resources/Icons/Overlays/overlay_6.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_6.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_7.png.meta b/Assets/Resources/Icons/Overlays/overlay_7.png.meta index dab4a00..bb65717 100644 --- a/Assets/Resources/Icons/Overlays/overlay_7.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_7.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_8.png.meta b/Assets/Resources/Icons/Overlays/overlay_8.png.meta index 9f69385..bb7585a 100644 --- a/Assets/Resources/Icons/Overlays/overlay_8.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_8.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Icons/Overlays/overlay_9.png.meta b/Assets/Resources/Icons/Overlays/overlay_9.png.meta index e0618bd..15dd115 100644 --- a/Assets/Resources/Icons/Overlays/overlay_9.png.meta +++ b/Assets/Resources/Icons/Overlays/overlay_9.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Resources/Other/Coin.png.meta b/Assets/Resources/Other/Coin.png.meta index 74d523e..a677c28 100644 --- a/Assets/Resources/Other/Coin.png.meta +++ b/Assets/Resources/Other/Coin.png.meta @@ -46,7 +46,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -109,6 +109,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Scripts/BazookaManager.cs b/Assets/Scripts/BazookaManager.cs index b484f4e..fac79db 100644 --- a/Assets/Scripts/BazookaManager.cs +++ b/Assets/Scripts/BazookaManager.cs @@ -819,4 +819,42 @@ public class BazookaManager : MonoBehaviour if (saveFile["gameStore"] == null) return; (saveFile["gameStore"] as JObject)?.Remove("totalCoinBerries"); } + + public void SetGameStoreTotalRandomBerries(BigInteger value) + { + if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject(); + saveFile["gameStore"]["totalRandomBerries"] = value.ToString(); + } + + public BigInteger GetGameStoreTotalRandomBerries() + { + if (saveFile["gameStore"] == null) return 0; + if (saveFile["gameStore"]["totalRandomBerries"] == null) return 0; + return BigInteger.Parse(saveFile["gameStore"]["totalRandomBerries"].ToString()); + } + + public void UnsetGameStoreTotalRandomBerries() + { + if (saveFile["gameStore"] == null) return; + (saveFile["gameStore"] as JObject)?.Remove("totalRandomBerries"); + } + + public void SetGameStoreTotalAntiBerries(BigInteger value) + { + if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject(); + saveFile["gameStore"]["totalAntiBerries"] = value.ToString(); + } + + public BigInteger GetGameStoreTotalAntiBerries() + { + if (saveFile["gameStore"] == null) return 0; + if (saveFile["gameStore"]["totalAntiBerries"] == null) return 0; + return BigInteger.Parse(saveFile["gameStore"]["totalAntiBerries"].ToString()); + } + + public void UnsetGameStoreTotalAntiBerries() + { + if (saveFile["gameStore"] == null) return; + (saveFile["gameStore"] as JObject)?.Remove("totalAntiBerries"); + } } diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs index 633e672..a7404ab 100644 --- a/Assets/Scripts/GamePlayer.cs +++ b/Assets/Scripts/GamePlayer.cs @@ -19,11 +19,14 @@ public class GamePlayer : MonoBehaviour private BigInteger totalUltraBerries; private BigInteger totalSpeedyBerries; private BigInteger totalCoinBerries; + private BigInteger totalRandomBerries; + private BigInteger totalAntiBerries; private BigInteger totalAttempts; private BigInteger totalCoins; private float boostLeft; private float slownessLeft; private float speedyLeft; + private float antiLeft = 10f; private float screenWidth; internal bool isGrounded; public TMP_Text scoreText; @@ -245,6 +248,21 @@ public class GamePlayer : MonoBehaviour { if (score != 0) Respawn(); } + if (antiLeft > 0f) + { + string[] berryTags = { "NormalBerry", "PoisonBerry", "SlowBerry", "UltraBerry", "SpeedyBerry", "CoinBerry", "RandomBerry", "AntiBerry" }; + foreach (string tag in berryTags) + { + foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) + { + UnityEngine.Vector3 dir = berry.transform.position - bird.transform.position; + if (dir.magnitude < 3f) + { + berry.GetComponent().linearVelocity = dir.normalized * 5f; + } + } + } + } } void ClampPosition(GameObject obj) @@ -285,6 +303,11 @@ public class GamePlayer : MonoBehaviour speedyLeft -= Time.deltaTime; boostText.text = "Speed expires in " + string.Format("{0:0.0}", speedyLeft) + "s"; } + else if (antiLeft > 0f) + { + antiLeft -= Time.deltaTime; + boostText.text = "Berry repellent expires in " + string.Format("{0:0.0}", antiLeft) + "s"; + } else { boostText.text = ""; @@ -312,36 +335,48 @@ public class GamePlayer : MonoBehaviour GameObject newBerry = new("Berry"); newBerry.transform.SetParent(berryParent.transform); SpriteRenderer spriteRenderer = newBerry.AddComponent(); - if (spawnProbability <= 0.525f) + if (spawnProbability <= 0.425f) { spriteRenderer.sprite = Resources.Load("Berries/Berry"); newBerry.tag = "NormalBerry"; } - else if (spawnProbability <= 0.65f) + else if (spawnProbability <= 0.55f) { spriteRenderer.sprite = Resources.Load("Berries/PoisonBerry"); newBerry.tag = "PoisonBerry"; } - else if (spawnProbability <= 0.75f) + else if (spawnProbability <= 0.65f) { spriteRenderer.sprite = Resources.Load("Berries/SlowBerry"); newBerry.tag = "SlowBerry"; } - else if (spawnProbability <= 0.85f) + else if (spawnProbability <= 0.75f) { spriteRenderer.sprite = Resources.Load("Berries/UltraBerry"); newBerry.tag = "UltraBerry"; } - else if (spawnProbability <= 0.95f) + else if (spawnProbability <= 0.85f) { spriteRenderer.sprite = Resources.Load("Berries/SpeedyBerry"); newBerry.tag = "SpeedyBerry"; } - else + else if (spawnProbability <= 0.90f) { spriteRenderer.sprite = Resources.Load("Berries/CoinBerry"); newBerry.tag = "CoinBerry"; } + else if (spawnProbability <= 0.95f) + { + spriteRenderer.sprite = Resources.Load("Berries/BerryNoColor"); + newBerry.tag = "RandomBerry"; + RainbowSpriteRender randomBerryRainbowImage = newBerry.AddComponent(); + randomBerryRainbowImage.frequency = 5f; + } + else + { + spriteRenderer.sprite = Resources.Load("Berries/AntiBerry"); + newBerry.tag = "AntiBerry"; + } spriteRenderer.sortingOrder = -5; float screenWidth = Camera.main.orthographicSize * 2 * Camera.main.aspect; @@ -373,6 +408,8 @@ public class GamePlayer : MonoBehaviour GameObject[] ultraBerries = GameObject.FindGameObjectsWithTag("UltraBerry"); GameObject[] speedyBerries = GameObject.FindGameObjectsWithTag("SpeedyBerry"); GameObject[] coinBerries = GameObject.FindGameObjectsWithTag("CoinBerry"); + GameObject[] randomBerries = GameObject.FindGameObjectsWithTag("RandomBerry"); + GameObject[] antiBerries = GameObject.FindGameObjectsWithTag("AntiBerry"); if (!pausePanel.activeSelf) { @@ -390,10 +427,7 @@ public class GamePlayer : MonoBehaviour } else if (UnityEngine.Vector3.Distance(bird.transform.position, normalBerry.transform.position) < 1.5f) { - AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Eat"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume()); - Destroy(normalBerry); - totalNormalBerries++; - UpdateStats(1, 0); + DoNormalBerry(normalBerry); } if (speedyLeft > 0) { @@ -412,10 +446,7 @@ public class GamePlayer : MonoBehaviour } else if (UnityEngine.Vector3.Distance(bird.transform.position, poisonBerry.transform.position) < 1.5f) { - AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Death"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume()); - Respawn(); - totalPoisonBerries++; - UpdateStats(0, 0); + DoPoisonBerry(); } if (speedyLeft > 0) { @@ -434,16 +465,7 @@ public class GamePlayer : MonoBehaviour } else if (UnityEngine.Vector3.Distance(bird.transform.position, slowBerry.transform.position) < 1.5f) { - AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); - Destroy(slowBerry); - boostLeft = 0f; - slownessLeft = 10f; - speedyLeft = 0f; - totalSlowBerries++; - if (score > 0) - { - UpdateStats(-1, 0); - } + DoSlowBerry(slowBerry); } if (speedyLeft > 0) { @@ -462,20 +484,7 @@ public class GamePlayer : MonoBehaviour } else if (UnityEngine.Vector3.Distance(bird.transform.position, ultraBerry.transform.position) < 1.5f) { - AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); - Destroy(ultraBerry); - totalUltraBerries++; - speedyLeft = 0f; - if (slownessLeft > 0f) - { - slownessLeft = 0f; - UpdateStats(1, 0); - } - else - { - boostLeft += 10f; - UpdateStats(5, 0); - } + DoUltraBerry(ultraBerry); } if (speedyLeft > 0) { @@ -494,13 +503,7 @@ public class GamePlayer : MonoBehaviour } else if (UnityEngine.Vector3.Distance(bird.transform.position, speedyBerry.transform.position) < 1.5f) { - AudioSource.PlayClipAtPoint(Resources.Load("Sounds/SpeedyPowerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); - Destroy(speedyBerry); - boostLeft = 0f; - slownessLeft = 0f; - speedyLeft = 10f; - totalSpeedyBerries++; - UpdateStats(10, 0); + DoSpeedyBerry(speedyBerry); } if (speedyLeft > 0) { @@ -519,11 +522,7 @@ public class GamePlayer : MonoBehaviour } else if (UnityEngine.Vector3.Distance(bird.transform.position, coinBerry.transform.position) < 1.5f) { - AudioSource.PlayClipAtPoint(Resources.Load("Sounds/CoinCollect"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); - Destroy(coinBerry); - totalCoinBerries++; - totalCoins += 10; - UpdateStats(0, 0); + DoCoinBerry(coinBerry); } if (speedyLeft > 0) { @@ -534,6 +533,51 @@ public class GamePlayer : MonoBehaviour coinBerry.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -4f); } } + foreach (GameObject randomBerry in randomBerries) + { + if (randomBerry.transform.position.y < 0f - Camera.main.orthographicSize - 1f) + { + Destroy(randomBerry); + } + else if (UnityEngine.Vector3.Distance(bird.transform.position, randomBerry.transform.position) < 1.5f) + { + System.Action[] funcs = { + () => DoNormalBerry(randomBerry), + () => DoSlowBerry(randomBerry), + () => DoUltraBerry(randomBerry), + () => DoSpeedyBerry(randomBerry), + () => DoAntiBerry(randomBerry) + }; + funcs[Random.Range(0, funcs.Length)](); + } + if (speedyLeft > 0) + { + randomBerry.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -7.5f); + } + else + { + randomBerry.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -4f); + } + } + foreach (GameObject antiBerry in antiBerries) + { + if (antiBerry.transform.position.y < 0f - Camera.main.orthographicSize - 1f) + { + Destroy(antiBerry); + } + else if (UnityEngine.Vector3.Distance(bird.transform.position, antiBerry.transform.position) < 1.5f) + { + DoAntiBerry(antiBerry); + } + if (speedyLeft > 0) + { + antiBerry.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -7.5f); + } + else + { + antiBerry.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -4f); + } + } } else { @@ -545,6 +589,8 @@ public class GamePlayer : MonoBehaviour .Concat(ultraBerries) .Concat(speedyBerries) .Concat(coinBerries) + .Concat(randomBerries) + .Concat(antiBerries) .ToArray(); foreach (GameObject berry in allberries) { @@ -599,6 +645,8 @@ public class GamePlayer : MonoBehaviour BazookaManager.Instance.SetGameStoreTotalUltraBerries(totalUltraBerries); BazookaManager.Instance.SetGameStoreTotalSpeedyBerries(totalSpeedyBerries); BazookaManager.Instance.SetGameStoreTotalCoinBerries(totalCoinBerries); + BazookaManager.Instance.SetGameStoreTotalRandomBerries(totalRandomBerries); + BazookaManager.Instance.SetGameStoreTotalAntiBerries(totalAntiBerries); BazookaManager.Instance.SetGameStoreTotalAttepts(totalAttempts); var customBirdIconData = BazookaManager.Instance.GetCustomBirdIconData(); customBirdIconData.Balance = totalCoins; @@ -663,4 +711,87 @@ public class GamePlayer : MonoBehaviour Cursor.visible = true; Cursor.lockState = CursorLockMode.None; } + + void DoNormalBerry(GameObject berry) + { + AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Eat"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume()); + Destroy(berry); + totalNormalBerries++; + UpdateStats(1, 0); + } + + void DoPoisonBerry() + { + AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Death"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume()); + Respawn(); + totalPoisonBerries++; + UpdateStats(0, 0); + } + + void DoSlowBerry(GameObject berry) + { + AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); + Destroy(berry); + boostLeft = 0f; + slownessLeft = 10f; + speedyLeft = 0f; + antiLeft = 0f; + totalSlowBerries++; + if (score > 0) + { + UpdateStats(-1, 0); + } + } + + void DoUltraBerry(GameObject berry) + { + AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); + Destroy(berry); + totalUltraBerries++; + speedyLeft = 0f; + antiLeft = 0f; + if (slownessLeft > 0f) + { + slownessLeft = 0f; + UpdateStats(1, 0); + } + else + { + boostLeft += 10f; + UpdateStats(5, 0); + } + } + + void DoSpeedyBerry(GameObject berry) + { + AudioSource.PlayClipAtPoint(Resources.Load("Sounds/SpeedyPowerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); + Destroy(berry); + boostLeft = 0f; + slownessLeft = 0f; + speedyLeft = 10f; + antiLeft = 0f; + totalSpeedyBerries++; + UpdateStats(10, 0); + } + + void DoCoinBerry(GameObject berry) + { + AudioSource.PlayClipAtPoint(Resources.Load("Sounds/CoinCollect"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); + Destroy(berry); + totalCoinBerries++; + totalCoins += 10; + UpdateStats(0, 0); + } + + void DoAntiBerry(GameObject berry) + { + AudioSource.PlayClipAtPoint(Resources.Load("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume()); + Destroy(berry); + boostLeft = 0f; + slownessLeft = 0f; + speedyLeft = 0f; + antiLeft = 10f; + totalAntiBerries++; + UpdateStats(0, 0); + } } \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 051e6fa..cb321f6 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -10,6 +10,8 @@ TagManager: - UltraBerry - SpeedyBerry - CoinBerry + - RandomBerry + - AntiBerry layers: - Default - TransparentFX