From 4abeeb047a6528dbcfcdf3555bfc35b0c969486b Mon Sep 17 00:00:00 2001 From: kookiekenobi Date: Tue, 18 Feb 2025 06:33:16 +0800 Subject: [PATCH] game: adjusted audio volumes --- SSLR/Assets/Audio/Volume.mixer | 4 +- SSLR/Assets/Scenes/Game Scene.unity | 310 ------------------ SSLR/Assets/Scenes/UiScene.unity | 10 +- SSLR/Assets/{ => Scripts}/AudioManager.cs | 2 +- .../Assets/{ => Scripts}/AudioManager.cs.meta | 0 SSLR/Assets/Scripts/DayManager.cs | 6 +- SSLR/Assets/Scripts/PaperSocket.cs | 5 +- SSLR/Assets/Scripts/ShiftManager.cs | 8 - 8 files changed, 12 insertions(+), 333 deletions(-) rename SSLR/Assets/{ => Scripts}/AudioManager.cs (96%) rename SSLR/Assets/{ => Scripts}/AudioManager.cs.meta (100%) diff --git a/SSLR/Assets/Audio/Volume.mixer b/SSLR/Assets/Audio/Volume.mixer index afa2df6..e4c4d0f 100644 --- a/SSLR/Assets/Audio/Volume.mixer +++ b/SSLR/Assets/Audio/Volume.mixer @@ -134,5 +134,7 @@ AudioMixerSnapshotController: m_Name: Snapshot m_AudioMixer: {fileID: 24100000} m_SnapshotID: 1de7ae1d15223bc4982cf1afe04b6e70 - m_FloatValues: {} + m_FloatValues: + a27dbd1185aa6b74fb117a4521c62d1b: -41.52018 + dabd40466cb5ba744bde541f2f49a991: 20 m_TransitionOverrides: {} diff --git a/SSLR/Assets/Scenes/Game Scene.unity b/SSLR/Assets/Scenes/Game Scene.unity index a85567a..9a09f43 100644 --- a/SSLR/Assets/Scenes/Game Scene.unity +++ b/SSLR/Assets/Scenes/Game Scene.unity @@ -15049,134 +15049,6 @@ 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} @@ -36331,134 +36203,6 @@ 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 @@ -50391,59 +50135,6 @@ 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 @@ -67459,4 +67150,3 @@ SceneRoots: - {fileID: 1101273642} - {fileID: 980344725} - {fileID: 966008677} - - {fileID: 1590820504} diff --git a/SSLR/Assets/Scenes/UiScene.unity b/SSLR/Assets/Scenes/UiScene.unity index 7efe526..34011ec 100644 --- a/SSLR/Assets/Scenes/UiScene.unity +++ b/SSLR/Assets/Scenes/UiScene.unity @@ -2584,7 +2584,7 @@ RectTransform: m_Father: {fileID: 358625118} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -4851,7 +4851,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1812153796 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5305,7 +5305,7 @@ RectTransform: m_Father: {fileID: 29722590} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5380,7 +5380,7 @@ RectTransform: m_Father: {fileID: 195927248} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5455,7 +5455,7 @@ RectTransform: m_Father: {fileID: 396517260} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/SSLR/Assets/AudioManager.cs b/SSLR/Assets/Scripts/AudioManager.cs similarity index 96% rename from SSLR/Assets/AudioManager.cs rename to SSLR/Assets/Scripts/AudioManager.cs index 075761f..bc5c52a 100644 --- a/SSLR/Assets/AudioManager.cs +++ b/SSLR/Assets/Scripts/AudioManager.cs @@ -35,7 +35,7 @@ public class AudioManager : MonoBehaviour public void PlaySFX(AudioClip clip) { - sfxSource.PlayOneShot(clip); + sfxSource.PlayOneShot(clip, 1.0f); } /// diff --git a/SSLR/Assets/AudioManager.cs.meta b/SSLR/Assets/Scripts/AudioManager.cs.meta similarity index 100% rename from SSLR/Assets/AudioManager.cs.meta rename to SSLR/Assets/Scripts/AudioManager.cs.meta diff --git a/SSLR/Assets/Scripts/DayManager.cs b/SSLR/Assets/Scripts/DayManager.cs index 4b83c1e..3aded8a 100644 --- a/SSLR/Assets/Scripts/DayManager.cs +++ b/SSLR/Assets/Scripts/DayManager.cs @@ -67,11 +67,7 @@ public class DayManager : MonoBehaviour { if (other.CompareTag("Player")) { - Debug.Log("Day completed!"); - /*Backend.instance.User.daysPlayed += 1; - Debug.Log(Backend.instance.User.daysPlayed);*/ - /*shiftManagerScript.AllowShiftStart();*/ - Debug.Log("You can start another shift!"); + Backend.instance.User.daysPlayed += 1; GameManager.instance.EndDay(); doneAShift = false; } diff --git a/SSLR/Assets/Scripts/PaperSocket.cs b/SSLR/Assets/Scripts/PaperSocket.cs index 00c3a26..eb4e4a4 100644 --- a/SSLR/Assets/Scripts/PaperSocket.cs +++ b/SSLR/Assets/Scripts/PaperSocket.cs @@ -61,13 +61,12 @@ public class PaperSocket : MonoBehaviour { if (stampDoc.isStamped && stampDoc.isSigned) { - Debug.Log("Checked Docs"); PlayerDialogueInteraction.instance.takeDocumentsTick.SetActive(true); PlayerDialogueInteraction.instance.giveDocumentsTick.SetActive(true); 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 +74,7 @@ public class PaperSocket : MonoBehaviour else if (paperDepartment == "Wrong") { Backend.instance.User.customersHelpedWrongly += 1; - }*/ + } Destroy(paperObject); diff --git a/SSLR/Assets/Scripts/ShiftManager.cs b/SSLR/Assets/Scripts/ShiftManager.cs index 078685c..fad4a40 100644 --- a/SSLR/Assets/Scripts/ShiftManager.cs +++ b/SSLR/Assets/Scripts/ShiftManager.cs @@ -106,14 +106,6 @@ public class ShiftManager : MonoBehaviour NpcManager.instance.EndDay(); } - /// - /// Start next day shift - /// - /*public void AllowShiftStart() - { - shiftTrigger.enabled = true; - }*/ - /// /// Formatting timer text ///