diff --git a/Assets/Audio/Game Over.wav b/Assets/Audio/Game Over.wav new file mode 100644 index 0000000..585eb37 Binary files /dev/null and b/Assets/Audio/Game Over.wav differ diff --git a/Assets/Audio/Game Over.wav.meta b/Assets/Audio/Game Over.wav.meta new file mode 100644 index 0000000..ed0bd17 --- /dev/null +++ b/Assets/Audio/Game Over.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 942e7623b42d9754386a148451c3be43 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Powerup Hit Animation Explosion.wav b/Assets/Audio/Powerup Hit Animation Explosion.wav new file mode 100644 index 0000000..0c3e42d Binary files /dev/null and b/Assets/Audio/Powerup Hit Animation Explosion.wav differ diff --git a/Assets/Audio/Powerup Hit Animation Explosion.wav.meta b/Assets/Audio/Powerup Hit Animation Explosion.wav.meta new file mode 100644 index 0000000..d1215c4 --- /dev/null +++ b/Assets/Audio/Powerup Hit Animation Explosion.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 026d6ae297783b4448140ff663d9d821 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Victory.wav b/Assets/Audio/Victory.wav new file mode 100644 index 0000000..9279e79 Binary files /dev/null and b/Assets/Audio/Victory.wav differ diff --git a/Assets/Audio/Victory.wav.meta b/Assets/Audio/Victory.wav.meta new file mode 100644 index 0000000..bdd4631 --- /dev/null +++ b/Assets/Audio/Victory.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 90b6236b7f0a64f439889d8c10e8d6f8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Battle Scene.unity b/Assets/Scenes/Battle Scene.unity index fdc03aa..02d45e9 100644 --- a/Assets/Scenes/Battle Scene.unity +++ b/Assets/Scenes/Battle Scene.unity @@ -1702,6 +1702,87 @@ Transform: m_Father: {fileID: 1054126017} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &795964904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 795964906} + - component: {fileID: 795964905} + m_Layer: 0 + m_Name: HPTitle (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &795964905 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 795964904} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 3ad9de074bc37ef4a91a60f34c675863, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3, y: 1.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &795964906 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 795964904} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.73, y: -4.48, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 34 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &822731490 GameObject: m_ObjectHideFlags: 0 @@ -2411,8 +2492,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 2135489387 + m_SortingLayer: 4 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 3d8bea12ecf6cbf40bf36752f77e95f2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -3926,6 +4007,9 @@ MonoBehaviour: - {fileID: 8300000, guid: 1558af4a88fd29545ab9b0e8d058eb8d, type: 3} - {fileID: 8300000, guid: b72cdd9fa6b85c74e8b1ba40d7de7743, type: 3} - {fileID: 8300000, guid: 8c705fbb65eaec349ac524eabbd6b1da, type: 3} + - {fileID: 8300000, guid: 026d6ae297783b4448140ff663d9d821, type: 3} + - {fileID: 8300000, guid: 90b6236b7f0a64f439889d8c10e8d6f8, type: 3} + - {fileID: 8300000, guid: 942e7623b42d9754386a148451c3be43, type: 3} --- !u!4 &1480396848 Transform: m_ObjectHideFlags: 0 @@ -4487,6 +4571,87 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1604759754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1604759756} + - component: {fileID: 1604759755} + m_Layer: 0 + m_Name: HPTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1604759755 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604759754} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 3ad9de074bc37ef4a91a60f34c675863, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3, y: 1.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1604759756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604759754} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.41, y: 4.05, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 33 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1635882673 GameObject: m_ObjectHideFlags: 0 @@ -5710,8 +5875,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 2135489387 + m_SortingLayer: 4 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 073c0e9fa00ae1a4bbf546001b5d011e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/Mode Select Scene.unity b/Assets/Scenes/Mode Select Scene.unity index c7e5f58..3397c9b 100644 --- a/Assets/Scenes/Mode Select Scene.unity +++ b/Assets/Scenes/Mode Select Scene.unity @@ -310,7 +310,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: ef3ded3f939a3054e89e5b960b492d91, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.6 m_Pitch: 1 Loop: 1 Mute: 0 @@ -437,7 +437,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 11b4ee38c486d7d408422f0ccbd47469, type: 3} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.6 m_Pitch: 1 Loop: 1 Mute: 0 diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs index b99923f..044049b 100644 --- a/Assets/Scripts/GMScript.cs +++ b/Assets/Scripts/GMScript.cs @@ -460,14 +460,6 @@ public class GMScript : MonoBehaviour } } - if(partyHealth < 3) - { - //LOW HEALTH SOUND GOES GOES HERE - //Gonna have to add some sloppy checking to get this to work properly without adding a new audiosource - //Might just wanna add a new audio source - //audioPlayer.PlayOneShot(); - } - if(partyHealth <= 0 && gameover == false) { partyHealth = 0; @@ -492,7 +484,7 @@ public class GMScript : MonoBehaviour } - if(enemyHealth <= 0 || victory == true) + if((enemyHealth <= 0 || victory == true) && gameover == false) { enemyHealth = 0; @@ -834,8 +826,7 @@ public class GMScript : MonoBehaviour Animator hit = EnemyHit.transform.GetComponent(); - //ABILITY AUDIO GOES HERE - //audioPlayer.PlayOneShot(); + audioPlayer.PlayOneShot(SoundEffects[6]); yield return new WaitForSeconds( hit.GetCurrentAnimatorStateInfo(0).length * 2 @@ -884,8 +875,8 @@ public class GMScript : MonoBehaviour Animator hit = Hit.transform.GetComponent(); - //ABILITY AUDIO GOES HERE - //audioPlayer.PlayOneShot(); + audioPlayer.PlayOneShot(SoundEffects[6]); + yield return new WaitForSeconds( hit.GetCurrentAnimatorStateInfo(0).length * 2 +hit.GetCurrentAnimatorStateInfo(0).normalizedTime); @@ -1237,10 +1228,9 @@ public class GMScript : MonoBehaviour display.SetActive(true); - //DEFEAT SOUND GOES HERE - //audioPlayer.PlayOneShot(); + audioPlayer.PlayOneShot(SoundEffects[8]); - yield return new WaitForSeconds(3); + yield return new WaitForSeconds(SoundEffects[8].length); display.SetActive(false); @@ -1254,10 +1244,9 @@ public class GMScript : MonoBehaviour display.SetActive(true); if(victory || enemyHealth > 0) WeakPointVictory.SetActive(true); - //VICTORY SOUND GOES HERE - //audioPlayer.PlayOneShot(); + audioPlayer.PlayOneShot(SoundEffects[7]); - yield return new WaitForSeconds(3); + yield return new WaitForSeconds(SoundEffects[7].length); display.SetActive(false); WeakPointVictory.SetActive(false); diff --git a/Assets/Textures/HPTitle.png b/Assets/Textures/HPTitle.png new file mode 100644 index 0000000..23bfedb Binary files /dev/null and b/Assets/Textures/HPTitle.png differ diff --git a/Assets/Textures/HPTitle.png.meta b/Assets/Textures/HPTitle.png.meta new file mode 100644 index 0000000..af0fd43 --- /dev/null +++ b/Assets/Textures/HPTitle.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3ad9de074bc37ef4a91a60f34c675863 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 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: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/HPTitle.xcf b/Assets/Textures/HPTitle.xcf new file mode 100644 index 0000000..b237669 Binary files /dev/null and b/Assets/Textures/HPTitle.xcf differ diff --git a/Assets/Textures/HPTitle.xcf.meta b/Assets/Textures/HPTitle.xcf.meta new file mode 100644 index 0000000..427ca23 --- /dev/null +++ b/Assets/Textures/HPTitle.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5a2858cd1c9a5f3408fce99813eeff17 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: