diff --git a/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab b/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab index ece27018..c8de4158 100644 --- a/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab +++ b/Assets/_PROJECT/Prefabs/Audio/AudioManager.prefab @@ -31,7 +31,7 @@ Transform: m_Children: - {fileID: 7894972621602398953} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4356298221615373898 MonoBehaviour: @@ -47,8 +47,10 @@ MonoBehaviour: m_EditorClassIdentifier: MasterVolume: 1 MusicVolume: 1 + AmbienceVolume: 0.5 SFXVolume: 1 UIVolume: 1 + VoiceoverVolume: 0.5 --- !u!1 &1996732796420301035 GameObject: m_ObjectHideFlags: 0 @@ -93,80 +95,318 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7db9618133cf954a8f3392be7f313b3, type: 3} m_Name: m_EditorClassIdentifier: + k__BackingField: + Guid: + Data1: -324096350 + Data2: 1099316438 + Data3: -1292984414 + Data4: -378837710 + Path: event:/Voiceovers/Voicelines_DeltaVR + k__BackingField: + Guid: + Data1: 1483762735 + Data2: 1258384026 + Data3: -1531833953 + Data4: -1365251901 + Path: event:/Music/Kosmos k__BackingField: Guid: - Data1: 54902525 - Data2: 1271041905 - Data3: -1176121172 - Data4: -392562473 - Path: + Data1: -196391782 + Data2: 1257718270 + Data3: -1698565502 + Data4: -616968859 + Path: event:/SFX/PlayerMovement/StepsSingular + k__BackingField: + Guid: + Data1: -986240096 + Data2: 1233908442 + Data3: 298600888 + Data4: -875501008 + Path: event:/SFX/PlayerMovement/StepOnSpin + k__BackingField: + Guid: + Data1: -1357529475 + Data2: 1258541745 + Data3: 161897118 + Data4: 428119285 + Path: event:/SFX/PlayerMovement/Steps k__BackingField: + Guid: + Data1: -1319941 + Data2: 1220650056 + Data3: 1733570177 + Data4: 142904361 + Path: event:/SFX/PlayerMovement/Teleport2D + k__BackingField: + Guid: + Data1: 412434711 + Data2: 1220944741 + Data3: -220698439 + Data4: 1303426807 + Path: event:/SFX/UFODestroy + k__BackingField: + Guid: + Data1: -1874077252 + Data2: 1150509942 + Data3: 645509769 + Data4: 1536999381 + Path: event:/SFX/PlayerMovement/PortalEnter2D + k__BackingField: + Guid: + Data1: 112312141 + Data2: 1128880688 + Data3: -1426767452 + Data4: 1840328986 + Path: event:/SFX/GrabbedItems/SprayerTake + k__BackingField: + Guid: + Data1: 118608240 + Data2: 1295226839 + Data3: -699627845 + Data4: 945338366 + Path: event:/SFX/GrabbedItems/DefaultGrab + k__BackingField: + Guid: + Data1: 485122070 + Data2: 1242644154 + Data3: -1355019904 + Data4: -749529442 + Path: event:/SFX/GrabbedItems/BowGrab + k__BackingField: + Guid: + Data1: -1861796963 + Data2: 1223988433 + Data3: 546006942 + Data4: 987359506 + Path: event:/SFX/Sprayer/Sprayer + k__BackingField: + Guid: + Data1: -1931340209 + Data2: 1130360989 + Data3: -1128746072 + Data4: -776886598 + Path: event:/SFX/Cough + k__BackingField: + Guid: + Data1: 1820151906 + Data2: 1106178825 + Data3: -1182390120 + Data4: 1454552571 + Path: event:/SFX/KitchenPlate + k__BackingField: + Guid: + Data1: 1539310827 + Data2: 1161426549 + Data3: -1042461037 + Data4: 93447117 + Path: event:/SFX/Kapp/KappSuccess + k__BackingField: + Guid: + Data1: -185323157 + Data2: 1288562455 + Data3: 1321442991 + Data4: -662390594 + Path: event:/SFX/3Dprinter/Printing + k__BackingField: + Guid: + Data1: 974935728 + Data2: 1073973828 + Data3: 742043539 + Data4: -1566002667 + Path: event:/SFX/Lexus/DoorOpen + k__BackingField: + Guid: + Data1: 1519138053 + Data2: 1244555346 + Data3: -453953121 + Data4: 1898957900 + Path: event:/SFX/Lexus/DoorClose + k__BackingField: + Guid: + Data1: -900095158 + Data2: 1188884079 + Data3: 1483229324 + Data4: -1805117937 + Path: event:/SFX/Lexus/CarSystem + k__BackingField: + Guid: + Data1: 2116859508 + Data2: 1165465729 + Data3: 2142829992 + Data4: -912259047 + Path: event:/UI/Hover + k__BackingField: Guid: Data1: 54902525 Data2: 1271041905 Data3: -1176121172 Data4: -392562473 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: - k__BackingField: - Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: + Path: event:/UI/MapOpen k__BackingField: Guid: - Data1: 0 - Data2: 0 - Data3: 0 - Data4: 0 - Path: + Data1: -558038968 + Data2: 1319696346 + Data3: 1107837582 + Data4: -794860702 + Path: event:/UI/Click + k__BackingField: + Guid: + Data1: -863141031 + Data2: 1254076244 + Data3: -591610719 + Data4: 1193751756 + Path: event:/UI/LetterEnter + k__BackingField: + Guid: + Data1: 322741274 + Data2: 1107091857 + Data3: -2034091081 + Data4: 598015845 + Path: event:/UI/LetterHover + k__BackingField: + Guid: + Data1: 1103166707 + Data2: 1095145253 + Data3: 921547190 + Data4: 256063913 + Path: event:/UI/RadioTButton + k__BackingField: + Guid: + Data1: 214152321 + Data2: 1136432684 + Data3: -1979358295 + Data4: 727957873 + Path: event:/Ambiences/PortalSpacial + k__BackingField: + Guid: + Data1: -306663290 + Data2: 1335609538 + Data3: 616810918 + Data4: -754318678 + Path: event:/Ambiences/ufo_passing + k__BackingField: + Guid: + Data1: -200200160 + Data2: 1267543231 + Data3: 1464677771 + Data4: -74130765 + Path: event:/SFX/Bow/ArrowHit + k__BackingField: + Guid: + Data1: -1780508309 + Data2: 1154389002 + Data3: -1623188299 + Data4: -576877078 + Path: event:/SFX/Bow/ArrowNock + k__BackingField: + Guid: + Data1: -657802887 + Data2: 1105232605 + Data3: 911021998 + Data4: -1202143404 + Path: event:/SFX/Bow/ArrowRelease + k__BackingField: + Guid: + Data1: 1043279670 + Data2: 1233230216 + Data3: 985191809 + Data4: -1571563267 + Path: event:/SFX/Bow/BowPullback + k__BackingField: + Guid: + Data1: 2115179206 + Data2: 1178400056 + Data3: -1766852727 + Data4: 1465929678 + Path: event:/SFX/Bow/BowPullbackMax + k__BackingField: + Guid: + Data1: 1574855972 + Data2: 1184972559 + Data3: -1754686586 + Data4: 2026193882 + Path: event:/SFX/Elevator/DoorsClosing + k__BackingField: + Guid: + Data1: 51930156 + Data2: 1295666040 + Data3: -188107645 + Data4: 1959602058 + Path: event:/SFX/Elevator/DoorsOpening + k__BackingField: + Guid: + Data1: -606825078 + Data2: 1111584498 + Data3: -2034808418 + Data4: -270770300 + Path: event:/SFX/Elevator/ElevatorArrival + k__BackingField: + Guid: + Data1: 966973676 + Data2: 1165925413 + Data3: -1534451070 + Data4: 1892625454 + Path: event:/SFX/Elevator/ElevatorMovement + k__BackingField: + Guid: + Data1: 1298048660 + Data2: 1188164400 + Data3: 60516773 + Data4: 1605926656 + Path: event:/SFX/Lexus/BoltStopSound + k__BackingField: + Guid: + Data1: -829838395 + Data2: 1207976318 + Data3: -2011680613 + Data4: 1158754874 + Path: event:/SFX/Lexus/CarSimpleDriving + k__BackingField: + Guid: + Data1: -1202191070 + Data2: 1292605223 + Data3: 100994985 + Data4: -61249453 + Path: event:/SFX/Lexus/HornCar + k__BackingField: + Guid: + Data1: 1667252506 + Data2: 1292209057 + Data3: 825712521 + Data4: -1086976415 + Path: event:/SFX/Alarm + k__BackingField: + Guid: + Data1: -1348108059 + Data2: 1203291486 + Data3: -1742053479 + Data4: 1768218737 + Path: event:/UI/AlarmButton + k__BackingField: + Guid: + Data1: 930453098 + Data2: 1152358898 + Data3: -887437678 + Data4: -1421213744 + Path: event:/Ambiences/Server/ServerHum + k__BackingField: + Guid: + Data1: 2088767158 + Data2: 1236037630 + Data3: 1977926589 + Data4: -1933500246 + Path: event:/Ambiences/Server/OnlyHum + k__BackingField: + Guid: + Data1: -1738058147 + Data2: 1087328963 + Data3: 1077989513 + Data4: -494122575 + Path: event:/Ambiences/Robots/Jackal + k__BackingField: + Guid: + Data1: 1839140027 + Data2: 1081087949 + Data3: 1743957925 + Data4: 803747245 + Path: event:/Ambiences/Robots/Robotont diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab index 98aeb7eb..ce621d9c 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/Characters/CafeWaiterNPC.prefab @@ -196,15 +196,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8a215290e2c2e1d43983b61cb160e241, type: 3} m_Name: m_EditorClassIdentifier: + mouth: {fileID: 5759406807219530703} + turnSpeed: 5 voicelinesFolder: CharacterVoicelines characterSpecificFolder: Chef voiceLineKeys: - - Ulrich_Serve - - Ulrich_Get_Correctly - - Ulrich_Excellent - - Ulrich_Terribly_Sorry_1 - - Ulrich_Enjoy - mouth: {fileID: 5759406807219530703} + - Ulrich_Serve | Ulrich_Order + - Ulrich_Get_Correctly | Ulrich_Is_Correct + - Ulrich_Excellent | Ulrich_Coming | Ulrich_Moment | Ulrich_Ready_In + - Ulrich_Terribly_Sorry_1 | Ulrich_Terribly_Sorry_2 | Ulrich_Order_Repeat + - Ulrich_Enjoy | Ulrich_Here_It_Is1 | Ulrich_Here_It_Is2 | Ulrich_Here_You_Go | + Ulrich_Order_Is_Ready minScaleY: 1 maxScaleY: 2 gain: 20 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 6b5cb445..99e703bf 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e04d49d8909b543ffa9425e48b52b417505c06e58f64cea8c77b2861f58b632 -size 68511719 +oid sha256:54756718ea3c5b66d308692765d163bf8708b1b977e8d96429fbc61abe6fec02 +size 68458681 diff --git a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs index 9191d251..a3bb7837 100644 --- a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs +++ b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs @@ -94,6 +94,11 @@ public class FirstPersonOcclusion : MonoBehaviour { if (Listener == null) return; + if (!AudioOccluded.isValid()) { + managedInstances.Remove(AudioOccluded); + return; + } + AudioOccluded.isVirtual(out AudioIsVirtual); AudioOccluded.getPlaybackState(out pb); ListenerDistance = Vector3.Distance(transform.position, Listener.transform.position); diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs index 2e61ba0a..f41f6422 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/NPCController.cs @@ -156,6 +156,11 @@ public abstract class NPCController : MonoBehaviour } string key = voiceLineKeys[voiceLineId]; + if (key.Contains(" | ")) { + string[] choices = key.Split(" | "); + key = choices[Random.Range(0, choices.Length)]; + } + LoadCurve(key); // load RMS data currentVoicelineEvent = AudioManager.Instance.PlayDialogue(characterSpecificFolder + "/" + key, gameObject);