diff --git a/Assets/Resources/Berries/CoinBerry.png b/Assets/Resources/Berries/CoinBerry.png new file mode 100644 index 0000000..0800eb7 Binary files /dev/null and b/Assets/Resources/Berries/CoinBerry.png differ diff --git a/Assets/Resources/Berries/CoinBerry.png.meta b/Assets/Resources/Berries/CoinBerry.png.meta new file mode 100644 index 0000000..ad2e933 --- /dev/null +++ b/Assets/Resources/Berries/CoinBerry.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 95fcc20fbfe7c43a2a484251feb32a00 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8654162663755415972 + second: CoinBerry_0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CoinBerry_0 + rect: + serializedVersion: 2 + x: 7 + y: 3 + width: 114 + height: 122 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c5ef866b8ec36e780800000000000000 + internalID: -8654162663755415972 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + CoinBerry_0: -8654162663755415972 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Other.meta b/Assets/Resources/Other.meta new file mode 100644 index 0000000..66ac5f3 --- /dev/null +++ b/Assets/Resources/Other.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5aa626694356916518efd27680cc1467 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Other/Coin.png b/Assets/Resources/Other/Coin.png new file mode 100644 index 0000000..0a2d63b Binary files /dev/null and b/Assets/Resources/Other/Coin.png differ diff --git a/Assets/Resources/Other/Coin.png.meta b/Assets/Resources/Other/Coin.png.meta new file mode 100644 index 0000000..13f7aa7 --- /dev/null +++ b/Assets/Resources/Other/Coin.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 727b3f3f8ac5e5e649879866189d0de1 +TextureImporter: + internalIDToNameTable: + - first: + 213: -3338749442709606003 + second: Coin_0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Coin_0 + rect: + serializedVersion: 2 + x: 7 + y: 3 + width: 114 + height: 124 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d81b24142116aa1d0800000000000000 + internalID: -3338749442709606003 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Coin_0: -3338749442709606003 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs index 31a5af5..b040666 100644 --- a/Assets/Scripts/GamePlayer.cs +++ b/Assets/Scripts/GamePlayer.cs @@ -355,34 +355,41 @@ public class GamePlayer : MonoBehaviour spriteRenderer.sprite = Resources.Load("Berries/Berry"); newBerry.tag = "Berry"; } - else if (spawnProbability <= 0.7f) + else if (spawnProbability <= 0.65f) { newBerry = new GameObject("PoisonBerry"); spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/PoisonBerry"); newBerry.tag = "PoisonBerry"; } - else if (spawnProbability <= 0.8f) + else if (spawnProbability <= 0.75f) { newBerry = new GameObject("SlowBerry"); spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/SlowBerry"); newBerry.tag = "SlowBerry"; } - else if (spawnProbability <= 0.9f) + else if (spawnProbability <= 0.85f) { newBerry = new GameObject("UltraBerry"); spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/UltraBerry"); newBerry.tag = "UltraBerry"; } - else + else if (spawnProbability <= 0.95f) { newBerry = new GameObject("SpeedyBerry"); spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/SpeedyBerry"); newBerry.tag = "SpeedyBerry"; } + else + { + newBerry = new GameObject("CoinBerry"); + spriteRenderer = newBerry.AddComponent(); + spriteRenderer.sprite = Resources.Load("Berries/CoinBerry"); + newBerry.tag = "CoinBerry"; + } spriteRenderer.sortingOrder = -5; float screenWidth = Camera.main.orthographicSize * 2 * Camera.main.aspect; @@ -427,6 +434,7 @@ public class GamePlayer : MonoBehaviour GameObject[] ultraberries = GameObject.FindGameObjectsWithTag("UltraBerry"); GameObject[] slownessberries = GameObject.FindGameObjectsWithTag("SlowBerry"); GameObject[] speedyberries = GameObject.FindGameObjectsWithTag("SpeedyBerry"); + GameObject[] coinberries = GameObject.FindGameObjectsWithTag("CoinBerry"); if (!pausePanel.activeSelf) { if (Time.time - lastMoveTime > 20) @@ -569,6 +577,26 @@ public class GamePlayer : MonoBehaviour gameObject10.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -4f); } } + array5 = coinberries; + foreach (GameObject gameObject11 in array5) + { + if (gameObject11.transform.position.y < 0f - Camera.main.orthographicSize - 1f) + { + Destroy(gameObject11); + } + else if (UnityEngine.Vector3.Distance(bird.transform.position, gameObject11.transform.position) < 1.5f) + { + Destroy(gameObject11); + } + if (speedyLeft > 0) + { + gameObject11.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -7.5f); + } + else + { + gameObject11.GetComponent().linearVelocity = new UnityEngine.Vector2(0f, -4f); + } + } } else { @@ -622,6 +650,7 @@ public class GamePlayer : MonoBehaviour GameObject[] ultraberries = GameObject.FindGameObjectsWithTag("UltraBerry"); GameObject[] slownessberries = GameObject.FindGameObjectsWithTag("SlowBerry"); GameObject[] speedyberries = GameObject.FindGameObjectsWithTag("SpeedyBerry"); + GameObject[] coinberries = GameObject.FindGameObjectsWithTag("CoinBerry"); foreach (GameObject b in berries) { @@ -643,6 +672,10 @@ public class GamePlayer : MonoBehaviour { Destroy(syb); } + foreach (GameObject cb in coinberries) + { + Destroy(cb); + } } void UpdateStats(BigInteger scoreAddAmount, BigInteger attemptAddAmount) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c58792..6e14954 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - SlowBerry - UltraBerry - SpeedyBerry + - CoinBerry layers: - Default - TransparentFX