diff --git a/Assets/Audio/AudioLib.asset b/Assets/Audio/AudioLib.asset index 855295b..bded0db 100644 --- a/Assets/Audio/AudioLib.asset +++ b/Assets/Audio/AudioLib.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: Clips: - {fileID: 8300000, guid: 1d27f94ab94c2524d914b71e90999ff0, type: 3} - - {fileID: 8300000, guid: 6587e53eee60504408f621b45cfc2f1f, type: 3} + - {fileID: 8300000, guid: 872cd5c7e50bb3440b97948159f98c94, type: 3} - {fileID: 8300000, guid: 3f0b9464c5082334d8a3e4bae6931241, type: 3} - {fileID: 8300000, guid: 58e5b5560ecf5bf47be48c746c9fa3d1, type: 3} - {fileID: 8300000, guid: 8292c60188e5d3640ab2cea3f2742d94, type: 3} @@ -22,4 +22,4 @@ MonoBehaviour: - {fileID: 8300000, guid: ad2e8b18611ebba43823cd2f2381dc0b, type: 3} - {fileID: 8300000, guid: b388d47fcdeb4434bb6b8f8617c8031f, type: 3} - {fileID: 8300000, guid: 79ca1f1673c4d574d8424e518f9c3517, type: 3} - - {fileID: 8300000, guid: e850f3f8ab5051943a09bc30110ad96a, type: 3} + - {fileID: 8300000, guid: b34737bd3c1b22745b80dc322d244fff, type: 3} diff --git a/Assets/Audio/SFX/Build Tower 1.mp3 b/Assets/Audio/SFX/Build Tower.mp3 similarity index 100% rename from Assets/Audio/SFX/Build Tower 1.mp3 rename to Assets/Audio/SFX/Build Tower.mp3 diff --git a/Assets/Audio/SFX/Build Tower 1.mp3.meta b/Assets/Audio/SFX/Build Tower.mp3.meta similarity index 100% rename from Assets/Audio/SFX/Build Tower 1.mp3.meta rename to Assets/Audio/SFX/Build Tower.mp3.meta diff --git a/Assets/Audio/SFX/Shotgun Shoot.wav b/Assets/Audio/SFX/Shotgun Shoot.wav deleted file mode 100644 index 6b8a68f..0000000 Binary files a/Assets/Audio/SFX/Shotgun Shoot.wav and /dev/null differ diff --git a/Assets/Audio/SFX/Shotgun Shoot.wav.meta b/Assets/Audio/SFX/Shotgun Shoot.wav.meta deleted file mode 100644 index e19cfd7..0000000 --- a/Assets/Audio/SFX/Shotgun Shoot.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: e850f3f8ab5051943a09bc30110ad96a -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ButtonSFX.cs b/Assets/ButtonSFX.cs new file mode 100644 index 0000000..e815af4 --- /dev/null +++ b/Assets/ButtonSFX.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ButtonSFX : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + private void OnMouseEnter() + { + //Play SFX + } +} diff --git a/Assets/ButtonSFX.cs.meta b/Assets/ButtonSFX.cs.meta new file mode 100644 index 0000000..cf19976 --- /dev/null +++ b/Assets/ButtonSFX.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f818b5a737243824cb4ebc1eaa7aa93e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Managers.prefab b/Assets/Prefabs/Managers.prefab index 200d432..bb89f40 100644 --- a/Assets/Prefabs/Managers.prefab +++ b/Assets/Prefabs/Managers.prefab @@ -11,8 +11,8 @@ GameObject: - component: {fileID: 2430881567806754708} - component: {fileID: 420908950823711560} - component: {fileID: 6434302952035194364} - - component: {fileID: 3776162552967268432} - component: {fileID: 4575217513678934597} + - component: {fileID: 2060481340702413421} m_Layer: 0 m_Name: Managers m_TagString: Untagged @@ -53,6 +53,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] IsBuildMode: 0 + health: 0 + startHealth: 100 + CurrentNumEnemies: 0 --- !u!114 &6434302952035194364 MonoBehaviour: m_ObjectHideFlags: 0 @@ -66,26 +69,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioLibrary: {fileID: 11400000, guid: 33d9499f0cd319b2eab27cf0f8e39a40, type: 2} ---- !u!114 &3776162552967268432 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 167310329963132665} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2cd736facf1d954d981c917c80d9c25, type: 3} - m_Name: - m_EditorClassIdentifier: - HasStarted: 0 - IsAutoPlaying: 0 - levelDefinition: {fileID: 11400000, guid: c8d456118a95ada459f30817ed2351a2, type: 2} - enemyCollection: {fileID: 11400000, guid: d600de6e8946fe54db15d9208f6f63f5, type: 2} - groundPath: {fileID: 0} - skyPath: {fileID: 0} - PlayButton: {fileID: 0} - AutoPlayButton: {fileID: 0} --- !u!114 &4575217513678934597 MonoBehaviour: m_ObjectHideFlags: 0 @@ -126,3 +109,15 @@ MonoBehaviour: - {fileID: 8300000, guid: 8e038767673552d4fb9f6e5927df20b2, type: 3} - {fileID: 8300000, guid: c37548871dcc24746aef5f5f5d248453, type: 3} - {fileID: 8300000, guid: d0fe8353aa0b5024699b5632cb56d98f, type: 3} +--- !u!114 &2060481340702413421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167310329963132665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be58bb12be5d348c0b50bbf48d54bf56, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 6da99f2..cc5f6f2 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18029143, g: 0.22572419, b: 0.30693057, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &41751586 +--- !u!21 &8248044 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -160,9 +160,50 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 5, a: 5} + - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] +--- !u!21 &39368697 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} m_BuildTextureStacks: [] --- !u!20 &57718964 stripped Camera: @@ -521,6 +562,47 @@ Material: - _r: {r: 40, g: 0, b: 0, a: 40} - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} m_BuildTextureStacks: [] +--- !u!21 &251694560 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 97.85, g: 477.754, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10, g: 9.999939, b: 407.01352, a: 392.87137} + m_BuildTextureStacks: [] --- !u!1 &280779768 GameObject: m_ObjectHideFlags: 0 @@ -757,47 +839,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &345898690 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 0, a: 40} - - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} - m_BuildTextureStacks: [] --- !u!1001 &359510068 PrefabInstance: m_ObjectHideFlags: 0 @@ -1229,7 +1270,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7355133f21643b44e8b997303686916c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &663913658 +--- !u!21 &698640512 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1266,51 +1307,62 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 5, g: 5, b: 0, a: 0} - - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} + - _r: {r: 40, g: 0, b: 0, a: 40} + - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} m_BuildTextureStacks: [] ---- !u!21 &738360558 -Material: - serializedVersion: 8 +--- !u!1 &739155301 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} - - _r: {r: 0, g: 0, b: 5, a: 5} - - _rect2props: {r: 0.00000047683716, g: 2.4999986, b: 10.995511, a: 10.995511} - m_BuildTextureStacks: [] + serializedVersion: 6 + m_Component: + - component: {fileID: 739155303} + - component: {fileID: 739155302} + m_Layer: 0 + m_Name: EnemySpawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &739155302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739155301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2cd736facf1d954d981c917c80d9c25, type: 3} + m_Name: + m_EditorClassIdentifier: + HasStarted: 0 + IsAutoPlaying: 0 + levelDefinition: {fileID: 11400000, guid: c8d456118a95ada459f30817ed2351a2, type: 2} + enemyCollection: {fileID: 11400000, guid: d600de6e8946fe54db15d9208f6f63f5, type: 2} + groundPath: {fileID: 476340590} + skyPath: {fileID: 1335003908} + PlayButton: {fileID: 3885720248775086125} + AutoPlayButton: {fileID: 3885720248775086124} +--- !u!4 &739155303 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739155301} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &779612215 GameObject: m_ObjectHideFlags: 0 @@ -1429,47 +1481,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &838463987 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 36.5705, g: 37.7215, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} - m_BuildTextureStacks: [] --- !u!1 &846938778 GameObject: m_ObjectHideFlags: 0 @@ -1709,12 +1720,12 @@ PrefabInstance: - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.0716554 + value: 0.07165539 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.050193895 + value: -0.0501939 objectReference: {fileID: 0} - target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1734,12 +1745,12 @@ PrefabInstance: - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.0716554 + value: 0.07165539 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.050193895 + value: -0.0501939 objectReference: {fileID: 0} - target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -1749,12 +1760,12 @@ PrefabInstance: - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.w - value: 0.07306354 + value: 0.07306359 objectReference: {fileID: 0} - target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} propertyPath: m_LocalRotation.x - value: -0.04812096 + value: -0.048121 objectReference: {fileID: 0} - target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc, type: 3} @@ -2071,26 +2082,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3776162552967268432, guid: 9d875dda41d470948bbe6fd408a7e835, - type: 3} - propertyPath: skyPath - value: - objectReference: {fileID: 1335003908} - - target: {fileID: 3776162552967268432, guid: 9d875dda41d470948bbe6fd408a7e835, - type: 3} - propertyPath: PlayButton - value: - objectReference: {fileID: 3885720248775086125} - - target: {fileID: 3776162552967268432, guid: 9d875dda41d470948bbe6fd408a7e835, - type: 3} - propertyPath: groundPath - value: - objectReference: {fileID: 476340590} - - target: {fileID: 3776162552967268432, guid: 9d875dda41d470948bbe6fd408a7e835, - type: 3} - propertyPath: AutoPlayButton - value: - objectReference: {fileID: 3885720248775086124} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2200,47 +2191,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1016399493} m_PrefabAsset: {fileID: 0} ---- !u!21 &1026030991 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} - - _r: {r: 30.96, g: 0, b: 0, a: 0} - - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} - m_BuildTextureStacks: [] --- !u!1 &1117810916 GameObject: m_ObjectHideFlags: 0 @@ -2346,6 +2296,47 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1117810916} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!21 &1136463168 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 360, g: 550, b: 0, a: 0} + - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} + - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + m_BuildTextureStacks: [] --- !u!21 &1168148719 Material: serializedVersion: 8 @@ -2574,6 +2565,47 @@ Material: - _r: {r: 40, g: 0, b: 0, a: 40} - _rect2props: {r: 20, g: -0.0000076293945, b: 38.390244, a: 38.390244} m_BuildTextureStacks: [] +--- !u!21 &1307051965 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 5, g: 13.05, b: 0, a: 0} + - _r: {r: 5, g: 5, b: 0, a: 0} + - _rect2props: {r: 0, g: -2.500002, b: 10.995511, a: 10.995511} + m_BuildTextureStacks: [] --- !u!114 &1335003908 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4274405463174037481, guid: 04b33788ffcc15e4e8f74ae3b8d95dc3, @@ -2839,7 +2871,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1554436711} m_PrefabAsset: {fileID: 0} ---- !u!21 &1558212061 +--- !u!21 &1640270934 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2876,9 +2908,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 360, g: 550, b: 0, a: 0} - - _r: {r: 0, g: 59.4, b: 59.4, a: 59.4} - - _rect2props: {r: -14.850006, g: 14.849915, b: 622.4661, a: 601.4651} + - _halfSize: {r: 97.8265, g: 37.763, b: 0, a: 0} + - _r: {r: 30.96, g: 0, b: 0, a: 0} + - _rect2props: {r: 7.7400208, g: -7.7400017, b: 84.93025, a: 95.87626} m_BuildTextureStacks: [] --- !u!1 &1644633573 GameObject: @@ -3103,6 +3135,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2cdf8a35ccaacc4695675d2ada4aecf, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!21 &1798183046 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 340.1145, g: 535, b: 0, a: 0} + - _r: {r: 0, g: 0, b: 0, a: 40} + - _rect2props: {r: 10.0000305, g: 9.999878, b: 618.79944, a: 604.6573} + m_BuildTextureStacks: [] --- !u!21 &1809462956 Material: serializedVersion: 8 @@ -3162,47 +3235,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8e7a492524fd6434aae9b71446cfe174, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &1848178542 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 35.4485, g: 38.0555, b: 0, a: 0} - - _r: {r: 40, g: 0, b: 0, a: 40} - - _rect2props: {r: 20.000002, g: -0.0000038146973, b: 37.833046, a: 37.833046} - m_BuildTextureStacks: [] --- !u!1 &1875223176 GameObject: m_ObjectHideFlags: 0 @@ -4427,6 +4459,7 @@ RectTransform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: + - {fileID: 739155303} - {fileID: 1001440767} - {fileID: 922758187} - {fileID: 1515922345} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 3f6d325..0d80ccd 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0.18029143, g: 0.22572419, b: 0.30693057, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -460,6 +460,74 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1001 &529128274 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 167310329963132665, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_Name + value: Managers + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2430881567806754708, guid: 9d875dda41d470948bbe6fd408a7e835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9d875dda41d470948bbe6fd408a7e835, type: 3} --- !u!1 &558176785 GameObject: m_ObjectHideFlags: 0 @@ -2027,3 +2095,4 @@ SceneRoots: - {fileID: 1541622505} - {fileID: 914665657} - {fileID: 1739273672} + - {fileID: 529128274} diff --git a/Assets/Scripts/Manager/MusicManager.cs b/Assets/Scripts/Manager/MusicManager.cs index c626d89..086035f 100644 --- a/Assets/Scripts/Manager/MusicManager.cs +++ b/Assets/Scripts/Manager/MusicManager.cs @@ -4,6 +4,7 @@ using UnityEngine; public class MusicManager : MonoBehaviour { + public static MusicManager Instance { get; private set; } [SerializeField] AnimationCurve projectilesToIntensity; [SerializeField] diff --git a/Assets/Scripts/Utilities/DontDestroy.cs b/Assets/Scripts/Utilities/DontDestroy.cs new file mode 100644 index 0000000..c65b2da --- /dev/null +++ b/Assets/Scripts/Utilities/DontDestroy.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DontDestroy : MonoBehaviour +{ + void Awake() + { + DontDestroyOnLoad(gameObject); + } +} diff --git a/Assets/Scripts/Utilities/DontDestroy.cs.meta b/Assets/Scripts/Utilities/DontDestroy.cs.meta new file mode 100644 index 0000000..e0dfd6d --- /dev/null +++ b/Assets/Scripts/Utilities/DontDestroy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: be58bb12be5d348c0b50bbf48d54bf56 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: