diff --git a/SCHIZO/Creatures/Components/GetCarried.cs b/SCHIZO/Creatures/Components/GetCarried.cs index 5a3746b8..10e97cb2 100644 --- a/SCHIZO/Creatures/Components/GetCarried.cs +++ b/SCHIZO/Creatures/Components/GetCarried.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Nautilus.Utility; using SCHIZO.Sounds.Players; using UnityEngine; using Random = UnityEngine.Random; @@ -20,18 +19,15 @@ partial class GetCarried typeof(Rigidbody), }; - private const string BUS = AudioUtils.BusPaths.UnderwaterCreatures; public override void Awake() { base.Awake(); // contrary to the name, this is actually the max possible priority // full explanation here evaluatePriority = 99f; - pickupSounds = pickupSounds!?.Initialize(BUS); - carrySounds = carrySounds!?.Initialize(BUS); - releaseSounds = releaseSounds!?.Initialize(BUS); _disabledComponents = new List<(MonoBehaviour component, bool wasEnabled)>(); } + public override float Evaluate(float time) => isCarried ? 99f : -99f; // manual start/end private void DisableComponents() diff --git a/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs b/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs index 55cb473e..77947db7 100644 --- a/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs +++ b/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs @@ -1,4 +1,3 @@ -using Nautilus.Utility; using SCHIZO.Creatures.Components; using UnityEngine; @@ -6,11 +5,6 @@ namespace SCHIZO.Creatures.Ermshark; partial class ErmsharkAttack { - private void Awake() - { - attackSounds = attackSounds!?.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); - } - public override void OnTouch(Collider collider) { if (!enabled) return; diff --git a/SCHIZO/Events/Ermcon/ErmconAttendee.cs b/SCHIZO/Events/Ermcon/ErmconAttendee.cs index 0c5e28eb..3c58b78e 100644 --- a/SCHIZO/Events/Ermcon/ErmconAttendee.cs +++ b/SCHIZO/Events/Ermcon/ErmconAttendee.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using Nautilus.Utility; using UnityEngine; namespace SCHIZO.Events.Ermcon; @@ -50,7 +49,6 @@ public override void Awake() // "meta"-priority - this number determines the order in which actions get *evaluated* // and the priority obtained from Evaluate() actually determines which action gets *performed* evaluatePriority = 99f; - pickupDeniedSounds = pickupDeniedSounds!?.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); } public void OnHandHover(GUIHand hand) { diff --git a/SCHIZO/Interop/Subnautica/_FMODAsset.cs b/SCHIZO/Interop/Subnautica/_FMODAsset.cs new file mode 100644 index 00000000..c6f38d86 --- /dev/null +++ b/SCHIZO/Interop/Subnautica/_FMODAsset.cs @@ -0,0 +1,3 @@ +namespace SCHIZO.Interop.Subnautica; + +partial class _FMODAsset : FMODAsset; diff --git a/SCHIZO/Jukebox/CustomJukeboxDisk.BelowZero.cs b/SCHIZO/Jukebox/CustomJukeboxDisk.BelowZero.cs index df4442b7..ba4ca1f0 100644 --- a/SCHIZO/Jukebox/CustomJukeboxDisk.BelowZero.cs +++ b/SCHIZO/Jukebox/CustomJukeboxDisk.BelowZero.cs @@ -2,6 +2,7 @@ using FMODUnity; using Nautilus.Handlers; using Nautilus.Utility; +using SCHIZO.Sounds; using UnityEngine; namespace SCHIZO.Jukebox; @@ -24,9 +25,9 @@ public sealed class CustomJukeboxDisk : JukeboxDisk if (!CustomSoundHandler.TryGetCustomSound(guid, out _)) { - const string BUS = "bus:/master/SFX_for_pause/PDA_pause/all"; - CustomSoundHandler.RegisterCustomSound(guid, unlockSound, BUS, AudioUtils.StandardSoundModes_2D); - RuntimeManager.GetBus(BUS).unlockChannelGroup(); + string bus = BusPaths.SFX.GetBusName(); + CustomSoundHandler.RegisterCustomSound(guid, unlockSound, bus, AudioUtils.StandardSoundModes_2D); + RuntimeManager.GetBus(bus).unlockChannelGroup(); } acquireSound = AudioUtils.GetFmodAsset(guid); diff --git a/SCHIZO/Resources/AssetBundles/Assets.cs b/SCHIZO/Resources/AssetBundles/Assets.cs index f5d8542d..e39c6b91 100644 --- a/SCHIZO/Resources/AssetBundles/Assets.cs +++ b/SCHIZO/Resources/AssetBundles/Assets.cs @@ -12,7 +12,7 @@ namespace SCHIZO.Resources; public static class Assets { - private const int _rnd = -112038177; + private const int _rnd = 228879590; private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets"); diff --git a/SCHIZO/Resources/AssetBundles/assets b/SCHIZO/Resources/AssetBundles/assets index 6e2c1071..af53f3c9 100644 Binary files a/SCHIZO/Resources/AssetBundles/assets and b/SCHIZO/Resources/AssetBundles/assets differ diff --git a/SCHIZO/Sounds/BusPaths.cs b/SCHIZO/Sounds/BusPaths.cs new file mode 100644 index 00000000..2d707ae3 --- /dev/null +++ b/SCHIZO/Sounds/BusPaths.cs @@ -0,0 +1,19 @@ +using System; +using Nautilus.Utility; + +namespace SCHIZO.Sounds; + +public static class BusPathsExtensions +{ + public static string GetBusName(this BusPaths bus) + { + return bus switch + { + BusPaths.PDAVoice => AudioUtils.BusPaths.PDAVoice, + BusPaths.UnderwaterCreatures => AudioUtils.BusPaths.UnderwaterCreatures, + BusPaths.IndoorSounds => "bus:/master/SFX_for_pause/PDA_pause/all/indoorsounds", + BusPaths.SFX => "bus:/master/SFX_for_pause/PDA_pause/all/SFX", + _ => throw new ArgumentOutOfRangeException(nameof(bus), bus, null) + }; + } +} diff --git a/SCHIZO/Sounds/Collections/SoundCollection.cs b/SCHIZO/Sounds/Collections/SoundCollection.cs deleted file mode 100644 index afb78377..00000000 --- a/SCHIZO/Sounds/Collections/SoundCollection.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using JetBrains.Annotations; - -namespace SCHIZO.Sounds.Collections; - -partial class SoundCollection -{ - private readonly Dictionary _instances = new(); - - [MustUseReturnValue] - public virtual SoundCollectionInstance Initialize(string bus) - { - if (_instances.TryGetValue(bus, out SoundCollectionInstance instance)) return instance; - return _instances[bus] = SoundCollectionInstance.Create(this, bus); - } - - public virtual float LastPlay => throw new InvalidOperationException($"SoundCollection {this} has not been initialized"); - public virtual void Play2D(float delay = 0) => throw new InvalidOperationException($"SoundCollection {this} has not been initialized"); - public virtual void Play(FMOD_CustomEmitter emitter, float delay = 0) => throw new InvalidOperationException($"SoundCollection {this} has not been initialized"); - public virtual void CancelAllDelayed() => throw new InvalidOperationException($"SoundCollection {this} has not been initialized"); -} diff --git a/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs b/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs index 3e3116cd..2dabc5a9 100644 --- a/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs +++ b/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs @@ -1,44 +1,32 @@ using System; -using System.Collections.Generic; -using UnityEngine; +using Nautilus.Utility; namespace SCHIZO.Sounds.Collections; -public sealed class SoundCollectionInstance : SoundCollection +partial class SoundCollectionInstance { private FMODSoundCollection _fmodSounds; - private string _bus; - public static SoundCollectionInstance Create(SoundCollection soundCollection, string bus) + private void OnEnable() { - SoundCollectionInstance instance = CreateInstance(); - instance._fmodSounds = FMODSoundCollection.For(soundCollection, bus); - instance._bus = bus; - return instance; + _fmodSounds = FMODSoundCollection.For(collection, bus.GetBusName()); + path = id = new Guid().ToString(); } - [Obsolete("SoundCollectionInstance does not need to be initialized", true)] - public override SoundCollectionInstance Initialize(string bus) - { - if (_bus != bus) throw new InvalidOperationException($"SoundCollection {this} is already initialized with a different bus ({_bus} != {bus})"); - return this; - } - - public override float LastPlay => _fmodSounds.LastPlay; + public float LastPlay => _fmodSounds.LastPlay; - public override void Play2D(float delay = 0) + public void Play2D(float delay = 0) { _fmodSounds.Play2D(delay); } - public override void Play(FMOD_CustomEmitter emitter, float delay = 0) + public void Play(FMOD_CustomEmitter emitter, float delay = 0) { if (!emitter) throw new ArgumentNullException(nameof(emitter)); _fmodSounds.Play(emitter, delay); } - public override void CancelAllDelayed() => _fmodSounds.CancelAllDelayed(); + public void CancelAllDelayed() => _fmodSounds.CancelAllDelayed(); - [Obsolete("SoundCollectionInstance does not support enumerating sounds", true)] - public override IEnumerable GetSounds() => throw new InvalidOperationException("SoundCollectionInstance does not support enumerating sounds"); + public void Stop() => _fmodSounds.Stop(); } diff --git a/SCHIZO/Sounds/FMODSoundCollection.cs b/SCHIZO/Sounds/FMODSoundCollection.cs index 198430fd..897156b0 100644 --- a/SCHIZO/Sounds/FMODSoundCollection.cs +++ b/SCHIZO/Sounds/FMODSoundCollection.cs @@ -4,6 +4,7 @@ using FMOD; using FMOD.Studio; using FMODUnity; +using Nautilus.FMod.Interfaces; using Nautilus.Handlers; using Nautilus.Utility; using SCHIZO.DataStructures; @@ -23,10 +24,12 @@ private enum VCA Voice, Ambient } + private static readonly Dictionary _cache = new(); private readonly string _busName; private readonly List _sounds = new(); + private readonly List _channels = new(); private bool _ready; private RandomList _randomSounds; @@ -123,6 +126,18 @@ IEnumerator PlayWithDelay(float del) } } + public void Stop() + { + if (!Initialize()) return; + if (Assets.Options_DisableAllSounds.Value) return; + + foreach (Channel channel in _channels) + { + channel.stop(); + } + ClearChannelsCache(); + } + private void PlaySound(FMOD_CustomEmitter emitter = null) { LastPlay = Time.time; @@ -139,9 +154,21 @@ private void PlaySound(FMOD_CustomEmitter emitter = null) CustomSoundHandler.TryPlayCustomSound(sound, out Channel channel); channel.setVolume(GetVolumeFor(GetVCAForBus(_busName))); channel.set3DLevel(0); + + ClearChannelsCache(); + _channels.Add(channel); } } + private void ClearChannelsCache() + { + _channels.RemoveAll(c => + { + RESULT result = c.isPlaying(out bool isPlaying); + return result != RESULT.OK || !isPlaying; + }); + } + private static VCA GetVCAForBus(string bus) { if (bus.StartsWith("bus:/master/Music")) return VCA.Music; diff --git a/SCHIZO/Sounds/ItemSounds.cs b/SCHIZO/Sounds/ItemSounds.cs index ddbacae7..3d243903 100644 --- a/SCHIZO/Sounds/ItemSounds.cs +++ b/SCHIZO/Sounds/ItemSounds.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Nautilus.Utility; namespace SCHIZO.Sounds; @@ -21,18 +20,5 @@ public void Register(TechType techType) } _registeredItemSounds[techType] = this; - - // If multiple items share the same sounds, Initialize will return the same SoundCollectionInstance as long as the bus is the same, so we don't need to worry about not calling it. - - pickupSounds = pickupSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); - dropSounds = dropSounds!?.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); - - drawSounds = drawSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); - holsterSounds = holsterSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); - - cookSounds = cookSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); - eatSounds = eatSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); - - playerDeathSounds = playerDeathSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); } } diff --git a/SCHIZO/Sounds/Patches/ItemSoundsPatches.cs b/SCHIZO/Sounds/Patches/ItemSoundsPatches.cs index a2786d6e..8a8e9762 100644 --- a/SCHIZO/Sounds/Patches/ItemSoundsPatches.cs +++ b/SCHIZO/Sounds/Patches/ItemSoundsPatches.cs @@ -4,6 +4,7 @@ using HarmonyLib; using JetBrains.Annotations; using SCHIZO.Helpers; +using SCHIZO.Sounds.Players; using UnityEngine; namespace SCHIZO.Sounds.Patches; @@ -28,6 +29,8 @@ public static void PlayCustomDropSound(Pickupable __instance) sounds.holsterSounds!?.CancelAllDelayed(); sounds.dropSounds.Play(__instance.GetComponent()); + + __instance.GetComponentsInChildren().ForEach(p => p.Stop()); } [HarmonyPatch(typeof(PlayerTool), nameof(PlayerTool.OnDraw))] diff --git a/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs b/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs index 325feeb0..ec16fef0 100644 --- a/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs +++ b/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs @@ -7,9 +7,8 @@ partial class InventoryAmbientSoundPlayer { private float _timer = -1; - protected override void Awake() + private void Awake() { - base.Awake(); ResetTimer(); } diff --git a/SCHIZO/Sounds/Players/SoundPlayer.cs b/SCHIZO/Sounds/Players/SoundPlayer.cs index 1653b333..f8b2a0d8 100644 --- a/SCHIZO/Sounds/Players/SoundPlayer.cs +++ b/SCHIZO/Sounds/Players/SoundPlayer.cs @@ -1,25 +1,16 @@ -using System; -using SCHIZO.Helpers; - namespace SCHIZO.Sounds.Players; partial class SoundPlayer { - protected virtual void Awake() + public void Play(float delay = 0) { - string busOrFieldPath = string.IsNullOrEmpty(bus) ? DefaultBus : bus; - if (string.IsNullOrEmpty(busOrFieldPath)) throw new InvalidOperationException($"No bus assigned to {this}"); - // the string is most likely a field path, but we can also directly accept bus paths (and guids) - string actualBus = busOrFieldPath.StartsWith("bus:/") || Guid.TryParse(busOrFieldPath, out _) - ? busOrFieldPath - : StaticHelpers.GetValue(busOrFieldPath); - - soundCollection = soundCollection.Initialize(actualBus); + if (Is3D) sounds.Play(emitter, delay); + else sounds.Play2D(delay); } - public void Play(float delay = 0) + public void Stop() { - if (Is3D) soundCollection.Play(emitter, delay); - else soundCollection.Play2D(delay); + if (Is3D) emitter.Stop(); + else sounds.Stop(); } } diff --git a/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs b/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs index 6bf392e9..23fadc97 100644 --- a/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs +++ b/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs @@ -7,9 +7,8 @@ partial class WorldAmbientSoundPlayer { private float _timer = -1; - protected override void Awake() + private void Awake() { - base.Awake(); ResetTimer(); } diff --git a/SCHIZO/Sounds/ScanSoundHandler.cs b/SCHIZO/Sounds/ScanSoundHandler.cs index 6b04d863..55f4a8f7 100644 --- a/SCHIZO/Sounds/ScanSoundHandler.cs +++ b/SCHIZO/Sounds/ScanSoundHandler.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using HarmonyLib; -using Nautilus.Utility; using SCHIZO.Sounds.Collections; namespace SCHIZO.Sounds; @@ -10,9 +9,9 @@ public static class ScanSoundHandler { private static readonly Dictionary _scanSounds = new(); - public static void Register(TechType techType, SoundCollection soundCollection) + public static void Register(TechType techType, SoundCollectionInstance soundCollection) { - _scanSounds.Add(techType, soundCollection.Initialize(AudioUtils.BusPaths.PDAVoice)); + _scanSounds.Add(techType, soundCollection); } [HarmonyPatch] diff --git a/SCHIZO/_old/Creatures/Ermfish/ErmfishLoader.cs b/SCHIZO/_old/Creatures/Ermfish/ErmfishLoader.cs index fccea85b..36b2508d 100644 --- a/SCHIZO/_old/Creatures/Ermfish/ErmfishLoader.cs +++ b/SCHIZO/_old/Creatures/Ermfish/ErmfishLoader.cs @@ -17,11 +17,6 @@ public sealed class ErmfishLoader : PickupableCreatureLoader GetLootDistributionData() { foreach (BiomeType biome in BiomeHelpers.GetOpenWaterBiomes()) diff --git a/SCHIZO/_old/Credits/EasterEggPatches.Subnautica.cs b/SCHIZO/_old/Credits/EasterEggPatches.Subnautica.cs index 6abe720d..ea5a3d59 100644 --- a/SCHIZO/_old/Credits/EasterEggPatches.Subnautica.cs +++ b/SCHIZO/_old/Credits/EasterEggPatches.Subnautica.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Linq; using HarmonyLib; +using Nautilus.FMod; using Nautilus.Handlers; using SCHIZO.Resources; using SCHIZO.Sounds; diff --git a/Unity/Assets/Ermfish/Cooked ermfish.prefab b/Unity/Assets/Ermfish/Cooked ermfish.prefab index 77d5fbda..8ba35fde 100644 --- a/Unity/Assets/Ermfish/Cooked ermfish.prefab +++ b/Unity/Assets/Ermfish/Cooked ermfish.prefab @@ -67,6 +67,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: soundCollection: {fileID: 11400000, guid: 2b7bde06469e9fc49911f3cac3ffa231, type: 2} + soundCollection_: {fileID: -1161355378763634503, guid: 2b7bde06469e9fc49911f3cac3ffa231, + type: 2} bus: Nautilus.Utility.AudioUtils+BusPaths:UnderwaterCreatures emitter: {fileID: 2702267877378328202} minDelayDefault: {fileID: 0} @@ -113,6 +115,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: soundCollection: {fileID: 11400000, guid: 2b7bde06469e9fc49911f3cac3ffa231, type: 2} + soundCollection_: {fileID: -1178557504063532876, guid: 2b7bde06469e9fc49911f3cac3ffa231, + type: 2} bus: emitter: {fileID: 0} minDelayDefault: {fileID: 11400000, guid: cddef268080982e4eae92e262bd08d9f, type: 2} diff --git a/Unity/Assets/Ermfish/Databank/Databank.asset b/Unity/Assets/Ermfish/Databank/Databank.asset index 7c0f3052..f38c7eeb 100644 --- a/Unity/Assets/Ermfish/Databank/Databank.asset +++ b/Unity/Assets/Ermfish/Databank/Databank.asset @@ -15,7 +15,8 @@ MonoBehaviour: scanTime: 5 unlockSprite: {fileID: 21300000, guid: 5d63c67e19cdd4445bcff6ddf9f6780c, type: 3} isImportantUnlock: 0 - scanSounds: {fileID: 11400000, guid: 1138c2d796e81ac43a4f257daf9651b7, type: 2} + scanSounds: {fileID: 8990697991671373227, guid: 1138c2d796e81ac43a4f257daf9651b7, + type: 2} encyPath: Lifeforms/Fauna/SmallHerbivores title: Ermfish texture: {fileID: 2800000, guid: d49d9f150a353394d84717884b9d8c8f, type: 3} diff --git a/Unity/Assets/Ermfish/Erm.prefab b/Unity/Assets/Ermfish/Erm.prefab index 24b3f00f..3e4599c3 100644 --- a/Unity/Assets/Ermfish/Erm.prefab +++ b/Unity/Assets/Ermfish/Erm.prefab @@ -45,6 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: soundCollection: {fileID: 11400000, guid: 2b7bde06469e9fc49911f3cac3ffa231, type: 2} + soundCollection_: {fileID: 3865180988560541106, guid: 2b7bde06469e9fc49911f3cac3ffa231, + type: 2} bus: SCHIZO.Sounds.Players.SoundPlayer:INDOOR_SOUNDS_BUS emitter: {fileID: 6178876673480739924} minDelayDefault: {fileID: 0} diff --git a/Unity/Assets/Ermfish/Ermfish.prefab b/Unity/Assets/Ermfish/Ermfish.prefab index 8fd6fd01..f2837e6c 100644 --- a/Unity/Assets/Ermfish/Ermfish.prefab +++ b/Unity/Assets/Ermfish/Ermfish.prefab @@ -241,7 +241,8 @@ MonoBehaviour: m_RotationOrder: 4 minActionCheckInterval: -1 patience: 5 - pickupDeniedSounds: {fileID: 11400000, guid: a9990fe6122b54044a82b0e0f21b27bb, type: 2} + pickupDeniedSounds: {fileID: 4185819974502500907, guid: a9990fe6122b54044a82b0e0f21b27bb, + type: 2} emitter: {fileID: 5648931341203019549} --- !u!114 &-906797858269330932 MonoBehaviour: @@ -701,6 +702,12 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 4f47d8b7127a0234ea057da7472d7808, type: 2} + - target: {fileID: 2722342412455638247, guid: 5ff80f47f2822bb438251c8a7a1370ca, + type: 3} + propertyPath: soundCollection_ + value: + objectReference: {fileID: 3464179523288004460, guid: 4f47d8b7127a0234ea057da7472d7808, + type: 2} - target: {fileID: 3015870805474854860, guid: 5ff80f47f2822bb438251c8a7a1370ca, type: 3} propertyPath: swimVelocity @@ -722,6 +729,12 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 2b7bde06469e9fc49911f3cac3ffa231, type: 2} + - target: {fileID: 3365459996886375183, guid: 5ff80f47f2822bb438251c8a7a1370ca, + type: 3} + propertyPath: soundCollection_ + value: + objectReference: {fileID: -1178557504063532876, guid: 2b7bde06469e9fc49911f3cac3ffa231, + type: 2} - target: {fileID: 3919769461741374411, guid: 5ff80f47f2822bb438251c8a7a1370ca, type: 3} propertyPath: maxAcceleration @@ -828,6 +841,12 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 2b7bde06469e9fc49911f3cac3ffa231, type: 2} + - target: {fileID: 7784437994874313104, guid: 5ff80f47f2822bb438251c8a7a1370ca, + type: 3} + propertyPath: soundCollection_ + value: + objectReference: {fileID: -1161355378763634503, guid: 2b7bde06469e9fc49911f3cac3ffa231, + type: 2} - target: {fileID: 8066641660152872387, guid: 5ff80f47f2822bb438251c8a7a1370ca, type: 3} propertyPath: type diff --git a/Unity/Assets/Ermfish/Sounds/Ambient/Erm Ambient.asset b/Unity/Assets/Ermfish/Sounds/Ambient/Erm Ambient.asset index 54077c59..479c3b58 100644 --- a/Unity/Assets/Ermfish/Sounds/Ambient/Erm Ambient.asset +++ b/Unity/Assets/Ermfish/Sounds/Ambient/Erm Ambient.asset @@ -1,5 +1,37 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1178557504063532876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Erm Ambient (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 +--- !u!114 &-1161355378763634503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Erm Ambient (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -133,3 +165,19 @@ MonoBehaviour: - {fileID: 8300000, guid: db7317e374370b64aaf590698fef9073, type: 3} - {fileID: 8300000, guid: 2f842a78122a1c944b8f4b06889609e7, type: 3} - {fileID: 8300000, guid: d5c2541768c535a4099171d4ff7a0a26, type: 3} +--- !u!114 &3865180988560541106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Erm Ambient (IndoorSounds) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 2 diff --git a/Unity/Assets/Ermfish/Sounds/Cook/Cook.asset b/Unity/Assets/Ermfish/Sounds/Cook/Cook.asset index f453c1da..7618e622 100644 --- a/Unity/Assets/Ermfish/Sounds/Cook/Cook.asset +++ b/Unity/Assets/Ermfish/Sounds/Cook/Cook.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5721366197670801128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Cook (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Cook - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 0d95dfb73ac6cd7459b3b17cc53d1e18, type: 3} - {fileID: 8300000, guid: dbbc9d9d5a67153419cd3f2a9071356e, type: 3} diff --git a/Unity/Assets/Ermfish/Sounds/Draw/Draw.asset b/Unity/Assets/Ermfish/Sounds/Draw/Draw.asset index 623dc6da..27146821 100644 --- a/Unity/Assets/Ermfish/Sounds/Draw/Draw.asset +++ b/Unity/Assets/Ermfish/Sounds/Draw/Draw.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1283271998513201123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Draw (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Draw - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: f697c3115e008ed47a48bc5759fa1a42, type: 3} - {fileID: 8300000, guid: e2fbcab2ee167b44f9ea924b27ea1678, type: 3} diff --git a/Unity/Assets/Ermfish/Sounds/Drop/Drop.asset b/Unity/Assets/Ermfish/Sounds/Drop/Drop.asset index edc70670..6f2a9d03 100644 --- a/Unity/Assets/Ermfish/Sounds/Drop/Drop.asset +++ b/Unity/Assets/Ermfish/Sounds/Drop/Drop.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Drop - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: dd4f251a5376677438ef54575cbabe0b, type: 3} - {fileID: 8300000, guid: 0c2d66b29f9bd65429e88cf0ad88bf44, type: 3} @@ -32,3 +32,19 @@ MonoBehaviour: - {fileID: 8300000, guid: bbfb4b602f69fa3479744a0cd81fe385, type: 3} - {fileID: 8300000, guid: defbd16f21696c246b36e4bb670ae420, type: 3} - {fileID: 8300000, guid: 4a8b1199f27ca554685267c4a3088f8d, type: 3} +--- !u!114 &8627429168110412010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Drop (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 diff --git a/Unity/Assets/Ermfish/Sounds/Eat/Eat.asset b/Unity/Assets/Ermfish/Sounds/Eat/Eat.asset index ceb1e478..4933cff8 100644 --- a/Unity/Assets/Ermfish/Sounds/Eat/Eat.asset +++ b/Unity/Assets/Ermfish/Sounds/Eat/Eat.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7747133109380198944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Eat (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Eat - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 75c2f5cee1f4fb84daf12bed43290730, type: 3} - {fileID: 8300000, guid: 26c680fa6ae7a05428b19ca6d745ebd9, type: 3} diff --git a/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset b/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset index 567288a6..6e0c865b 100644 --- a/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset +++ b/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset @@ -12,10 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: efd98f6d65dc4615a0a85770a69d8cef, type: 3} m_Name: Ermfish Sounds m_EditorClassIdentifier: - pickupSounds: {fileID: 11400000, guid: f247414bf2966cf47aaafd9366ae6ca4, type: 2} - dropSounds: {fileID: 11400000, guid: 6eded4b83ed55cc4aac8329f5aaef703, type: 2} - drawSounds: {fileID: 11400000, guid: 80a13049ce8e7d04cabc4fd9c887c1d7, type: 2} - holsterSounds: {fileID: 11400000, guid: d105741eaefb1404bad1edcd3eb49376, type: 2} - cookSounds: {fileID: 11400000, guid: 5f9bffa48791b084487973927c5a3901, type: 2} - eatSounds: {fileID: 11400000, guid: 411f4ebbddbe2ea48b4129b7e8c80fab, type: 2} - playerDeathSounds: {fileID: 11400000, guid: 6938fa7f2dacc6744be8be845962bfbb, type: 2} + pickupSounds: {fileID: 8458760947928161761, guid: f247414bf2966cf47aaafd9366ae6ca4, + type: 2} + dropSounds: {fileID: 8627429168110412010, guid: 6eded4b83ed55cc4aac8329f5aaef703, + type: 2} + drawSounds: {fileID: -1283271998513201123, guid: 80a13049ce8e7d04cabc4fd9c887c1d7, + type: 2} + holsterSounds: {fileID: -4270812767883075156, guid: d105741eaefb1404bad1edcd3eb49376, + type: 2} + cookSounds: {fileID: -5721366197670801128, guid: 5f9bffa48791b084487973927c5a3901, + type: 2} + eatSounds: {fileID: -7747133109380198944, guid: 411f4ebbddbe2ea48b4129b7e8c80fab, + type: 2} + playerDeathSounds: {fileID: 3205708133243211440, guid: 6938fa7f2dacc6744be8be845962bfbb, + type: 2} diff --git a/Unity/Assets/Ermfish/Sounds/Holster/Holster.asset b/Unity/Assets/Ermfish/Sounds/Holster/Holster.asset index 7c686342..3d250881 100644 --- a/Unity/Assets/Ermfish/Sounds/Holster/Holster.asset +++ b/Unity/Assets/Ermfish/Sounds/Holster/Holster.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4270812767883075156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Holster (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Holster - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 719b08eeef0477246a7e152ead3cb668, type: 3} - {fileID: 8300000, guid: bd01c6e36585f9d4aa76f44e76f3e980, type: 3} diff --git a/Unity/Assets/Ermfish/Sounds/Hurt/Hurt.asset b/Unity/Assets/Ermfish/Sounds/Hurt/Hurt.asset index 5ca1959c..3896b9f0 100644 --- a/Unity/Assets/Ermfish/Sounds/Hurt/Hurt.asset +++ b/Unity/Assets/Ermfish/Sounds/Hurt/Hurt.asset @@ -11,10 +11,26 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Hurt - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 17fa4311013d0a34d95aef60c8f0fecc, type: 3} - {fileID: 8300000, guid: 4fccbfb045a91a645b54be5d6babb72b, type: 3} - {fileID: 8300000, guid: d574bdd3014239547b725d4934e81f67, type: 3} - {fileID: 8300000, guid: 9968839470be59047b6ef957f6f1717f, type: 3} - {fileID: 8300000, guid: 7657f99dccb496a418bb58075f97aa26, type: 3} +--- !u!114 &3464179523288004460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Hurt (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 diff --git a/Unity/Assets/Ermfish/Sounds/Pickup Denied/Pickup Denied.asset b/Unity/Assets/Ermfish/Sounds/Pickup Denied/Pickup Denied.asset index a6ffaf8e..f006e68b 100644 --- a/Unity/Assets/Ermfish/Sounds/Pickup Denied/Pickup Denied.asset +++ b/Unity/Assets/Ermfish/Sounds/Pickup Denied/Pickup Denied.asset @@ -13,3 +13,19 @@ MonoBehaviour: m_Name: Pickup Denied m_EditorClassIdentifier: sounds: [] +--- !u!114 &4185819974502500907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Pickup Denied (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 diff --git a/Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset b/Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset index 1188ab69..8e0a37a6 100644 --- a/Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset +++ b/Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Pickup - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 639bdeb94ec1cd140ad945633575a309, type: 3} - {fileID: 8300000, guid: 1c61e91d60f98914fb4a6b837be87b45, type: 3} @@ -36,3 +36,19 @@ MonoBehaviour: - {fileID: 8300000, guid: 380f9acf27ee04f45a099c0dfbb09f2d, type: 3} - {fileID: 8300000, guid: 65a772dd77e1dde458194ceafe416cae, type: 3} - {fileID: 8300000, guid: 9ffcda48d956de04ca489083e233db5e, type: 3} +--- !u!114 &8458760947928161761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Pickup (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 diff --git a/Unity/Assets/Ermfish/Sounds/Player Death/Ermfish Player Death.asset b/Unity/Assets/Ermfish/Sounds/Player Death/Ermfish Player Death.asset index 91b76c21..7053f0f1 100644 --- a/Unity/Assets/Ermfish/Sounds/Player Death/Ermfish Player Death.asset +++ b/Unity/Assets/Ermfish/Sounds/Player Death/Ermfish Player Death.asset @@ -11,7 +11,23 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Ermfish Player Death - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: c0221838fafbea4469becc63fefa1a71, type: 3} - {fileID: 8300000, guid: f6b474bf138aceb45931cb8648a722f0, type: 3} +--- !u!114 &3205708133243211440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Ermfish Player Death (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 diff --git a/Unity/Assets/Ermfish/Sounds/Scan/Scan.asset b/Unity/Assets/Ermfish/Sounds/Scan/Scan.asset index c310f8c3..b2046fcd 100644 --- a/Unity/Assets/Ermfish/Sounds/Scan/Scan.asset +++ b/Unity/Assets/Ermfish/Sounds/Scan/Scan.asset @@ -11,6 +11,22 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Scan - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: b178a93109bff414e9795e16cd47b874, type: 3} +--- !u!114 &8990697991671373227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Scan (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 diff --git a/Unity/Assets/Ermshark/Databank/Databank BZ.asset b/Unity/Assets/Ermshark/Databank/Databank BZ.asset index 2cf88d54..ee200408 100644 --- a/Unity/Assets/Ermshark/Databank/Databank BZ.asset +++ b/Unity/Assets/Ermshark/Databank/Databank BZ.asset @@ -15,7 +15,8 @@ MonoBehaviour: scanTime: 5 unlockSprite: {fileID: 21300000, guid: 85c36857a3ce21c49b2b3d2d1c09ecb6, type: 3} isImportantUnlock: 0 - scanSounds: {fileID: 11400000, guid: 935233e4761193a489883563680a8478, type: 2} + scanSounds: {fileID: -2996190608115189883, guid: 935233e4761193a489883563680a8478, + type: 2} encyPath: Lifeforms/Fauna/Carnivores title: Ermshark texture: {fileID: 2800000, guid: cee0542806d2bae418d81f925da9a9fa, type: 3} diff --git a/Unity/Assets/Ermshark/Databank/Databank SN.asset b/Unity/Assets/Ermshark/Databank/Databank SN.asset index 5b92cc80..635f5d65 100644 --- a/Unity/Assets/Ermshark/Databank/Databank SN.asset +++ b/Unity/Assets/Ermshark/Databank/Databank SN.asset @@ -15,7 +15,8 @@ MonoBehaviour: scanTime: 5 unlockSprite: {fileID: 21300000, guid: 85c36857a3ce21c49b2b3d2d1c09ecb6, type: 3} isImportantUnlock: 0 - scanSounds: {fileID: 11400000, guid: 935233e4761193a489883563680a8478, type: 2} + scanSounds: {fileID: -2996190608115189883, guid: 935233e4761193a489883563680a8478, + type: 2} encyPath: Lifeforms/Fauna/Sharks title: Ermshark texture: {fileID: 2800000, guid: cee0542806d2bae418d81f925da9a9fa, type: 3} diff --git a/Unity/Assets/Ermshark/Ermshark prefab.prefab b/Unity/Assets/Ermshark/Ermshark prefab.prefab index 8f44eec1..724006b8 100644 --- a/Unity/Assets/Ermshark/Ermshark prefab.prefab +++ b/Unity/Assets/Ermshark/Ermshark prefab.prefab @@ -470,7 +470,8 @@ MonoBehaviour: biteAggressionDecrement: 0.4 damageFX: {fileID: 0} _attackSound: {fileID: 0} - attackSounds: {fileID: 11400000, guid: 0d3bacd789afd8c488a63f3f4769c807, type: 2} + attackSounds: {fileID: -651457221615391217, guid: 0d3bacd789afd8c488a63f3f4769c807, + type: 2} emitter: {fileID: 3132534834664993527} --- !u!1 &9197955336955550917 GameObject: @@ -720,6 +721,12 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 9ee9dfa7770ab144dad626ab9273ce05, type: 2} + - target: {fileID: 2722342412455638247, guid: 5ff80f47f2822bb438251c8a7a1370ca, + type: 3} + propertyPath: soundCollection_ + value: + objectReference: {fileID: -2232285011790399243, guid: 9ee9dfa7770ab144dad626ab9273ce05, + type: 2} - target: {fileID: 3015870805474854860, guid: 5ff80f47f2822bb438251c8a7a1370ca, type: 3} propertyPath: creature diff --git a/Unity/Assets/Ermshark/Sounds/Attack/Attack.asset b/Unity/Assets/Ermshark/Sounds/Attack/Attack.asset index e26444cc..66fd3217 100644 --- a/Unity/Assets/Ermshark/Sounds/Attack/Attack.asset +++ b/Unity/Assets/Ermshark/Sounds/Attack/Attack.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-651457221615391217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Attack (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Attack - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 98897a51a3b4eb946999cc85dff0b21b, type: 3} - {fileID: 8300000, guid: 1267b704d3ab81d4e855e082bcd4be21, type: 3} diff --git a/Unity/Assets/Ermshark/Sounds/Hurt/Hurt.asset b/Unity/Assets/Ermshark/Sounds/Hurt/Hurt.asset index c2c3341b..c316a3f9 100644 --- a/Unity/Assets/Ermshark/Sounds/Hurt/Hurt.asset +++ b/Unity/Assets/Ermshark/Sounds/Hurt/Hurt.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2232285011790399243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Hurt (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Hurt - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 170d6b32544b4ac41a8cb6bfa891c285, type: 3} - {fileID: 8300000, guid: 7b54c2996e5721347b1bb6d3904f7b44, type: 3} diff --git a/Unity/Assets/Ermshark/Sounds/Scan/Scan.asset b/Unity/Assets/Ermshark/Sounds/Scan/Scan.asset index 3df11540..693a36c1 100644 --- a/Unity/Assets/Ermshark/Sounds/Scan/Scan.asset +++ b/Unity/Assets/Ermshark/Sounds/Scan/Scan.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2996190608115189883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Scan (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,6 +27,6 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Scan - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: ced2016959dac344caa5592fc979eb0e, type: 3} diff --git a/Unity/Assets/Loading/Erm Sound/Loading Erm Sound Prefab.prefab b/Unity/Assets/Loading/Erm Sound/Loading Erm Sound Prefab.prefab index 5643f94c..4922cf0f 100644 --- a/Unity/Assets/Loading/Erm Sound/Loading Erm Sound Prefab.prefab +++ b/Unity/Assets/Loading/Erm Sound/Loading Erm Sound Prefab.prefab @@ -44,5 +44,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: soundCollection: {fileID: 11400000, guid: 1138c2d796e81ac43a4f257daf9651b7, type: 2} + soundCollection_: {fileID: 8990697991671373227, guid: 1138c2d796e81ac43a4f257daf9651b7, + type: 2} bus: emitter: {fileID: 0} diff --git a/Unity/Assets/Plugins/Subnautica/FMODAsset.cs b/Unity/Assets/Plugins/Subnautica/FMODAsset.cs index 0c05f4eb..5c3a05be 100644 --- a/Unity/Assets/Plugins/Subnautica/FMODAsset.cs +++ b/Unity/Assets/Plugins/Subnautica/FMODAsset.cs @@ -1,8 +1,7 @@ -using UnityEngine; +using SCHIZO.Interop.Subnautica; +using UnityEngine; [CreateAssetMenu(menuName = "Subnautica/FMOD Asset")] -public class FMODAsset : ScriptableObject +public class FMODAsset : _FMODAsset { - public string path; - public string id; } diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/GetCarried.cs b/Unity/Assets/Scripts/SCHIZO/Creatures/Components/GetCarried.cs index 8d0817b0..f646dc79 100644 --- a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/GetCarried.cs +++ b/Unity/Assets/Scripts/SCHIZO/Creatures/Components/GetCarried.cs @@ -14,10 +14,10 @@ public partial class GetCarried : CustomCreatureAction [BoxGroup("Sounds")] public float carryNoiseInterval = 5f; [BoxGroup("Sounds")] - public SoundCollection pickupSounds; + public SoundCollectionInstance pickupSounds; [BoxGroup("Sounds")] - public SoundCollection carrySounds; + public SoundCollectionInstance carrySounds; [BoxGroup("Sounds")] - public SoundCollection releaseSounds; + public SoundCollectionInstance releaseSounds; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs b/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs index 89664b68..10b374b8 100644 --- a/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs +++ b/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs @@ -9,7 +9,7 @@ namespace SCHIZO.Creatures.Ermshark public sealed partial class ErmsharkAttack : _MeleeAttack { [BoxGroup("Sounds"), SerializeField, Required, UsedImplicitly] - private SoundCollection attackSounds; + private SoundCollectionInstance attackSounds; [BoxGroup("Sounds"), SerializeField, Required, UsedImplicitly] private _FMOD_CustomEmitter emitter; diff --git a/Unity/Assets/Scripts/SCHIZO/Events/Ermcon/ErmconAttendee.cs b/Unity/Assets/Scripts/SCHIZO/Events/Ermcon/ErmconAttendee.cs index 248e520b..8eb13523 100644 --- a/Unity/Assets/Scripts/SCHIZO/Events/Ermcon/ErmconAttendee.cs +++ b/Unity/Assets/Scripts/SCHIZO/Events/Ermcon/ErmconAttendee.cs @@ -13,7 +13,7 @@ public sealed partial class ErmconAttendee : CustomCreatureAction [Tooltip("Affects how long the creature will stay focused on one target as well as the con itself. The relationship is non-linear.")] public float patience = 10f; - [SerializeField] private SoundCollection pickupDeniedSounds; + [SerializeField] private SoundCollectionInstance pickupDeniedSounds; [SerializeField] private _FMOD_CustomEmitter emitter; private bool ForceDisable() diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.cs index ed79fbc1..e242c74c 100644 --- a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.cs +++ b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.cs @@ -3,7 +3,7 @@ namespace SCHIZO.Interop.Subnautica { [ActualType("CaveCrawlerGravity")] - public abstract partial class _CaveCrawlerGravity + public partial class _CaveCrawlerGravity { } } diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.Unity.cs new file mode 100644 index 00000000..cc5ac7b7 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.Unity.cs @@ -0,0 +1,13 @@ +using NaughtyAttributes; +using UnityEngine; + +namespace SCHIZO.Interop.Subnautica +{ + partial class _FMODAsset : ScriptableObject + { + [ShowIf(nameof(ShowDefaultProps))] public string path; + [ShowIf(nameof(ShowDefaultProps))] public string id; + + protected virtual bool ShowDefaultProps => true; + } +} diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.Unity.cs.meta b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.Unity.cs.meta new file mode 100644 index 00000000..7ff0cc56 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.Unity.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d49848217f8f4bf29facb9e88018bae1 +timeCreated: 1698939594 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.cs new file mode 100644 index 00000000..c95f9650 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.cs @@ -0,0 +1,6 @@ +namespace SCHIZO.Interop.Subnautica +{ + public abstract partial class _FMODAsset + { + } +} diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.cs.meta b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.cs.meta new file mode 100644 index 00000000..54ef84a6 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMODAsset.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 74307548d61349648f7c884dc2c4b105 +timeCreated: 1698939580 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.cs index 42b8bc8f..4afd128e 100644 --- a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.cs +++ b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.cs @@ -3,7 +3,7 @@ namespace SCHIZO.Interop.Subnautica { [ActualType("LandCreatureGravity")] - public abstract partial class _LandCreatureGravity + public partial class _LandCreatureGravity { } } diff --git a/Unity/Assets/Scripts/SCHIZO/Items/Data/PDAEncyclopediaInfo.cs b/Unity/Assets/Scripts/SCHIZO/Items/Data/PDAEncyclopediaInfo.cs index 0c4ae4e3..0795e3d5 100644 --- a/Unity/Assets/Scripts/SCHIZO/Items/Data/PDAEncyclopediaInfo.cs +++ b/Unity/Assets/Scripts/SCHIZO/Items/Data/PDAEncyclopediaInfo.cs @@ -10,7 +10,7 @@ public sealed class PDAEncyclopediaInfo : ScriptableObject [BoxGroup("Scanning")] public float scanTime = 3; [BoxGroup("Scanning")] public Sprite unlockSprite; [BoxGroup("Scanning")] public bool isImportantUnlock; - [BoxGroup("Scanning")] public SoundCollection scanSounds; + [BoxGroup("Scanning")] public SoundCollectionInstance scanSounds; [BoxGroup("Databank")] public string encyPath; [BoxGroup("Databank")] public string title; diff --git a/Unity/Assets/Scripts/SCHIZO/Loading/LoadingSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Loading/LoadingSoundPlayer.cs index dc2c0da8..3deb3f5d 100644 --- a/Unity/Assets/Scripts/SCHIZO/Loading/LoadingSoundPlayer.cs +++ b/Unity/Assets/Scripts/SCHIZO/Loading/LoadingSoundPlayer.cs @@ -4,7 +4,6 @@ namespace SCHIZO.Loading { public sealed partial class LoadingSoundPlayer : SoundPlayer { - protected override string DefaultBus => buses[PDA_VOICE]; protected override bool Is3D => false; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/BusPaths.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/BusPaths.cs new file mode 100644 index 00000000..2b09c0fc --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/BusPaths.cs @@ -0,0 +1,10 @@ +namespace SCHIZO.Sounds +{ + public enum BusPaths + { + PDAVoice, + UnderwaterCreatures, + IndoorSounds, + SFX + } +} diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/BusPaths.cs.meta b/Unity/Assets/Scripts/SCHIZO/Sounds/BusPaths.cs.meta new file mode 100644 index 00000000..9dea2f55 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/BusPaths.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ca32ada387154b50bbb08fa5f6f27eee +timeCreated: 1698938456 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/CombinedSoundCollection.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/CombinedSoundCollection.cs index 38bf4138..d224168e 100644 --- a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/CombinedSoundCollection.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/CombinedSoundCollection.cs @@ -11,7 +11,6 @@ public sealed class CombinedSoundCollection : SoundCollection [ReorderableList] public List combineWith; public override IEnumerable GetSounds() => combineWith.SelectMany(s => s.GetSounds()); - protected override bool ShowAudioClipList => false; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.Unity.cs new file mode 100644 index 00000000..1feceb7f --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.Unity.cs @@ -0,0 +1,26 @@ +using JetBrains.Annotations; +using NaughtyAttributes; +using UnityEditor; + +namespace SCHIZO.Sounds.Collections +{ + partial class SoundCollection + { +#if UNITY_EDITOR + [Button("Create Instance"), UsedImplicitly] + private void CreateInstance() + { + SoundCollectionInstance instance = CreateInstance(); + instance.collection = this; + instance.bus = BusPaths.PDAVoice; + instance.OnValidate(); + + AssetDatabase.AddObjectToAsset(instance, this); + Selection.activeObject = instance; + + EditorUtility.SetDirty(this); + AssetDatabase.SaveAssets(); + } +#endif + } +} diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.Unity.cs.meta b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.Unity.cs.meta new file mode 100644 index 00000000..13f7ec7b --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.Unity.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 799ae6b5c5f04ee0a531889b48513229 +timeCreated: 1698940376 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.cs index 54acf78c..4d946fd3 100644 --- a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollection.cs @@ -10,7 +10,6 @@ public partial class SoundCollection : ScriptableObject [SerializeField, ReorderableList, ShowIf(nameof(ShowAudioClipList))] private List sounds; public virtual IEnumerable GetSounds() => sounds; - protected virtual bool ShowAudioClipList => true; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.Unity.cs new file mode 100644 index 00000000..ec498c6c --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.Unity.cs @@ -0,0 +1,31 @@ +using JetBrains.Annotations; +using NaughtyAttributes; +using UnityEditor; + +namespace SCHIZO.Sounds.Collections +{ + partial class SoundCollectionInstance + { + protected override bool ShowDefaultProps => false; + +#if UNITY_EDITOR + public void OnValidate() + { + if (collection == null) return; + name = $"{collection.name} ({bus})"; + AssetDatabase.SaveAssets(); + } + + [Button("Delete Instance"), UsedImplicitly] + private void Delete() + { + Selection.activeObject = collection; + AssetDatabase.RemoveObjectFromAsset(this); + DestroyImmediate(this, true); + + EditorUtility.SetDirty(collection); + AssetDatabase.SaveAssets(); + } +#endif + } +} diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.Unity.cs.meta b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.Unity.cs.meta new file mode 100644 index 00000000..6e022c1e --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.Unity.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 948a73859c7c4dfc8fb9b1766179f0ed +timeCreated: 1698939742 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs new file mode 100644 index 00000000..45650839 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs @@ -0,0 +1,10 @@ +using SCHIZO.Interop.Subnautica; + +namespace SCHIZO.Sounds.Collections +{ + public sealed partial class SoundCollectionInstance : _FMODAsset + { + [NaughtyAttributes.ReadOnly] public SoundCollection collection; + public BusPaths bus; + } +} diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs.meta b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs.meta new file mode 100644 index 00000000..447c0489 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Collections/SoundCollectionInstance.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7e5191dfd75c432c9713c5321302eadd +timeCreated: 1698938403 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs index a9dedc3b..bbed126f 100644 --- a/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs @@ -7,21 +7,21 @@ namespace SCHIZO.Sounds [CreateAssetMenu(menuName = "SCHIZO/Sounds/Item Sounds")] public sealed partial class ItemSounds : NaughtyScriptableObject { - public SoundCollection pickupSounds; - public SoundCollection dropSounds; + public SoundCollectionInstance pickupSounds; + public SoundCollectionInstance dropSounds; [Space] - public SoundCollection drawSounds; - public SoundCollection holsterSounds; + public SoundCollectionInstance drawSounds; + public SoundCollectionInstance holsterSounds; [Space] - public SoundCollection cookSounds; - public SoundCollection eatSounds; + public SoundCollectionInstance cookSounds; + public SoundCollectionInstance eatSounds; [Space] - public SoundCollection playerDeathSounds; + public SoundCollectionInstance playerDeathSounds; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs index f5b93d21..28077e0c 100644 --- a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs @@ -2,7 +2,6 @@ namespace SCHIZO.Sounds.Players { public sealed partial class HurtSoundPlayer : SoundPlayer { - protected override string DefaultBus => buses[UNDERWATER_CREATURES]; protected override bool Is3D => true; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs index 1fef9d91..606b7f51 100644 --- a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs @@ -22,7 +22,6 @@ public partial class InventoryAmbientSoundPlayer : SoundPlayer [SerializeField, ExposedType("Pickupable"), Required, UsedImplicitly, ValidateInput(nameof(Validate_pickupable), "Pickupable component must be on the same GameObject as the sound player!")] private MonoBehaviour pickupable; - protected override string DefaultBus => buses[PDA_VOICE]; protected override bool Is3D => false; private bool Validate_pickupable() => !pickupable || pickupable.GetComponentsInChildren().Contains(this); diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/SoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/SoundPlayer.cs index 63b9db56..bd20d028 100644 --- a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/SoundPlayer.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/SoundPlayer.cs @@ -1,40 +1,20 @@ using JetBrains.Annotations; using NaughtyAttributes; -using SCHIZO.Helpers; using SCHIZO.Interop.Subnautica; using SCHIZO.Sounds.Collections; using UnityEngine; +using UnityEngine.Serialization; namespace SCHIZO.Sounds.Players { public abstract partial class SoundPlayer : MonoBehaviour { - [SerializeField, Required, UsedImplicitly] - protected SoundCollection soundCollection; - - [SerializeField, Dropdown(nameof(buses)), ShowIf(nameof(NeedsBus)), UsedImplicitly] - protected string bus; + [FormerlySerializedAs("soundCollection_"), SerializeField, Required, UsedImplicitly] + protected SoundCollectionInstance sounds; [SerializeField, ShowIf(nameof(Is3D)), Required, UsedImplicitly] private _FMOD_CustomEmitter emitter; - protected abstract string DefaultBus { get; } protected abstract bool Is3D { get; } - - private bool NeedsBus => string.IsNullOrEmpty(DefaultBus); - - [StaticHelpers.Cache] - private protected static readonly BetterDropdownList buses = new BetterDropdownList() - { - {PDA_VOICE, "Nautilus.Utility.AudioUtils+BusPaths:PDAVoice"}, - {UNDERWATER_CREATURES, "Nautilus.Utility.AudioUtils+BusPaths:UnderwaterCreatures"}, - {INDOOR_SOUNDS, $"SCHIZO.Sounds.Players.{nameof(SoundPlayer)}:{nameof(INDOOR_SOUNDS_BUS)}"} - }; - - protected const string PDA_VOICE = "PDA Voice"; - protected const string UNDERWATER_CREATURES = "Underwater Creatures"; - protected const string INDOOR_SOUNDS = "Indoor Sounds"; - - private const string INDOOR_SOUNDS_BUS = "bus:/master/SFX_for_pause/PDA_pause/all/indoorsounds"; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs index f73aac89..03db1b92 100644 --- a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs @@ -23,7 +23,6 @@ public sealed partial class WorldAmbientSoundPlayer : SoundPlayer [SerializeField, ExposedType("Constructable"), UsedImplicitly] private MonoBehaviour constructable; - protected override string DefaultBus => null; protected override bool Is3D => true; } } diff --git a/Unity/Assets/Scripts/SCHIZO/Utilities/MeshCombiner.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Utilities/MeshCombiner.Unity.cs index 04cf3d12..2de15de9 100644 --- a/Unity/Assets/Scripts/SCHIZO/Utilities/MeshCombiner.Unity.cs +++ b/Unity/Assets/Scripts/SCHIZO/Utilities/MeshCombiner.Unity.cs @@ -60,6 +60,7 @@ private void GenerateCombinedMesh() _combinedMesh.CombineMeshes(move); EditorUtility.SetDirty(this); + AssetDatabase.SaveAssets(); } #endif } diff --git a/Unity/Assets/Tutel/Cooked Tutel.prefab b/Unity/Assets/Tutel/Cooked Tutel.prefab index c3b64500..b7da34c5 100644 --- a/Unity/Assets/Tutel/Cooked Tutel.prefab +++ b/Unity/Assets/Tutel/Cooked Tutel.prefab @@ -67,6 +67,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: soundCollection: {fileID: 11400000, guid: 8760b2fe631724f46acf7ecd2da229dc, type: 2} + soundCollection_: {fileID: 8351835124949227367, guid: 8760b2fe631724f46acf7ecd2da229dc, + type: 2} bus: Nautilus.Utility.AudioUtils+BusPaths:UnderwaterCreatures emitter: {fileID: 8283812961700562626} minDelayDefault: {fileID: 11400000, guid: 14beba417ed8e764a8489589984c141a, type: 2} @@ -113,6 +115,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: soundCollection: {fileID: 11400000, guid: 8760b2fe631724f46acf7ecd2da229dc, type: 2} + soundCollection_: {fileID: 1227164057349306871, guid: 8760b2fe631724f46acf7ecd2da229dc, + type: 2} bus: emitter: {fileID: 0} minDelayDefault: {fileID: 11400000, guid: cddef268080982e4eae92e262bd08d9f, type: 2} diff --git a/Unity/Assets/Tutel/Databank/PDA Encyclopedia Info.asset b/Unity/Assets/Tutel/Databank/PDA Encyclopedia Info.asset index 64b49d1e..82adf8ac 100644 --- a/Unity/Assets/Tutel/Databank/PDA Encyclopedia Info.asset +++ b/Unity/Assets/Tutel/Databank/PDA Encyclopedia Info.asset @@ -15,7 +15,8 @@ MonoBehaviour: scanTime: 5 unlockSprite: {fileID: 21300000, guid: 3b57e6f5b26fa7645b62b4b09d12d18e, type: 3} isImportantUnlock: 0 - scanSounds: {fileID: 11400000, guid: ef492aad68c54354fbddb8f880c89f34, type: 2} + scanSounds: {fileID: 5553836039373703376, guid: ef492aad68c54354fbddb8f880c89f34, + type: 2} encyPath: Lifeforms/Fauna/SmallHerbivores title: Tutel texture: {fileID: 2800000, guid: 7b273e37743f05b4d9823beffcd9c2a6, type: 3} diff --git a/Unity/Assets/Tutel/Fake Tutel.prefab b/Unity/Assets/Tutel/Fake Tutel.prefab index 392173d9..9aecca9a 100644 --- a/Unity/Assets/Tutel/Fake Tutel.prefab +++ b/Unity/Assets/Tutel/Fake Tutel.prefab @@ -45,6 +45,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: soundCollection: {fileID: 11400000, guid: 8760b2fe631724f46acf7ecd2da229dc, type: 2} + soundCollection_: {fileID: 7432590903470703826, guid: 8760b2fe631724f46acf7ecd2da229dc, + type: 2} bus: SCHIZO.Sounds.Players.SoundPlayer:INDOOR_SOUNDS_BUS emitter: {fileID: 196760604283640930} minDelayDefault: {fileID: 0} diff --git a/Unity/Assets/Tutel/Sounds/Ambient/Tutel Ambient.asset b/Unity/Assets/Tutel/Sounds/Ambient/Tutel Ambient.asset index 3d759a3d..ee4c6fcc 100644 --- a/Unity/Assets/Tutel/Sounds/Ambient/Tutel Ambient.asset +++ b/Unity/Assets/Tutel/Sounds/Ambient/Tutel Ambient.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Tutel Ambient - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: e358a5ae11b0a17459898e1fd51ee966, type: 3} - {fileID: 8300000, guid: 10548ba76630b7641920b4f7e061b37e, type: 3} @@ -30,3 +30,51 @@ MonoBehaviour: - {fileID: 8300000, guid: ed1fb3943faaaf9499ad04b04bc3f804, type: 3} - {fileID: 8300000, guid: b5a82e6adc7e4c34bae2bce7d12ec6e6, type: 3} - {fileID: 8300000, guid: 0b77b3317b7557a4a8d68fa1a4b7369f, type: 3} +--- !u!114 &1227164057349306871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Tutel Ambient (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 +--- !u!114 &7432590903470703826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Tutel Ambient (IndoorSounds) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 2 +--- !u!114 &8351835124949227367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Tutel Ambient (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 diff --git a/Unity/Assets/Tutel/Sounds/Cook/Cook.asset b/Unity/Assets/Tutel/Sounds/Cook/Cook.asset index 0d3b1f68..455a8481 100644 --- a/Unity/Assets/Tutel/Sounds/Cook/Cook.asset +++ b/Unity/Assets/Tutel/Sounds/Cook/Cook.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5454345275263379286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Cook (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Cook - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 3e81d87b23f543a4896dc24a00b839ef, type: 3} - {fileID: 8300000, guid: f7f0cf49bea06ea458d631aae6f4b573, type: 3} diff --git a/Unity/Assets/Tutel/Sounds/Eat/Eat.asset b/Unity/Assets/Tutel/Sounds/Eat/Eat.asset index 9faa020f..9aff2dda 100644 --- a/Unity/Assets/Tutel/Sounds/Eat/Eat.asset +++ b/Unity/Assets/Tutel/Sounds/Eat/Eat.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2889490528754133196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Eat (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11,7 +27,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Eat - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: e8ce2839ab30a614ab3a8a15a3e473a1, type: 3} - {fileID: 8300000, guid: 0b7beba60c7ac9e40831599849e9d67c, type: 3} diff --git a/Unity/Assets/Tutel/Sounds/Get Carried/Carry by ermshark.asset b/Unity/Assets/Tutel/Sounds/Get Carried/Carry by ermshark.asset index bdd09ac9..b9f456d8 100644 --- a/Unity/Assets/Tutel/Sounds/Get Carried/Carry by ermshark.asset +++ b/Unity/Assets/Tutel/Sounds/Get Carried/Carry by ermshark.asset @@ -12,6 +12,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba38fe8ff638c22429fb7f75186ae629, type: 3} m_Name: Carry by ermshark m_EditorClassIdentifier: + sounds: [] combineWith: - {fileID: 11400000, guid: e37479fc64b60e04d940afd7654ab357, type: 2} - {fileID: 11400000, guid: 4638dfbb133f1f54480bda7581f040fb, type: 2} +--- !u!114 &6529170827671356787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Carry by ermshark (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 diff --git a/Unity/Assets/Tutel/Sounds/Get Carried/Pickup by ermshark.asset b/Unity/Assets/Tutel/Sounds/Get Carried/Pickup by ermshark.asset index c878026c..e3430551 100644 --- a/Unity/Assets/Tutel/Sounds/Get Carried/Pickup by ermshark.asset +++ b/Unity/Assets/Tutel/Sounds/Get Carried/Pickup by ermshark.asset @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4909919376518584713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Pickup by ermshark (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12,6 +28,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba38fe8ff638c22429fb7f75186ae629, type: 3} m_Name: Pickup by ermshark m_EditorClassIdentifier: + sounds: [] combineWith: - {fileID: 11400000, guid: b91ed69d7bd774343bb87f1d71e74242, type: 2} - {fileID: 11400000, guid: e34bb3771b2e20c48bef879692155b45, type: 2} diff --git a/Unity/Assets/Tutel/Sounds/Hurt/Hurt.asset b/Unity/Assets/Tutel/Sounds/Hurt/Hurt.asset index b79c9eb9..fe4790aa 100644 --- a/Unity/Assets/Tutel/Sounds/Hurt/Hurt.asset +++ b/Unity/Assets/Tutel/Sounds/Hurt/Hurt.asset @@ -11,8 +11,24 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Hurt - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: ffc1faddf1f8c7648b4c38a0ba694ee8, type: 3} - {fileID: 8300000, guid: 7e1502896037527419ccff95a80a0423, type: 3} - {fileID: 8300000, guid: b872cd3f7cc34ac49bbcd2f6b6089b80, type: 3} +--- !u!114 &7261620089877675744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Hurt (UnderwaterCreatures) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 1 diff --git a/Unity/Assets/Tutel/Sounds/Pickup/Pickup.asset b/Unity/Assets/Tutel/Sounds/Pickup/Pickup.asset index 5975fe3a..fb198b7e 100644 --- a/Unity/Assets/Tutel/Sounds/Pickup/Pickup.asset +++ b/Unity/Assets/Tutel/Sounds/Pickup/Pickup.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Pickup - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: 552af2b58ce66e345b081456bb422a4d, type: 3} - {fileID: 8300000, guid: a00664660441cdb4b8d4be9acb96ce9f, type: 3} @@ -20,3 +20,19 @@ MonoBehaviour: - {fileID: 8300000, guid: 14215fb9a88207b47be5e9ad14d09aec, type: 3} - {fileID: 8300000, guid: afc5001464a27cc4a8d8500e195857c0, type: 3} - {fileID: 8300000, guid: 7fa6d2c28a3f91643a71b92793f55c1f, type: 3} +--- !u!114 &1781330733623333228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Pickup (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 diff --git a/Unity/Assets/Tutel/Sounds/Scan/Scan.asset b/Unity/Assets/Tutel/Sounds/Scan/Scan.asset index 70d46fd0..353ebc00 100644 --- a/Unity/Assets/Tutel/Sounds/Scan/Scan.asset +++ b/Unity/Assets/Tutel/Sounds/Scan/Scan.asset @@ -11,6 +11,22 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1c07b4304e30a144f81553498090382c, type: 3} m_Name: Scan - m_EditorClassIdentifier: + m_EditorClassIdentifier: sounds: - {fileID: 8300000, guid: f37b72e144aa2aa428af5dcfe6df09cb, type: 3} +--- !u!114 &5553836039373703376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e5191dfd75c432c9713c5321302eadd, type: 3} + m_Name: Scan (PDAVoice) + m_EditorClassIdentifier: + path: + id: + collection: {fileID: 11400000} + bus: 0 diff --git a/Unity/Assets/Tutel/Sounds/Tutel Sounds.asset b/Unity/Assets/Tutel/Sounds/Tutel Sounds.asset index 2f8a844e..6e16cc91 100644 --- a/Unity/Assets/Tutel/Sounds/Tutel Sounds.asset +++ b/Unity/Assets/Tutel/Sounds/Tutel Sounds.asset @@ -12,10 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: efd98f6d65dc4615a0a85770a69d8cef, type: 3} m_Name: Tutel Sounds m_EditorClassIdentifier: - pickupSounds: {fileID: 11400000, guid: b91ed69d7bd774343bb87f1d71e74242, type: 2} + pickupSounds: {fileID: 1781330733623333228, guid: b91ed69d7bd774343bb87f1d71e74242, + type: 2} dropSounds: {fileID: 0} drawSounds: {fileID: 0} holsterSounds: {fileID: 0} - cookSounds: {fileID: 11400000, guid: e37479fc64b60e04d940afd7654ab357, type: 2} - eatSounds: {fileID: 11400000, guid: 4638dfbb133f1f54480bda7581f040fb, type: 2} + cookSounds: {fileID: -5454345275263379286, guid: e37479fc64b60e04d940afd7654ab357, + type: 2} + eatSounds: {fileID: -2889490528754133196, guid: 4638dfbb133f1f54480bda7581f040fb, + type: 2} playerDeathSounds: {fileID: 0} diff --git a/Unity/Assets/Tutel/Tutel.prefab b/Unity/Assets/Tutel/Tutel.prefab index 9238a11d..75480a2e 100644 --- a/Unity/Assets/Tutel/Tutel.prefab +++ b/Unity/Assets/Tutel/Tutel.prefab @@ -136,9 +136,12 @@ MonoBehaviour: pickupPoint: {fileID: 0} emitter: {fileID: 6151193553991328253} carryNoiseInterval: 5 - pickupSounds: {fileID: 11400000, guid: 1117ab6ef838da74b8d402a14c1296da, type: 2} - carrySounds: {fileID: 11400000, guid: bd0d057bea799074cb9f5b385a41234f, type: 2} - releaseSounds: {fileID: 11400000, guid: 8760b2fe631724f46acf7ecd2da229dc, type: 2} + pickupSounds: {fileID: -4909919376518584713, guid: 1117ab6ef838da74b8d402a14c1296da, + type: 2} + carrySounds: {fileID: 6529170827671356787, guid: bd0d057bea799074cb9f5b385a41234f, + type: 2} + releaseSounds: {fileID: 8351835124949227367, guid: 8760b2fe631724f46acf7ecd2da229dc, + type: 2} --- !u!114 &2898540927015828278 MonoBehaviour: m_ObjectHideFlags: 0 @@ -607,12 +610,24 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: e34bb3771b2e20c48bef879692155b45, type: 2} + - target: {fileID: 2722342412455638247, guid: 5ff80f47f2822bb438251c8a7a1370ca, + type: 3} + propertyPath: soundCollection_ + value: + objectReference: {fileID: 7261620089877675744, guid: e34bb3771b2e20c48bef879692155b45, + type: 2} - target: {fileID: 3365459996886375183, guid: 5ff80f47f2822bb438251c8a7a1370ca, type: 3} propertyPath: soundCollection value: objectReference: {fileID: 11400000, guid: 8760b2fe631724f46acf7ecd2da229dc, type: 2} + - target: {fileID: 3365459996886375183, guid: 5ff80f47f2822bb438251c8a7a1370ca, + type: 3} + propertyPath: soundCollection_ + value: + objectReference: {fileID: 1227164057349306871, guid: 8760b2fe631724f46acf7ecd2da229dc, + type: 2} - target: {fileID: 3919769461741374411, guid: 5ff80f47f2822bb438251c8a7a1370ca, type: 3} propertyPath: driftFactor @@ -754,6 +769,12 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 8760b2fe631724f46acf7ecd2da229dc, type: 2} + - target: {fileID: 7784437994874313104, guid: 5ff80f47f2822bb438251c8a7a1370ca, + type: 3} + propertyPath: soundCollection_ + value: + objectReference: {fileID: 8351835124949227367, guid: 8760b2fe631724f46acf7ecd2da229dc, + type: 2} - target: {fileID: 8066641660152872387, guid: 5ff80f47f2822bb438251c8a7a1370ca, type: 3} propertyPath: type