ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tried to fix FMOD dialogue issue

This commit is contained in:
cyndrdev 2021-03-05 14:11:16 +00:00
parent 6a1a99d59b
commit 87e5249578
26 changed files with 226 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
game/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset
View File

@ -522,8 +522,8 @@ MonoBehaviour:
sourceProjectPath: FMOD Project/Examples.fspro sourceProjectPath: FMOD Project/Examples.fspro
sourceBankPath: FMOD Project\Build sourceBankPath: FMOD Project\Build
SourceBankPathUnformatted: SourceBankPathUnformatted:
AutomaticEventLoading: 1 AutomaticEventLoading: 0
BankLoadType: 0 BankLoadType: 1
AutomaticSampleLoading: 0 AutomaticSampleLoading: 0
EncryptionKey: EncryptionKey:
ImportType: 0 ImportType: 0
@ -545,7 +545,12 @@ MonoBehaviour:
- Music - Music
- SFX - SFX
- VO - VO
BanksToLoad: [] BanksToLoad:
- Master.bank
- Master.strings.bank
- Music.bank
- SFX.bank
- VO.bank
LiveUpdatePort: 9264 LiveUpdatePort: 9264
EnableMemoryTracking: 0 EnableMemoryTracking: 0
AndroidUseOBB: 0 AndroidUseOBB: 0
@ -738,7 +743,7 @@ MonoBehaviour:
CallbackHandler: CallbackHandler:
Value: {fileID: 0} Value: {fileID: 0}
HasValue: 0 HasValue: 0
outputType: outputType: AUTODETECT
threadAffinities: threadAffinities:
Value: [] Value: []
HasValue: 0 HasValue: 0

193
game/Assets/Plugins/FMOD/lib/win/x86_64/fmodstudioL.dll.meta
View File

@ -1,80 +1,113 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8514ea8d6deab804895ec1cab6902681 guid: 8514ea8d6deab804895ec1cab6902681
timeCreated: 1429083373 PluginImporter:
licenseType: Store externalObjects: {}
PluginImporter: serializedVersion: 2
serializedVersion: 1 iconMap: {}
iconMap: {} executionOrder: {}
executionOrder: {} defineConstraints: []
isPreloaded: 0 isPreloaded: 0
platformData: isOverridable: 0
Android: isExplicitlyReferenced: 0
enabled: 0 validateReferences: 1
settings: platformData:
CPU: AnyCPU - first:
Any: : Linux
enabled: 0 second:
settings: {} enabled: 1
Editor: settings:
enabled: 1 CPU: None
settings: - first:
CPU: x86_64 : LinuxUniversal
DefaultValueInitialized: true second:
OS: Windows enabled: 1
Linux: settings:
enabled: 1 CPU: AnyCPU
settings: - first:
CPU: None : OSXIntel
Linux64: second:
enabled: 1 enabled: 1
settings: settings:
CPU: x86_64 CPU: None
LinuxUniversal: - first:
enabled: 1 : OSXIntel64
settings: second:
CPU: AnyCPU enabled: 1
OSXIntel: settings:
enabled: 1 CPU: AnyCPU
settings: - first:
CPU: None : SamsungTV
OSXIntel64: second:
enabled: 1 enabled: 0
settings: settings:
CPU: AnyCPU STV_MODEL: STANDARD_13
OSXUniversal: - first:
enabled: 1 : WP8
settings: second:
CPU: AnyCPU enabled: 0
SamsungTV: settings:
enabled: 0 CPU: AnyCPU
settings: DontProcess: False
STV_MODEL: STANDARD_13 PlaceholderPath:
WP8: - first:
enabled: 0 Android: Android
settings: second:
CPU: AnyCPU enabled: 0
DontProcess: False settings:
PlaceholderPath: CPU: AnyCPU
Win: - first:
enabled: 0 Any:
settings: second:
CPU: None enabled: 0
Win64: settings: {}
enabled: 1 - first:
settings: Editor: Editor
CPU: AnyCPU second:
WindowsStoreApps: enabled: 1
enabled: 0 settings:
settings: CPU: x86_64
CPU: AnyCPU DefaultValueInitialized: true
DontProcess: False OS: Windows
PlaceholderPath: - first:
SDK: AnySDK Standalone: Linux64
iOS: second:
enabled: 0 enabled: 1
settings: settings:
CompileFlags: CPU: AnyCPU
FrameworkDependencies: - first:
userData: Standalone: OSXUniversal
assetBundleName: second:
assetBundleVariant: 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:

6
game/Assets/Scripts/Dialogue/DialogueSystem.cs
View File

@ -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 // get length gives us a value in milliseconds so it needs to be converted to seconds
// before assignment // before assignment
dl.duration = ms / 1000f; // dl.duration = ms / 1000f;
// event is valid // event is valid
FMODUnity.RuntimeManager.PlayOneShot(fmodKey); //FMODUnity.RuntimeManager.PlayOneShot(fmodKey);
EventInstance instance = FMODUnity.RuntimeManager.CreateInstance( fmodKey );
instance.start();
} }
onDialogueLine?.Invoke(this, dl); onDialogueLine?.Invoke(this, dl);

8
game/Assets/StreamingAssets.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 68ec7a948c4bd2347aa42a978dd08b6d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/StreamingAssets/Master.bank (Stored with Git LFS) Normal file
View File

Binary file not shown.

9
game/Assets/StreamingAssets/Master.bank.meta Normal file
View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: ef734c4d663529a4a9d3f68334f64573
labels:
- FMOD
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/StreamingAssets/Master.strings.bank (Stored with Git LFS) Normal file
View File

Binary file not shown.

9
game/Assets/StreamingAssets/Master.strings.bank.meta Normal file
View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 44433d0c998a89540ab96f6023a6fc36
labels:
- FMOD
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/StreamingAssets/Music.bank (Stored with Git LFS) Normal file
View File

Binary file not shown.

9
game/Assets/StreamingAssets/Music.bank.meta Normal file
View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 42349855feb82b04e92fd7822b5bc32e
labels:
- FMOD
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/StreamingAssets/SFX.bank (Stored with Git LFS) Normal file
View File

Binary file not shown.

9
game/Assets/StreamingAssets/SFX.bank.meta Normal file
View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 73776127b41c0b44b8ddecb1ab36d76b
labels:
- FMOD
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/Assets/StreamingAssets/VO.bank (Stored with Git LFS) Normal file
View File

Binary file not shown.

9
game/Assets/StreamingAssets/VO.bank.meta Normal file
View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: e46905dc4b9abce4880b72e14154e3ed
labels:
- FMOD
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
game/FMOD Project/Build/Desktop/SFX.bank (Stored with Git LFS)
View File

Binary file not shown.

BIN
game/FMOD Project/Build/Desktop/VO.bank (Stored with Git LFS)
View File

Binary file not shown.

3
game/FMOD Project/Metadata/AudioFile/{091b39a7-47a4-4724-9222-29cb189344d7}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_DASH_3.wav</value> <value>VO/TEMP/SD_DASH_3.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{0eec2247-28cf-4c2b-a1d0-fb46e4ed6f1e}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_DASH_1.wav</value> <value>VO/TEMP/SD_DASH_1.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{209c251d-ea30-467c-a102-39bf7b1982f4}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_DASH_2.wav</value> <value>VO/TEMP/SD_DASH_2.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{3dd2e69f-aa0f-4c77-b4f6-77331803c4b1}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_FIND_WA_0.wav</value> <value>VO/TEMP/SD_FIND_WA_0.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{472b89b9-64e0-44dc-8b5d-bd5918c8daa5}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_BOOST_0.wav</value> <value>VO/TEMP/SD_BOOST_0.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{6cfee8e6-13fe-45b8-be84-61f76a77f73f}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_LANDED.wav</value> <value>VO/TEMP/SD_LANDED.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{72ed8fa9-8273-4778-9343-a8c3840c6b2e}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_DASH_0.wav</value> <value>VO/TEMP/SD_DASH_0.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{803e70ae-4c1d-4fef-8459-10d88e4beb58}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/PA_BOOST.wav</value> <value>VO/TEMP/PA_BOOST.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{a013980d-c085-4f2a-b126-bac5cf0b0500}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/SD_ALPHA_COMPLETE.wav</value> <value>VO/TEMP/SD_ALPHA_COMPLETE.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>

3
game/FMOD Project/Metadata/AudioFile/{ccf040e4-038e-4a6c-a988-125ab10558cc}.xml
View File

@ -4,6 +4,9 @@
<property name="assetPath"> <property name="assetPath">
<value>VO/TEMP/PA_DASH.wav</value> <value>VO/TEMP/PA_DASH.wav</value>
</property> </property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz"> <property name="frequencyInKHz">
<value>44.0999985</value> <value>44.0999985</value>
</property> </property>