diff --git a/SSLR/Assets/Audio/735832__imataco__alarm.wav b/SSLR/Assets/Audio/Alarm.wav similarity index 100% rename from SSLR/Assets/Audio/735832__imataco__alarm.wav rename to SSLR/Assets/Audio/Alarm.wav diff --git a/SSLR/Assets/Audio/735832__imataco__alarm.wav.meta b/SSLR/Assets/Audio/Alarm.wav.meta similarity index 100% rename from SSLR/Assets/Audio/735832__imataco__alarm.wav.meta rename to SSLR/Assets/Audio/Alarm.wav.meta diff --git a/SSLR/Assets/Audio/Lawrence - TrackTribe.mp3 b/SSLR/Assets/Audio/BGM.mp3 similarity index 100% rename from SSLR/Assets/Audio/Lawrence - TrackTribe.mp3 rename to SSLR/Assets/Audio/BGM.mp3 diff --git a/SSLR/Assets/Audio/Lawrence - TrackTribe.mp3.meta b/SSLR/Assets/Audio/BGM.mp3.meta similarity index 100% rename from SSLR/Assets/Audio/Lawrence - TrackTribe.mp3.meta rename to SSLR/Assets/Audio/BGM.mp3.meta diff --git a/SSLR/Assets/Audio/351541__richerlandtv__alert2.mp3 b/SSLR/Assets/Audio/NextClient.mp3 similarity index 100% rename from SSLR/Assets/Audio/351541__richerlandtv__alert2.mp3 rename to SSLR/Assets/Audio/NextClient.mp3 diff --git a/SSLR/Assets/Audio/351541__richerlandtv__alert2.mp3.meta b/SSLR/Assets/Audio/NextClient.mp3.meta similarity index 100% rename from SSLR/Assets/Audio/351541__richerlandtv__alert2.mp3.meta rename to SSLR/Assets/Audio/NextClient.mp3.meta diff --git a/SSLR/Assets/Audio/537869__xantherock__write.wav b/SSLR/Assets/Audio/Pen.wav similarity index 100% rename from SSLR/Assets/Audio/537869__xantherock__write.wav rename to SSLR/Assets/Audio/Pen.wav diff --git a/SSLR/Assets/Audio/537869__xantherock__write.wav.meta b/SSLR/Assets/Audio/Pen.wav.meta similarity index 100% rename from SSLR/Assets/Audio/537869__xantherock__write.wav.meta rename to SSLR/Assets/Audio/Pen.wav.meta diff --git a/SSLR/Assets/Audio/362622__kermite607__stamp.wav b/SSLR/Assets/Audio/Stamp.wav similarity index 100% rename from SSLR/Assets/Audio/362622__kermite607__stamp.wav rename to SSLR/Assets/Audio/Stamp.wav diff --git a/SSLR/Assets/Audio/362622__kermite607__stamp.wav.meta b/SSLR/Assets/Audio/Stamp.wav.meta similarity index 100% rename from SSLR/Assets/Audio/362622__kermite607__stamp.wav.meta rename to SSLR/Assets/Audio/Stamp.wav.meta diff --git a/SSLR/Assets/Audio/Volume.mixer b/SSLR/Assets/Audio/Volume.mixer new file mode 100644 index 0000000..afa2df6 --- /dev/null +++ b/SSLR/Assets/Audio/Volume.mixer @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!244 &-6360793876578840597 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 225f913f199a77c48ad5007e666e5ce5 + m_EffectName: Attenuation + m_MixLevel: 0128e6a5e2808ec4f9a0fc94cd7449d5 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &-3576021559149155211 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SFX + m_AudioMixer: {fileID: 24100000} + m_GroupID: b075e917ff4ab71418b0b95b75c020d9 + m_Children: [] + m_Volume: dabd40466cb5ba744bde541f2f49a991 + m_Pitch: 3021dbf27165137438bcc5cf808118a4 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -6360793876578840597} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &-2617573943359781026 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 67723dd2a51fdbf4cbaa0b8077591fa2 + m_EffectName: Attenuation + m_MixLevel: 50133218997d270439036aaf336f5038 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &-911276085345176349 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Music + m_AudioMixer: {fileID: 24100000} + m_GroupID: e3cf7c048067adf46bac75647c69cb96 + m_Children: [] + m_Volume: a27dbd1185aa6b74fb117a4521c62d1b + m_Pitch: 99fa5e9441e70a849beedab1d65a8d02 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -2617573943359781026} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!241 &24100000 +AudioMixerController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Volume + m_OutputGroup: {fileID: 0} + m_MasterGroup: {fileID: 24300002} + m_Snapshots: + - {fileID: 24500006} + m_StartSnapshot: {fileID: 24500006} + m_SuspendThreshold: -80 + m_EnableSuspend: 1 + m_UpdateMode: 0 + m_ExposedParameters: [] + m_AudioMixerGroupViews: + - guids: + - 74821ebba41de264e81aec61a5d0d587 + - e3cf7c048067adf46bac75647c69cb96 + - b075e917ff4ab71418b0b95b75c020d9 + name: View + m_CurrentViewIndex: 0 + m_TargetSnapshot: {fileID: 24500006} +--- !u!243 &24300002 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Master + m_AudioMixer: {fileID: 24100000} + m_GroupID: 74821ebba41de264e81aec61a5d0d587 + m_Children: + - {fileID: -911276085345176349} + - {fileID: -3576021559149155211} + m_Volume: 173a037a41710c642b15bd9707963e4d + m_Pitch: a6e313fd8a8fb3d46a63d58ca2c982fe + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 24400004} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &24400004 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 306b1e27afb90ca4d89abea6a7567989 + m_EffectName: Attenuation + m_MixLevel: 85fd20e18e3c147458bf8290dfdc4d56 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!245 &24500006 +AudioMixerSnapshotController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snapshot + m_AudioMixer: {fileID: 24100000} + m_SnapshotID: 1de7ae1d15223bc4982cf1afe04b6e70 + m_FloatValues: {} + m_TransitionOverrides: {} diff --git a/SSLR/Assets/Audio/Volume.mixer.meta b/SSLR/Assets/Audio/Volume.mixer.meta new file mode 100644 index 0000000..d77bc02 --- /dev/null +++ b/SSLR/Assets/Audio/Volume.mixer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df25a857dee894b4a8e15121789ffae2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 24100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SSLR/Assets/AudioManager.cs b/SSLR/Assets/AudioManager.cs new file mode 100644 index 0000000..075761f --- /dev/null +++ b/SSLR/Assets/AudioManager.cs @@ -0,0 +1,56 @@ +/* + * Author: Livinia Poo + * Date: 8/2/25 + * Description: + * Audio Manager + */ + +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AudioManager : MonoBehaviour +{ + /// + /// Assign AudioManager instance + /// + public static AudioManager instance; + + [Header("AUDIO SOURCES")] + [SerializeField] private AudioSource musicSource; + [SerializeField] private AudioSource sfxSource; + + [Header("AUDIO CLIPS")] + public AudioClip background; + public AudioClip shiftAlarm; + public AudioClip nextClientAlarm; + public AudioClip pen; + public AudioClip stamp; + + void Start() + { + musicSource.clip = background; + musicSource.Play(); + } + + public void PlaySFX(AudioClip clip) + { + sfxSource.PlayOneShot(clip); + } + + /// + /// assigning the singleton instance + /// + private void Awake() + { + if (instance == null) + { + instance = this; + DontDestroyOnLoad(gameObject); + } + else + { + Destroy(gameObject); + } + } +} diff --git a/SSLR/Assets/AudioManager.cs.meta b/SSLR/Assets/AudioManager.cs.meta new file mode 100644 index 0000000..8078bad --- /dev/null +++ b/SSLR/Assets/AudioManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: db26503dcfdf91e4d8698e0f132fbcbf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SSLR/Assets/Prefabs/Call Button.prefab b/SSLR/Assets/Prefabs/Call Button.prefab index 3d1163a..1a6cc38 100644 --- a/SSLR/Assets/Prefabs/Call Button.prefab +++ b/SSLR/Assets/Prefabs/Call Button.prefab @@ -485,6 +485,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 3082816610593585122} + m_TargetAssemblyTypeName: NextButton, Assembly-CSharp + m_MethodName: PlayBuzzer + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_SelectExited: m_PersistentCalls: m_Calls: [] diff --git a/SSLR/Assets/Scenes/Game Scene.unity b/SSLR/Assets/Scenes/Game Scene.unity index 4801f94..a85567a 100644 --- a/SSLR/Assets/Scenes/Game Scene.unity +++ b/SSLR/Assets/Scenes/Game Scene.unity @@ -15049,6 +15049,134 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00134d40eee1ff84eb904a98548ec295, type: 3} +--- !u!1 &193052222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 193052224} + - component: {fileID: 193052223} + m_Layer: 0 + m_Name: SFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &193052223 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 193052222} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + 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: 1 + 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!4 &193052224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 193052222} + 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: 1590820504} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &199599000 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2305856792916447229, guid: c0b959532160888439760335874bd395, type: 3} @@ -36203,6 +36331,134 @@ Transform: m_CorrespondingSourceObject: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} m_PrefabInstance: {fileID: 1580820634} m_PrefabAsset: {fileID: 0} +--- !u!1 &1066543442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1066543444} + - component: {fileID: 1066543443} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1066543443 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066543442} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + 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!4 &1066543444 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066543442} + 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: 1590820504} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1068668636 GameObject: m_ObjectHideFlags: 0 @@ -37689,7 +37945,7 @@ MonoBehaviour: m_OverrideVoxelSize: 0 m_VoxelSize: 0.06666667 m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: df5edc2658f716041a96905132364a2d, type: 2} + m_NavMeshData: {fileID: 23800000, guid: de28d0eec1a703e4fa799a7b4c7933fa, type: 2} m_BuildHeightMesh: 1 --- !u!114 &1127196874 MonoBehaviour: @@ -50135,6 +50391,59 @@ Transform: m_CorrespondingSourceObject: {fileID: 4704910962696626565, guid: 00134d40eee1ff84eb904a98548ec295, type: 3} m_PrefabInstance: {fileID: 186362933} m_PrefabAsset: {fileID: 0} +--- !u!1 &1590820502 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1590820504} + - component: {fileID: 1590820503} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1590820503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1590820502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db26503dcfdf91e4d8698e0f132fbcbf, type: 3} + m_Name: + m_EditorClassIdentifier: + musicSource: {fileID: 1066543443} + sfxSource: {fileID: 193052223} + background: {fileID: 8300000, guid: 064b43a82e747f94a882543d87316115, type: 3} + shiftAlarm: {fileID: 8300000, guid: f829edd7a26c5ba42835ab675fe11e48, type: 3} + nextClientAlarm: {fileID: 8300000, guid: 509d49be2261b7f41b02e0bd796e48b3, type: 3} + pen: {fileID: 8300000, guid: 19dbe19f01c5ac94fb38b08d922cb3e9, type: 3} + stamp: {fileID: 8300000, guid: ec7977fab6ed4234fa856bde4f312b7f, type: 3} +--- !u!4 &1590820504 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1590820502} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.76072, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1066543444} + - {fileID: 193052224} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1591354590 PrefabInstance: m_ObjectHideFlags: 0 @@ -64862,7 +65171,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4562939406878164559, guid: 298bd5f29cfba0b409e325602c23f9a6, type: 3} propertyPath: m_text - value: 3:00 + value: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -67150,3 +67459,4 @@ SceneRoots: - {fileID: 1101273642} - {fileID: 980344725} - {fileID: 966008677} + - {fileID: 1590820504} diff --git a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset index 4d67ce6..acd6f41 100644 Binary files a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset and b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset differ diff --git a/SSLR/Assets/Scenes/UiScene.unity b/SSLR/Assets/Scenes/UiScene.unity index eadf959..7efe526 100644 --- a/SSLR/Assets/Scenes/UiScene.unity +++ b/SSLR/Assets/Scenes/UiScene.unity @@ -158,6 +158,59 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &31690222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 31690224} + - component: {fileID: 31690223} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &31690223 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31690222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db26503dcfdf91e4d8698e0f132fbcbf, type: 3} + m_Name: + m_EditorClassIdentifier: + musicSource: {fileID: 1053686237} + sfxSource: {fileID: 753714761} + background: {fileID: 8300000, guid: 064b43a82e747f94a882543d87316115, type: 3} + shiftAlarm: {fileID: 8300000, guid: f829edd7a26c5ba42835ab675fe11e48, type: 3} + nextClientAlarm: {fileID: 8300000, guid: 509d49be2261b7f41b02e0bd796e48b3, type: 3} + pen: {fileID: 8300000, guid: 19dbe19f01c5ac94fb38b08d922cb3e9, type: 3} + stamp: {fileID: 8300000, guid: ec7977fab6ed4234fa856bde4f312b7f, type: 3} +--- !u!4 &31690224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 31690222} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.76072, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1053686238} + - {fileID: 753714762} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &69481070 GameObject: m_ObjectHideFlags: 0 @@ -2168,6 +2221,134 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &753714760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 753714762} + - component: {fileID: 753714761} + m_Layer: 0 + m_Name: SFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &753714761 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753714760} + 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!4 &753714762 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 753714760} + 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: 31690224} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &756192406 GameObject: m_ObjectHideFlags: 0 @@ -2653,6 +2834,134 @@ MonoBehaviour: m_isRichTextEditingAllowed: 0 m_LineLimit: 0 m_InputValidator: {fileID: 0} +--- !u!1 &1053686236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1053686238} + - component: {fileID: 1053686237} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1053686237 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053686236} + 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!4 &1053686238 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1053686236} + 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: 31690224} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1087504102 GameObject: m_ObjectHideFlags: 0 @@ -5200,3 +5509,4 @@ SceneRoots: - {fileID: 1249617921} - {fileID: 158339689} - {fileID: 482980186} + - {fileID: 31690224} diff --git a/SSLR/Assets/Scripts/DayManager.cs b/SSLR/Assets/Scripts/DayManager.cs index 01c25a6..4b83c1e 100644 --- a/SSLR/Assets/Scripts/DayManager.cs +++ b/SSLR/Assets/Scripts/DayManager.cs @@ -68,8 +68,8 @@ public class DayManager : MonoBehaviour if (other.CompareTag("Player")) { Debug.Log("Day completed!"); - Backend.instance.User.daysPlayed += 1; - Debug.Log(Backend.instance.User.daysPlayed); + /*Backend.instance.User.daysPlayed += 1; + Debug.Log(Backend.instance.User.daysPlayed);*/ /*shiftManagerScript.AllowShiftStart();*/ Debug.Log("You can start another shift!"); GameManager.instance.EndDay(); diff --git a/SSLR/Assets/Scripts/NextButton.cs b/SSLR/Assets/Scripts/NextButton.cs index 769c561..b1db30b 100644 --- a/SSLR/Assets/Scripts/NextButton.cs +++ b/SSLR/Assets/Scripts/NextButton.cs @@ -26,4 +26,10 @@ public class NextButton : MonoBehaviour PlayerDialogueInteraction.instance.ResetDialogue(); } } + + public void PlayBuzzer() + { + AudioManager.instance.PlaySFX(AudioManager.instance.nextClientAlarm); + Debug.Log("PlayBuzzer"); + } } diff --git a/SSLR/Assets/Scripts/PaperSocket.cs b/SSLR/Assets/Scripts/PaperSocket.cs index 468356c..00c3a26 100644 --- a/SSLR/Assets/Scripts/PaperSocket.cs +++ b/SSLR/Assets/Scripts/PaperSocket.cs @@ -67,7 +67,7 @@ public class PaperSocket : MonoBehaviour var paperDepartment = stampDoc.CheckFinalDepartment(); Debug.Log(paperDepartment); - if (paperDepartment == "Correct") + /*if (paperDepartment == "Correct") { Backend.instance.User.customersHelpedCorrectly += 1; Backend.instance.User.score += GameManager.instance.currentNPC.GetComponent().npcData.points; @@ -75,7 +75,7 @@ public class PaperSocket : MonoBehaviour else if (paperDepartment == "Wrong") { Backend.instance.User.customersHelpedWrongly += 1; - } + }*/ Destroy(paperObject); diff --git a/SSLR/Assets/Scripts/PenInteractor.cs b/SSLR/Assets/Scripts/PenInteractor.cs index 0476003..a124901 100644 --- a/SSLR/Assets/Scripts/PenInteractor.cs +++ b/SSLR/Assets/Scripts/PenInteractor.cs @@ -36,6 +36,8 @@ public class PenInteractor : MonoBehaviour if(!stampDocScript.isSigned) { + AudioManager.instance.PlaySFX(AudioManager.instance.pen); + PlayerDialogueInteraction.instance.servicesPanel.SetActive(true); PlayerDialogueInteraction.instance.questionPanel.SetActive(false); } diff --git a/SSLR/Assets/Scripts/ShiftManager.cs b/SSLR/Assets/Scripts/ShiftManager.cs index 6985239..078685c 100644 --- a/SSLR/Assets/Scripts/ShiftManager.cs +++ b/SSLR/Assets/Scripts/ShiftManager.cs @@ -98,6 +98,7 @@ public class ShiftManager : MonoBehaviour { Debug.Log("Shift ended!"); + AudioManager.instance.PlaySFX(AudioManager.instance.shiftAlarm); remainingTime = shiftDuration; timerText.text = "3:00"; gm.shiftStarted = false; diff --git a/SSLR/Assets/Scripts/StampInteractor.cs b/SSLR/Assets/Scripts/StampInteractor.cs index 54ff0d1..753b733 100644 --- a/SSLR/Assets/Scripts/StampInteractor.cs +++ b/SSLR/Assets/Scripts/StampInteractor.cs @@ -45,6 +45,7 @@ public class StampInteractor : MonoBehaviour if(stampDocScript != null) { + AudioManager.instance.PlaySFX(AudioManager.instance.stamp); if (stampName == "Stamp_Financial" && !stampDocScript.isStamped) { stampDocScript.StampFinancial();