From 2541df2f9022708b48b045350015c02cab85e7c2 Mon Sep 17 00:00:00 2001 From: Kazinski Date: Sun, 1 May 2022 19:06:51 -0500 Subject: [PATCH] small updates --- Assets/Scenes/TitleScene.unity | 45 ++++++++++++++++++- Assets/Scripts/AudioHandler.cs | 18 ++++++++ Assets/Scripts/AudioHandler.cs.meta | 11 +++++ .../AerialState/AerialStateManager.cs | 32 ++++++++----- .../MovementState/MoveStateManager.cs | 13 +----- .../NitroState/NitroStateManager.cs | 2 + UserSettings/EditorUserSettings.asset | 26 +++++------ 7 files changed, 109 insertions(+), 38 deletions(-) create mode 100644 Assets/Scripts/AudioHandler.cs create mode 100644 Assets/Scripts/AudioHandler.cs.meta diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index adea266..4d247a9 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.8672222, g: 0.82182354, b: 0.78585345, a: 1} + m_IndirectSpecularColor: {r: 0.8674563, g: 0.8218122, b: 0.7859322, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,6 +123,49 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &149523687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 149523688} + - component: {fileID: 149523689} + m_Layer: 0 + m_Name: mainTheme + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &149523688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149523687} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 726.1714, y: 380.1763, z: -518.09607} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &149523689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149523687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb04a982013aad145a695ee4c62e2b84, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &233382744 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AudioHandler.cs b/Assets/Scripts/AudioHandler.cs new file mode 100644 index 0000000..133f159 --- /dev/null +++ b/Assets/Scripts/AudioHandler.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AudioHandler : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/AudioHandler.cs.meta b/Assets/Scripts/AudioHandler.cs.meta new file mode 100644 index 0000000..9b45883 --- /dev/null +++ b/Assets/Scripts/AudioHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cb04a982013aad145a695ee4c62e2b84 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs index af19133..7f3aeca 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/AerialStateManager.cs @@ -401,21 +401,29 @@ public class AerialStateManager : NetworkBehaviour else{ pStats.GravVel = pStats.JumpPow; } - - //add check here for spring? - if (curJumpNum == 0) + + + if (pStats.JumpPow == 60) { - jumpSound1.Play(); - } - if (curJumpNum == 1) - { - jumpSound2.Play(); - } - if (curJumpNum == 2) - { - jumpSound3.Play(); + //add check here for spring? + if (curJumpNum == 0) + { + jumpSound1.Play(); + } + if (curJumpNum == 1) + { + jumpSound2.Play(); + } + if (curJumpNum == 2) + { + jumpSound3.Play(); + } } + if(pStats.JumpPow > 60) + { + springJumpSound.Play(); + } curJumpNum++; diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs index 1a9a01e..0fbdf48 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs @@ -344,21 +344,10 @@ public class MoveStateManager : NetworkBehaviour driftVel = Vector3.Lerp(driftVel, moveXZ, pStats.CurTraction * Time.deltaTime); - //True false set here to stop the audio from playing each time = to FPS - if (hasPlayed == false) - { - hasPlayed = true; - slideAudio.Play(); - } - - else - { - hasPlayed = false; - } //Actually move he player moveController.Move(driftVel); - + slideAudio.Play(); } //Camera and player rotation diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs index aeacba8..634a70c 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs @@ -43,6 +43,8 @@ public class NitroStateManager : NetworkBehaviour public float nitroVelBoost = 40; public float nitroAccBoost = .4f; + public AudioSource boostSound; + void Awake(){ ////Initialize Player Components diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 45a5193..666cba2 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c021313113e3f66333e243d04 + value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a - flags: 0 - RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 - flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7000021e17243f66333e243d04 flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 vcSharedLogLevel: value: 0d5e400f0650