diff --git a/Assets/ModeSelect.cs b/Assets/ModeSelect.cs index 5472845..e437baa 100644 --- a/Assets/ModeSelect.cs +++ b/Assets/ModeSelect.cs @@ -21,7 +21,7 @@ public class ModeSelect : MonoBehaviour { GameManager.gameMode = GameManager.GameMode.keepAway; } - else if (toggle.name == "Obstacle-Course") + else if (toggle.name == "Obstacle Course") { GameManager.gameMode = GameManager.GameMode.obstacleCourse; } diff --git a/Assets/Prefabs/DayNightSkyBackground.prefab b/Assets/Prefabs/DayNightSkyBackground.prefab index 4f04c28..df730ac 100644 --- a/Assets/Prefabs/DayNightSkyBackground.prefab +++ b/Assets/Prefabs/DayNightSkyBackground.prefab @@ -1009,7 +1009,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 26.01} - m_LocalScale: {x: 4, y: 4, z: 2} + m_LocalScale: {x: 7.6064, y: 7.6064, z: 3.8032} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1156741621724851044} @@ -1713,7 +1713,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 26.01} - m_LocalScale: {x: 4, y: 4, z: 2} + m_LocalScale: {x: 7.6064, y: 7.6064, z: 3.8032} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1156741621724851044} @@ -2143,7 +2143,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 26.01} - m_LocalScale: {x: 4, y: 4, z: 2} + m_LocalScale: {x: 7.6064, y: 7.6064, z: 3.8032} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1156741621724851044} diff --git a/Assets/Scripts/Damageable.cs b/Assets/Scripts/Damageable.cs index 3845be6..5b7c63a 100644 --- a/Assets/Scripts/Damageable.cs +++ b/Assets/Scripts/Damageable.cs @@ -42,6 +42,8 @@ public class Damageable : MonoBehaviour private void Damage(GameObject damageSource) { + if (dying) return; + float actualForce = damageSource.GetComponent().force; Block blockComponent = GetComponent(); if (blockComponent != null && blockComponent.blocking) diff --git a/Assets/Sprites/Cloud Canopy.png b/Assets/Sprites/Cloud Canopy.png new file mode 100644 index 0000000..16e805f Binary files /dev/null and b/Assets/Sprites/Cloud Canopy.png differ diff --git a/Assets/Sprites/Cloud Canopy.png.meta b/Assets/Sprites/Cloud Canopy.png.meta new file mode 100644 index 0000000..ca46987 --- /dev/null +++ b/Assets/Sprites/Cloud Canopy.png.meta @@ -0,0 +1,168 @@ +fileFormatVersion: 2 +guid: a4a0efaad895745738e93720471fe582 +TextureImporter: + internalIDToNameTable: + - first: + 213: 4374163130339904003 + second: Cloud Canopy_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 + - 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: Cloud Canopy_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 96 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 30a4585113624bc30800000000000000 + internalID: 4374163130339904003 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: