diff --git a/Assets/Materials/Ice.mat b/Assets/Materials/Ice.mat new file mode 100644 index 0000000..984e496 --- /dev/null +++ b/Assets/Materials/Ice.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ice + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 20, y: 20} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 15, y: 15} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 15, y: 15} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 0.45 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.194 + - _GlossyReflections: 1 + - _Metallic: 0.96 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.09433961, g: 0.09433961, b: 0.09433961, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Ice.mat.meta b/Assets/Materials/Ice.mat.meta new file mode 100644 index 0000000..7307344 --- /dev/null +++ b/Assets/Materials/Ice.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e092d4efe00fea4b9efdd27edaebe8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/IceTexture.meta b/Assets/Materials/IceTexture.meta new file mode 100644 index 0000000..b3cac26 --- /dev/null +++ b/Assets/Materials/IceTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22d1a96d7ad07ca46a4f30e111a07bd4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/IceTexture/Blue_Ice_001_COLOR.jpg b/Assets/Materials/IceTexture/Blue_Ice_001_COLOR.jpg new file mode 100644 index 0000000..dcde3e9 Binary files /dev/null and b/Assets/Materials/IceTexture/Blue_Ice_001_COLOR.jpg differ diff --git a/Assets/Materials/IceTexture/Blue_Ice_001_COLOR.jpg.meta b/Assets/Materials/IceTexture/Blue_Ice_001_COLOR.jpg.meta new file mode 100644 index 0000000..abafcd1 --- /dev/null +++ b/Assets/Materials/IceTexture/Blue_Ice_001_COLOR.jpg.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 2d645bcea641aee4bb883097ab1026dc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/IceTexture/Blue_Ice_001_NORM.jpg b/Assets/Materials/IceTexture/Blue_Ice_001_NORM.jpg new file mode 100644 index 0000000..529265f Binary files /dev/null and b/Assets/Materials/IceTexture/Blue_Ice_001_NORM.jpg differ diff --git a/Assets/Materials/IceTexture/Blue_Ice_001_NORM.jpg.meta b/Assets/Materials/IceTexture/Blue_Ice_001_NORM.jpg.meta new file mode 100644 index 0000000..4b30875 --- /dev/null +++ b/Assets/Materials/IceTexture/Blue_Ice_001_NORM.jpg.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: b1eb8f53beeca034e9c92cb344e362dd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/IceTexture/Blue_Ice_001_ROUGH.jpg b/Assets/Materials/IceTexture/Blue_Ice_001_ROUGH.jpg new file mode 100644 index 0000000..6e43a1c Binary files /dev/null and b/Assets/Materials/IceTexture/Blue_Ice_001_ROUGH.jpg differ diff --git a/Assets/Materials/IceTexture/Blue_Ice_001_ROUGH.jpg.meta b/Assets/Materials/IceTexture/Blue_Ice_001_ROUGH.jpg.meta new file mode 100644 index 0000000..ed72d93 --- /dev/null +++ b/Assets/Materials/IceTexture/Blue_Ice_001_ROUGH.jpg.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 181d08992a94aa94d809200f089897fc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Obstacle.mat b/Assets/Materials/Obstacle.mat new file mode 100644 index 0000000..e914b02 --- /dev/null +++ b/Assets/Materials/Obstacle.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Obstacle + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _EMISSION _GLOSSYREFLECTIONS_OFF + m_LightmapFlags: 1 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.6037736, g: 0.019935932, b: 0.20016806, a: 1} + - _EmissionColor: {r: 2.1185474, g: 0, b: 0.52131796, a: 1} diff --git a/Assets/Materials/Obstacle.mat.meta b/Assets/Materials/Obstacle.mat.meta new file mode 100644 index 0000000..d75708f --- /dev/null +++ b/Assets/Materials/Obstacle.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4326312b74260cf41a3d48b3cff7b6a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Physics Materials/Ball.physicMaterial b/Assets/Physics Materials/Ball.physicMaterial new file mode 100644 index 0000000..a608ae4 --- /dev/null +++ b/Assets/Physics Materials/Ball.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ball + dynamicFriction: 0.6 + staticFriction: 0.6 + bounciness: 0.25 + frictionCombine: 0 + bounceCombine: 0 diff --git a/Assets/Physics Materials/Ball.physicMaterial.meta b/Assets/Physics Materials/Ball.physicMaterial.meta new file mode 100644 index 0000000..5bf6061 --- /dev/null +++ b/Assets/Physics Materials/Ball.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e83419f7c3cd9df4585c24449e60f8db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Physics Materials/Bouncy.physicMaterial b/Assets/Physics Materials/Bouncy.physicMaterial index de6cb53..8333d29 100644 --- a/Assets/Physics Materials/Bouncy.physicMaterial +++ b/Assets/Physics Materials/Bouncy.physicMaterial @@ -9,6 +9,6 @@ PhysicMaterial: m_Name: Bouncy dynamicFriction: 0.6 staticFriction: 0.6 - bounciness: 1 + bounciness: 0.9 frictionCombine: 0 bounceCombine: 0 diff --git a/Assets/Physics Materials/BouncyBall.physicMaterial b/Assets/Physics Materials/BouncyBall.physicMaterial new file mode 100644 index 0000000..def2917 --- /dev/null +++ b/Assets/Physics Materials/BouncyBall.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BouncyBall + dynamicFriction: 0.3 + staticFriction: 0.3 + bounciness: 1 + frictionCombine: 0 + bounceCombine: 3 diff --git a/Assets/Physics Materials/BouncyBall.physicMaterial.meta b/Assets/Physics Materials/BouncyBall.physicMaterial.meta new file mode 100644 index 0000000..888808e --- /dev/null +++ b/Assets/Physics Materials/BouncyBall.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3af075a1ef5e5b488859f0f999dee4a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Post/Default.asset b/Assets/Post/Default.asset index 53c976b..9f74aeb 100644 --- a/Assets/Post/Default.asset +++ b/Assets/Post/Default.asset @@ -114,7 +114,7 @@ MonoBehaviour: overrideState: 0 value: 1 temperature: - overrideState: 0 + overrideState: 1 value: 0 tint: overrideState: 0 @@ -127,16 +127,16 @@ MonoBehaviour: value: 0 saturation: overrideState: 0 - value: -100 + value: 100 brightness: overrideState: 0 value: 0 postExposure: overrideState: 0 - value: 0 + value: 2.57 contrast: overrideState: 0 - value: 0 + value: 100 mixerRedOutRedIn: overrideState: 0 value: 100 diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 3aebf1f..51e1c59 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -166,7 +166,7 @@ SphereCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 10774711} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: e83419f7c3cd9df4585c24449e60f8db, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -227,7 +227,7 @@ Transform: m_GameObject: {fileID: 10774711} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.01, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} + m_LocalScale: {x: 2.75, y: 2.75, z: 2.75} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -452,6 +452,12 @@ TrailRenderer: m_MinVertexDistance: 0.1 m_Autodestruct: 0 m_Emitting: 1 +--- !u!1 &140138307 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1046011661964092256, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + m_PrefabInstance: {fileID: 970662512} + m_PrefabAsset: {fileID: 0} --- !u!1001 &170055883 PrefabInstance: m_ObjectHideFlags: 0 @@ -710,7 +716,7 @@ Transform: m_GameObject: {fileID: 268360628} m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.4, y: -0.3, z: 26} - m_LocalScale: {x: 3, y: 1, z: 200.00012} + m_LocalScale: {x: 3, y: 1, z: 90} m_Children: [] m_Father: {fileID: 1499531362} m_RootOrder: 1 @@ -989,6 +995,7 @@ MonoBehaviour: lockBoost: 0 boostSound: {fileID: 8300000, guid: 381b83f48d13a2e4a9315848144c9b9e, type: 3} pitchModifier: {x: 0.2, y: 0.3} + unstoppable: 0 inputTimeout: 0 --- !u!4 &295107919 Transform: @@ -1115,6 +1122,7 @@ MonoBehaviour: lockBoost: 0 boostSound: {fileID: 8300000, guid: 381b83f48d13a2e4a9315848144c9b9e, type: 3} pitchModifier: {x: 0.2, y: 0.3} + unstoppable: 0 inputTimeout: 0 --- !u!4 &367746332 Transform: @@ -1297,8 +1305,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 384291585} m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: -6.5, y: -0.3, z: -26} - m_LocalScale: {x: 3, y: 1, z: 200.00012} + m_LocalPosition: {x: 0, y: -0.3, z: -26} + m_LocalScale: {x: 3, y: 1, z: 90} m_Children: [] m_Father: {fileID: 1499531362} m_RootOrder: 0 @@ -1489,8 +1497,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562159198} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 45.5, y: -0.3, z: 8.1} - m_LocalScale: {x: 3, y: 1, z: 200.00012} + m_LocalPosition: {x: 45.5, y: -0.3, z: 0} + m_LocalScale: {x: 3, y: 1, z: 55} m_Children: [] m_Father: {fileID: 1499531362} m_RootOrder: 2 @@ -1554,6 +1562,182 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562159198} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &638801388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 638801389} + - component: {fileID: 638801392} + - component: {fileID: 638801391} + - component: {fileID: 638801390} + m_Layer: 5 + m_Name: StageName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &638801389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638801388} + 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: 1485996213} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 22.5, y: 15.000008} + m_SizeDelta: {x: -45, y: -29.999985} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!82 &638801390 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638801388} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &638801391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638801388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 04fed28f55f61f54f91b5b7894fd42c0, type: 3} + m_Color: {r: 0, g: 1, b: 0.25280046, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 04fed28f55f61f54f91b5b7894fd42c0, type: 3} + m_FontSize: 100 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 6 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Stage Name +--- !u!222 &638801392 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638801388} + m_CullTransparentMesh: 0 --- !u!1 &643748441 GameObject: m_ObjectHideFlags: 0 @@ -1899,9 +2083,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 90 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: 04fed28f55f61f54f91b5b7894fd42c0, type: 3} + m_FontSize: 110 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 147 @@ -2182,7 +2366,7 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 + m_AllowDynamicResolution: 1 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 @@ -2194,7 +2378,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 162.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -2418,6 +2602,11 @@ PrefabInstance: propertyPath: boostDuration value: 0.35 objectReference: {fileID: 0} + - target: {fileID: 1046011661964092268, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1046011661964092269, guid: dc95d43174591064fa2b839a78374e0d, type: 3} propertyPath: m_AngularDrag @@ -2445,6 +2634,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc95d43174591064fa2b839a78374e0d, type: 3} +--- !u!1 &989392354 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1046011661964092256, guid: dc95d43174591064fa2b839a78374e0d, + type: 3} + m_PrefabInstance: {fileID: 170055883} + m_PrefabAsset: {fileID: 0} --- !u!1 &1053063603 GameObject: m_ObjectHideFlags: 0 @@ -2657,14 +2852,28 @@ MonoBehaviour: scorePlayer2: 0 maxGoals: 5 inputTimeout: 0.3 - player1: {fileID: 1522218632} - player2: {fileID: 367746332} + player1: {fileID: 989392354} + player2: {fileID: 140138307} players: [] - ball: {fileID: 10774716} + ball: {fileID: 10774711} initialPositions: [] initialRotations: [] + camera: {fileID: 963194225} + effectStage: 0 + cameraRotationSpeed: 3 + goalSizeSpeed: 3 + topWall: {fileID: 2014608397} + bottomWall: {fileID: 1806103567} + wallSpeed: 0.4 + goalBlue: {fileID: 643748441} + goalRed: {fileID: 1522218628} + bouncy: {fileID: 13400000, guid: f3af075a1ef5e5b488859f0f999dee4a, type: 2} + stageNameDuration: 5 + stageSmall: 4.25 + stageName: {fileID: 638801388} scoreLabel: {fileID: 697913066} winLabel: {fileID: 1880081387} + postProcess: {fileID: 11400000, guid: 8b9d47c0317477d46b0351d4425bebf1, type: 2} --- !u!4 &1228665502 Transform: m_ObjectHideFlags: 0 @@ -2787,7 +2996,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4521a81efd1bf4242ae19ce6c321b40b, type: 3} m_Name: m_EditorClassIdentifier: - seconds: 3.9 + seconds: 4.9 lockControls: 1 tickSound: {fileID: 8300000, guid: 630669a9bc24ce44cb3639a85b517c6b, type: 3} startSound: {fileID: 8300000, guid: 849a4835a1f3317429e69f659a969d6c, type: 3} @@ -2796,7 +3005,7 @@ MonoBehaviour: - {fileID: 10774711} disableOnZero: [] finalText: Go! - finalTextScreentime: 0.5 + finalTextScreentime: 0.75 uiText: {fileID: 1577603977} remaining: 0 --- !u!114 &1228665505 @@ -3275,6 +3484,7 @@ RectTransform: - {fileID: 697913065} - {fileID: 1880081386} - {fileID: 1577603975} + - {fileID: 638801389} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3318,6 +3528,8 @@ Transform: - {fileID: 1522218632} - {fileID: 643748445} - {fileID: 304138461} + - {fileID: 2014608398} + - {fileID: 1806103568} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3810,6 +4022,98 @@ Transform: m_Father: {fileID: 295107919} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1806103567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1806103568} + - component: {fileID: 1806103571} + - component: {fileID: 1806103570} + - component: {fileID: 1806103569} + m_Layer: 0 + m_Name: BottomWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1806103568 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806103567} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.3, z: -15} + m_LocalScale: {x: 3, y: 1, z: 5} + m_Children: [] + m_Father: {fileID: 1499531362} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1806103569 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806103567} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 41.679077, z: 1} + m_Center: {x: 0, y: 2.7967682, z: 0} +--- !u!23 &1806103570 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806103567} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4326312b74260cf41a3d48b3cff7b6a9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1806103571 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806103567} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1880081385 GameObject: m_ObjectHideFlags: 0 @@ -4013,8 +4317,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885071193} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: -45.5, y: -0.3, z: 7} - m_LocalScale: {x: 3, y: 1, z: 200.00012} + m_LocalPosition: {x: -45.5, y: -0.3, z: 0} + m_LocalScale: {x: 3, y: 1, z: 55} m_Children: [] m_Father: {fileID: 1499531362} m_RootOrder: 3 @@ -4078,6 +4382,98 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885071193} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2014608397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2014608398} + - component: {fileID: 2014608401} + - component: {fileID: 2014608400} + - component: {fileID: 2014608399} + m_Layer: 0 + m_Name: TopWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2014608398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014608397} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.3, z: 14.8} + m_LocalScale: {x: 3, y: 1, z: 5} + m_Children: [] + m_Father: {fileID: 1499531362} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2014608399 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014608397} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 15.237717, z: 1} + m_Center: {x: 0, y: 0.762764, z: 0} +--- !u!23 &2014608400 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014608397} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4326312b74260cf41a3d48b3cff7b6a9, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &2014608401 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014608397} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2145556004 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/menu.unity b/Assets/Scenes/menu.unity index d9eb92f..6931a2f 100644 --- a/Assets/Scenes/menu.unity +++ b/Assets/Scenes/menu.unity @@ -666,6 +666,11 @@ PrefabInstance: propertyPath: m_Name value: text_quit objectReference: {fileID: 0} + - target: {fileID: 7452761831188128528, guid: 3d3c9958de912d040b823e8941c04fba, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 57771a4c428d77849a642d87746ef5a9, type: 2} - target: {fileID: -8516149092970067591, guid: 3d3c9958de912d040b823e8941c04fba, type: 3} propertyPath: m_Materials.Array.data[0] @@ -756,11 +761,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 57771a4c428d77849a642d87746ef5a9, type: 2} - - target: {fileID: 7452761831188128528, guid: 3d3c9958de912d040b823e8941c04fba, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 57771a4c428d77849a642d87746ef5a9, type: 2} - target: {fileID: -8336890411983990595, guid: 3d3c9958de912d040b823e8941c04fba, type: 3} propertyPath: m_IsActive diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 38010aa..bebb3f0 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using UnityEngine.SceneManagement; +using UnityEngine.Rendering.PostProcessing; + [RequireComponent(typeof(AudioSource))] public class GameManager : MonoBehaviour @@ -16,12 +18,12 @@ public class GameManager : MonoBehaviour [Header("Player")] public float inputTimeout = 0.3f; - public Transform player1; - public Transform player2; + public GameObject player1; + public GameObject player2; public GameObject[] players; [Header("Boll")] - public Transform ball; + public GameObject ball; private Transform player1Initial, player2Initial, ballInitial; @@ -29,15 +31,34 @@ public class GameManager : MonoBehaviour [Header("Misc")] public Vector3[] initialPositions; public Quaternion[] initialRotations; + public GameObject camera; - /* UI */ + [Header("Effects")] + public int effectStage = 0; + public float cameraRotationSpeed = 1; + public float goalSizeSpeed = 1; + public GameObject topWall, bottomWall; + public float wallSpeed = 1; + public GameObject goalBlue, goalRed; + public PhysicMaterial bouncy; + + [Header("UI")] + private float stageNameCountdown = 1; + private float stageNameT = 1; + public float stageNameDuration = 1; + public float stageSmall = 1; + public GameObject stageName; public Text scoreLabel; public Text winLabel; + public PostProcessProfile postProcess; + public ColorGrading colorGadingLayer; + private AudioSource audioSource; // Start is called before the first frame update void Awake() { + Cursor.visible = false; this.players = GameObject.FindGameObjectsWithTag("Player"); this.initialPositions = new Vector3[this.players.Length]; this.initialRotations = new Quaternion[this.players.Length]; @@ -49,25 +70,125 @@ public class GameManager : MonoBehaviour } this.audioSource = GetComponent(); this.player1Initial = new GameObject().transform; - this.player1Initial.position = this.player1.position; - this.player1Initial.rotation = this.player1.rotation; + this.player1Initial.position = this.player1.transform.position; + this.player1Initial.rotation = this.player1.transform.rotation; this.player2Initial = new GameObject().transform; - this.player2Initial.position = this.player2.position; - this.player2Initial.rotation = this.player2.rotation; + this.player2Initial.position = this.player2.transform.position; + this.player2Initial.rotation = this.player2.transform.rotation; this.ballInitial = new GameObject().transform; - this.ballInitial.position = this.ball.position; + this.ballInitial.position = this.ball.transform.position; winLabel.transform.gameObject.SetActive(false); + + this.postProcess.TryGetSettings(out this.colorGadingLayer); } // Update is called once per frame void Update() { - //Debug.Log("Calculating matrix: Vector(" + Time.deltaTime * Random.Range(12, 123) + ")"); - //Debug.Log("Hacking pentagon: in pr0gress..."); - this.scoreLabel.text = this.scorePlayer1 + " : " + this.scorePlayer2; + if (this.stageNameCountdown <= this.stageSmall) + { + this.stageNameT += 4.0f * Time.deltaTime; + this.stageName.GetComponent().fontSize = (int)Mathf.Lerp(155, 100, this.stageNameT); + } + + if (this.stageNameCountdown <= 0) + { + this.stageName.SetActive(false); + } + + this.stageNameCountdown -= Time.deltaTime; + + + if (this.effectStage >= 1) + { + //Walls + this.stageName.GetComponent().text = "Walls"; + this.topWall.SetActive(true); + this.bottomWall.SetActive(true); + } + if (this.effectStage >= 2) + { + //Wall movement + this.stageName.GetComponent().text = "Walls move"; + + this.topWall.transform.position = new Vector3(this.topWall.transform.position.x, + this.topWall.transform.position.y, + Mathf.Lerp(5, 18, Mathf.PingPong(Time.time * this.wallSpeed, 1))); + this.bottomWall.transform.position = new Vector3(this.bottomWall.transform.position.x, + this.bottomWall.transform.position.y, + Mathf.Lerp(5, 18, Mathf.PingPong(Time.time * this.wallSpeed, 1)) * -1); + } + if (this.effectStage >= 3) + { + //Dynamic goals + this.stageName.GetComponent().text = "Goal size"; + + float size = Mathf.Clamp(Mathf.PingPong(Time.time * this.goalSizeSpeed, 15), 5, 15); + this.goalRed.transform.localScale = new Vector3(this.goalRed.transform.localScale.x, + this.goalRed.transform.localScale.y, + size); + this.goalBlue.transform.localScale = new Vector3(this.goalBlue.transform.localScale.x, + this.goalBlue.transform.localScale.y, + size); + } + if (this.effectStage >= 4) + { + //Rotating Camera + this.stageName.GetComponent().text = "Rotating camera"; + + this.camera.GetComponent().orthographicSize = 48.0f; + this.camera.transform.Rotate(new Vector3(0, 0, 1) * this.cameraRotationSpeed * Time.deltaTime); + } + if (this.effectStage >= 5) + { + //Ball bouncer + this.stageName.GetComponent().text = "Bouncy ball"; + + this.ball.GetComponent().material = this.bouncy; + } + if (this.effectStage >= 6) + { + //Ball size + this.stageName.GetComponent().text = "Smol bol"; + + this.ball.transform.localScale = new Vector3(1.5f, 1.5f, 1.5f); + } + if (this.effectStage >= 7) + { + //On ice + this.stageName.GetComponent().text = "On ice"; + + this.player1.GetComponent().drag = .3f; + this.player2.GetComponent().drag = .3f; + + this.colorGadingLayer.temperature.value = -40.0f; + } + + if (this.effectStage >= 8) + { + //Unstoppable + this.stageName.GetComponent().text = "Unstoppable"; + + this.player1.GetComponent().unstoppable = true; + this.player2.GetComponent().unstoppable = true; + } + + + + + + if (Input.GetKeyDown(KeyCode.P)) + { + GameObject aiPlayer = GameObject.Find("PlayerBlue"); + aiPlayer.GetComponent().aiControlled = !aiPlayer.GetComponent().aiControlled; + aiPlayer.GetComponent().enabled = true; + } + //Debug.Log("Calculating matrix: Vector(" + Time.deltaTime * Random.Range(12, 123) + ")"); + //Debug.Log("Hacking pentagon: in pr0gress..."); + this.scoreLabel.text = this.scorePlayer1 + " : " + this.scorePlayer2; if (this.scorePlayer1 >= maxGoals) { @@ -84,17 +205,31 @@ public class GameManager : MonoBehaviour } if (this.scorePlayer2 >= maxGoals || this.scorePlayer1 >= maxGoals) - { - if (Input.GetKeyDown(KeyCode.F5)) + { + this.stageName.GetComponent().text = "Press R to restart"; + this.stageName.GetComponent().fontSize = 100; + if (Input.GetKeyDown(KeyCode.R)) { Time.timeScale = 1; SceneManager.LoadScene(SceneManager.GetActiveScene().name); + this.colorGadingLayer.temperature.value = 0.0f; } } } + public void ApplyEffects() + { + this.stageName.SetActive(true); + this.stageName.GetComponent().fontSize = 145; + this.stageNameT = 0f; + + this.stageNameCountdown = this.stageNameDuration; + this.effectStage = this.scorePlayer1 + this.scorePlayer2; + } + public void ResetPositions() { + this.ApplyEffects(); this.audioSource.clip = this.goalSound; this.audioSource.Play(); @@ -106,8 +241,8 @@ public class GameManager : MonoBehaviour this.players[i].GetComponent().InputTimeout(this.inputTimeout); } - this.ball.position = this.ballInitial.position; - this.ball.GetComponent().velocity = Vector3.zero; + this.ball.transform.position = this.ballInitial.position; + this.ball.transform.GetComponent().velocity = Vector3.zero; } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index e50d36c..f1053f7 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -19,7 +19,7 @@ public class PlayerController : MonoBehaviour public bool lockBoost = false; public AudioClip boostSound; public Vector2 pitchModifier; - + public bool unstoppable = false; private AudioSource audioSource; private AIController aiController; @@ -30,10 +30,7 @@ public class PlayerController : MonoBehaviour { this.audioSource = this.forceZone.transform.GetComponent(); this.rb = GetComponent(); - if (this.aiControlled) - { - this.aiController = GetComponent(); - } + this.aiController = GetComponent(); } @@ -41,11 +38,12 @@ public class PlayerController : MonoBehaviour void Update() { float rotationDirection = Input.GetAxis("Horizontal" + this.playerNumber); - float movementDirection = Input.GetAxis("Vertical" + this.playerNumber); + float movementDirection = this.unstoppable ? 1 : Input.GetAxis("Vertical" + this.playerNumber); + float[] aiInput = new float[3]; this.rb.drag = this.idleDrag; - + if(this.inputTimeout > 0) { this.inputTimeout -= Time.deltaTime; return; diff --git a/Assets/Sfx/selection.wav b/Assets/Sfx/selection.wav index 6dacb8e..2d84d50 100644 Binary files a/Assets/Sfx/selection.wav and b/Assets/Sfx/selection.wav differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bdcddad..3c5a534 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -46,8 +46,8 @@ PlayerSettings: m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 - defaultScreenWidthWeb: 1600 - defaultScreenHeightWeb: 900 + defaultScreenWidthWeb: 1280 + defaultScreenHeightWeb: 720 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1