diff --git a/game/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/game/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index b112eb1..5629b21 100644 --- a/game/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/game/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -522,8 +522,8 @@ MonoBehaviour: sourceProjectPath: FMOD Project/Examples.fspro sourceBankPath: FMOD Project\Build SourceBankPathUnformatted: - AutomaticEventLoading: 1 - BankLoadType: 0 + AutomaticEventLoading: 0 + BankLoadType: 1 AutomaticSampleLoading: 0 EncryptionKey: ImportType: 0 @@ -545,7 +545,12 @@ MonoBehaviour: - Music - SFX - VO - BanksToLoad: [] + BanksToLoad: + - Master.bank + - Master.strings.bank + - Music.bank + - SFX.bank + - VO.bank LiveUpdatePort: 9264 EnableMemoryTracking: 0 AndroidUseOBB: 0 @@ -738,7 +743,7 @@ MonoBehaviour: CallbackHandler: Value: {fileID: 0} HasValue: 0 - outputType: + outputType: AUTODETECT threadAffinities: Value: [] HasValue: 0 diff --git a/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta b/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta index 15dbbe6..f04f9e4 100644 --- a/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta +++ b/game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta @@ -1,80 +1,113 @@ -fileFormatVersion: 2 -guid: 8514ea8d6deab804895ec1cab6902681 -timeCreated: 1429083373 -licenseType: Store -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 0 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: x86_64 - DefaultValueInitialized: true - OS: Windows - Linux: - enabled: 1 - settings: - CPU: None - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: None - OSXIntel64: - enabled: 1 - settings: - CPU: AnyCPU - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - SamsungTV: - enabled: 0 - settings: - STV_MODEL: STANDARD_13 - WP8: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - Win: - enabled: 0 - settings: - CPU: None - Win64: - enabled: 1 - settings: - CPU: AnyCPU - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: False - PlaceholderPath: - SDK: AnySDK - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 8514ea8d6deab804895ec1cab6902681 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + : Linux + second: + enabled: 1 + settings: + CPU: None + - first: + : LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : OSXIntel + second: + enabled: 1 + settings: + CPU: None + - first: + : OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + : SamsungTV + second: + enabled: 0 + settings: + STV_MODEL: STANDARD_13 + - first: + : WP8 + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86_64 + DefaultValueInitialized: true + OS: Windows + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + DontProcess: False + PlaceholderPath: + SDK: AnySDK + - first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Dialogue/DialogueSystem.cs b/game/Assets/Scripts/Dialogue/DialogueSystem.cs index 95843bf..c3186dc 100644 --- a/game/Assets/Scripts/Dialogue/DialogueSystem.cs +++ b/game/Assets/Scripts/Dialogue/DialogueSystem.cs @@ -76,10 +76,12 @@ public partial class DialogueSystem : ScriptableObject // get length gives us a value in milliseconds so it needs to be converted to seconds // before assignment - dl.duration = ms / 1000f; + // dl.duration = ms / 1000f; // event is valid - FMODUnity.RuntimeManager.PlayOneShot(fmodKey); + //FMODUnity.RuntimeManager.PlayOneShot(fmodKey); + EventInstance instance = FMODUnity.RuntimeManager.CreateInstance( fmodKey ); + instance.start(); } onDialogueLine?.Invoke(this, dl); diff --git a/game/Assets/StreamingAssets.meta b/game/Assets/StreamingAssets.meta new file mode 100644 index 0000000..0f4f791 --- /dev/null +++ b/game/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68ec7a948c4bd2347aa42a978dd08b6d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Master.bank b/game/Assets/StreamingAssets/Master.bank new file mode 100644 index 0000000..4fed908 --- /dev/null +++ b/game/Assets/StreamingAssets/Master.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eaf976e08da19308df6271728a3689c5169b2b37fd8770bffd3c878636dd7cdb +size 15274 diff --git a/game/Assets/StreamingAssets/Master.bank.meta b/game/Assets/StreamingAssets/Master.bank.meta new file mode 100644 index 0000000..c3a3cdd --- /dev/null +++ b/game/Assets/StreamingAssets/Master.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ef734c4d663529a4a9d3f68334f64573 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Master.strings.bank b/game/Assets/StreamingAssets/Master.strings.bank new file mode 100644 index 0000000..3e0cb06 --- /dev/null +++ b/game/Assets/StreamingAssets/Master.strings.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f934ec97ed7577aef3d140ccccd0cb13ea3de31032c7578fec38aee622b4354 +size 2962 diff --git a/game/Assets/StreamingAssets/Master.strings.bank.meta b/game/Assets/StreamingAssets/Master.strings.bank.meta new file mode 100644 index 0000000..58cb7e9 --- /dev/null +++ b/game/Assets/StreamingAssets/Master.strings.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 44433d0c998a89540ab96f6023a6fc36 +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/Music.bank b/game/Assets/StreamingAssets/Music.bank new file mode 100644 index 0000000..7398e3b --- /dev/null +++ b/game/Assets/StreamingAssets/Music.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cb18c92ead2f3f1315632225300ac63e2eda078e77780add71cee2d66fcb358 +size 3298368 diff --git a/game/Assets/StreamingAssets/Music.bank.meta b/game/Assets/StreamingAssets/Music.bank.meta new file mode 100644 index 0000000..d7b3a5f --- /dev/null +++ b/game/Assets/StreamingAssets/Music.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 42349855feb82b04e92fd7822b5bc32e +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/SFX.bank b/game/Assets/StreamingAssets/SFX.bank new file mode 100644 index 0000000..d02bdcc --- /dev/null +++ b/game/Assets/StreamingAssets/SFX.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3db8d2eae94ae4fd355bc7f120e8efd4134bce4b5b551213be47975416e5d4a8 +size 4150912 diff --git a/game/Assets/StreamingAssets/SFX.bank.meta b/game/Assets/StreamingAssets/SFX.bank.meta new file mode 100644 index 0000000..d72dc6d --- /dev/null +++ b/game/Assets/StreamingAssets/SFX.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 73776127b41c0b44b8ddecb1ab36d76b +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/StreamingAssets/VO.bank b/game/Assets/StreamingAssets/VO.bank new file mode 100644 index 0000000..9e23163 --- /dev/null +++ b/game/Assets/StreamingAssets/VO.bank @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:585441e43cdab8e455e1c6495abd90b4bb41315cfe07f14582f4ff6ac09590ff +size 49120 diff --git a/game/Assets/StreamingAssets/VO.bank.meta b/game/Assets/StreamingAssets/VO.bank.meta new file mode 100644 index 0000000..eb51496 --- /dev/null +++ b/game/Assets/StreamingAssets/VO.bank.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e46905dc4b9abce4880b72e14154e3ed +labels: +- FMOD +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/FMOD Project/Build/Desktop/SFX.bank b/game/FMOD Project/Build/Desktop/SFX.bank index c3ab110..d02bdcc 100644 --- a/game/FMOD Project/Build/Desktop/SFX.bank +++ b/game/FMOD Project/Build/Desktop/SFX.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50102dd5599a5ce4b6cc3b39e76b1a416297d9148115015bb4aadd102d3aa596 +oid sha256:3db8d2eae94ae4fd355bc7f120e8efd4134bce4b5b551213be47975416e5d4a8 size 4150912 diff --git a/game/FMOD Project/Build/Desktop/VO.bank b/game/FMOD Project/Build/Desktop/VO.bank index 6d59457..9e23163 100644 --- a/game/FMOD Project/Build/Desktop/VO.bank +++ b/game/FMOD Project/Build/Desktop/VO.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5df401a416ed5ea022612d02f6d4e46cc0d997144891a74a8811a42ec457f760 +oid sha256:585441e43cdab8e455e1c6495abd90b4bb41315cfe07f14582f4ff6ac09590ff size 49120 diff --git a/game/FMOD Project/Metadata/AudioFile/{091b39a7-47a4-4724-9222-29cb189344d7}.xml b/game/FMOD Project/Metadata/AudioFile/{091b39a7-47a4-4724-9222-29cb189344d7}.xml index c50b704..8a247b7 100644 --- a/game/FMOD Project/Metadata/AudioFile/{091b39a7-47a4-4724-9222-29cb189344d7}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{091b39a7-47a4-4724-9222-29cb189344d7}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_DASH_3.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{0eec2247-28cf-4c2b-a1d0-fb46e4ed6f1e}.xml b/game/FMOD Project/Metadata/AudioFile/{0eec2247-28cf-4c2b-a1d0-fb46e4ed6f1e}.xml index 50d7265..bcfc568 100644 --- a/game/FMOD Project/Metadata/AudioFile/{0eec2247-28cf-4c2b-a1d0-fb46e4ed6f1e}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{0eec2247-28cf-4c2b-a1d0-fb46e4ed6f1e}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_DASH_1.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{209c251d-ea30-467c-a102-39bf7b1982f4}.xml b/game/FMOD Project/Metadata/AudioFile/{209c251d-ea30-467c-a102-39bf7b1982f4}.xml index 6659b42..3b34b5d 100644 --- a/game/FMOD Project/Metadata/AudioFile/{209c251d-ea30-467c-a102-39bf7b1982f4}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{209c251d-ea30-467c-a102-39bf7b1982f4}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_DASH_2.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{3dd2e69f-aa0f-4c77-b4f6-77331803c4b1}.xml b/game/FMOD Project/Metadata/AudioFile/{3dd2e69f-aa0f-4c77-b4f6-77331803c4b1}.xml index ddddedd..51fdc11 100644 --- a/game/FMOD Project/Metadata/AudioFile/{3dd2e69f-aa0f-4c77-b4f6-77331803c4b1}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{3dd2e69f-aa0f-4c77-b4f6-77331803c4b1}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_FIND_WA_0.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{472b89b9-64e0-44dc-8b5d-bd5918c8daa5}.xml b/game/FMOD Project/Metadata/AudioFile/{472b89b9-64e0-44dc-8b5d-bd5918c8daa5}.xml index c5deabc..ccb319e 100644 --- a/game/FMOD Project/Metadata/AudioFile/{472b89b9-64e0-44dc-8b5d-bd5918c8daa5}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{472b89b9-64e0-44dc-8b5d-bd5918c8daa5}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_BOOST_0.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{6cfee8e6-13fe-45b8-be84-61f76a77f73f}.xml b/game/FMOD Project/Metadata/AudioFile/{6cfee8e6-13fe-45b8-be84-61f76a77f73f}.xml index 3f68d35..c846bd6 100644 --- a/game/FMOD Project/Metadata/AudioFile/{6cfee8e6-13fe-45b8-be84-61f76a77f73f}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{6cfee8e6-13fe-45b8-be84-61f76a77f73f}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_LANDED.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{72ed8fa9-8273-4778-9343-a8c3840c6b2e}.xml b/game/FMOD Project/Metadata/AudioFile/{72ed8fa9-8273-4778-9343-a8c3840c6b2e}.xml index ab1bfaf..59425cc 100644 --- a/game/FMOD Project/Metadata/AudioFile/{72ed8fa9-8273-4778-9343-a8c3840c6b2e}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{72ed8fa9-8273-4778-9343-a8c3840c6b2e}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_DASH_0.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{803e70ae-4c1d-4fef-8459-10d88e4beb58}.xml b/game/FMOD Project/Metadata/AudioFile/{803e70ae-4c1d-4fef-8459-10d88e4beb58}.xml index f27ead3..4a6d479 100644 --- a/game/FMOD Project/Metadata/AudioFile/{803e70ae-4c1d-4fef-8459-10d88e4beb58}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{803e70ae-4c1d-4fef-8459-10d88e4beb58}.xml @@ -4,6 +4,9 @@ VO/TEMP/PA_BOOST.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{a013980d-c085-4f2a-b126-bac5cf0b0500}.xml b/game/FMOD Project/Metadata/AudioFile/{a013980d-c085-4f2a-b126-bac5cf0b0500}.xml index 8c5fa2e..d5fabe5 100644 --- a/game/FMOD Project/Metadata/AudioFile/{a013980d-c085-4f2a-b126-bac5cf0b0500}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{a013980d-c085-4f2a-b126-bac5cf0b0500}.xml @@ -4,6 +4,9 @@ VO/TEMP/SD_ALPHA_COMPLETE.wav + + true + 44.0999985 diff --git a/game/FMOD Project/Metadata/AudioFile/{ccf040e4-038e-4a6c-a988-125ab10558cc}.xml b/game/FMOD Project/Metadata/AudioFile/{ccf040e4-038e-4a6c-a988-125ab10558cc}.xml index 5229028..955b0d4 100644 --- a/game/FMOD Project/Metadata/AudioFile/{ccf040e4-038e-4a6c-a988-125ab10558cc}.xml +++ b/game/FMOD Project/Metadata/AudioFile/{ccf040e4-038e-4a6c-a988-125ab10558cc}.xml @@ -4,6 +4,9 @@ VO/TEMP/PA_DASH.wav + + true + 44.0999985