Compare commits
82 Commits
23e453de77
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 14c85c83a7 | |||
| ca0a7dcc21 | |||
| c620b9000d | |||
| 4ee6dbb92d | |||
| 36d6ff6d9b | |||
| 52701f3231 | |||
|
|
aeee055e18 | ||
|
|
389707b5f7 | ||
|
|
6def60df98 | ||
|
|
641fe43472 | ||
| 31145f9735 | |||
| 91275418e4 | |||
| 85edf6b43f | |||
|
|
e6db72778b | ||
|
|
27fc11f8b2 | ||
| a8bec4f5ff | |||
| fe2f08f7a3 | |||
|
|
50b043bad5 | ||
|
|
a65562e701 | ||
| 13c1e8a0f6 | |||
| 1a9746bb3c | |||
| 174582e56e | |||
| 24543cce38 | |||
| 9af96fed99 | |||
| ac87f2f8ef | |||
| 856ff3ca40 | |||
| 693b3a572e | |||
| 8977957054 | |||
| b563be1158 | |||
| 616532e69c | |||
| 450efe675a | |||
| cce7492556 | |||
| e197206d0a | |||
| dc7aa3b9b9 | |||
| 54d44afcec | |||
| 15c2e62e92 | |||
| c4fafd1dd3 | |||
| 1c03f1773b | |||
| ef3bc5da39 | |||
| ed66253b06 | |||
| 6b8c3b6fbb | |||
| b9448fb4c7 | |||
| 4b1d8ea5bd | |||
| 6a76fa038f | |||
| 8af4eff8c7 | |||
| b38461fc52 | |||
| e5baba75cf | |||
| b9515d50d0 | |||
| e06b0206c8 | |||
| f5ba95849e | |||
| c5b90be63f | |||
| 5a41559b88 | |||
| 5ab753f4b5 | |||
| dab664b62a | |||
| 9d389a3296 | |||
| d269226b4b | |||
| 47d505a1ba | |||
| e7ad8e6fd4 | |||
| 36e3b95645 | |||
| b012ae17b2 | |||
| b9ccfb1c3a | |||
| cdd6a2e96d | |||
| 9af005b651 | |||
| e9b013a904 | |||
| 262a67293e | |||
| ab2406c367 | |||
| 0f409ddb08 | |||
| 4aa139be24 | |||
| b4c665abe4 | |||
|
|
b84e1b7837 | ||
|
|
e9fe4cb559 | ||
| d2673f52e1 | |||
| e6045f7775 | |||
| e6ddcc7390 | |||
| 75cfdd7a48 | |||
|
|
071c1db4f4 | ||
|
|
9bd8601edb | ||
|
|
ee0b46f451 | ||
|
|
2bf7f50802 | ||
|
|
e9404b9b51 | ||
|
|
28819a12a6 | ||
|
|
7f4c83d397 |
Binary file not shown.
@@ -1,78 +1,113 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 684d4d47a018ed14080e15f4c99b8e86
|
guid: 684d4d47a018ed14080e15f4c99b8e86
|
||||||
PluginImporter:
|
PluginImporter:
|
||||||
serializedVersion: 1
|
externalObjects: {}
|
||||||
iconMap: {}
|
serializedVersion: 2
|
||||||
executionOrder: {}
|
iconMap: {}
|
||||||
isPreloaded: 0
|
executionOrder: {}
|
||||||
platformData:
|
defineConstraints: []
|
||||||
Android:
|
isPreloaded: 0
|
||||||
enabled: 0
|
isOverridable: 0
|
||||||
settings:
|
isExplicitlyReferenced: 0
|
||||||
CPU: AnyCPU
|
validateReferences: 1
|
||||||
Any:
|
platformData:
|
||||||
enabled: 0
|
- first:
|
||||||
settings: {}
|
: Linux
|
||||||
Editor:
|
second:
|
||||||
enabled: 1
|
enabled: 1
|
||||||
settings:
|
settings:
|
||||||
CPU: x86_64
|
CPU: None
|
||||||
DefaultValueInitialized: true
|
- first:
|
||||||
OS: Windows
|
: LinuxUniversal
|
||||||
Linux:
|
second:
|
||||||
enabled: 1
|
enabled: 1
|
||||||
settings:
|
settings:
|
||||||
CPU: None
|
CPU: AnyCPU
|
||||||
Linux64:
|
- first:
|
||||||
enabled: 1
|
: OSXIntel
|
||||||
settings:
|
second:
|
||||||
CPU: x86_64
|
enabled: 1
|
||||||
LinuxUniversal:
|
settings:
|
||||||
enabled: 1
|
CPU: None
|
||||||
settings:
|
- first:
|
||||||
CPU: AnyCPU
|
: OSXIntel64
|
||||||
OSXIntel:
|
second:
|
||||||
enabled: 1
|
enabled: 1
|
||||||
settings:
|
settings:
|
||||||
CPU: None
|
CPU: AnyCPU
|
||||||
OSXIntel64:
|
- first:
|
||||||
enabled: 1
|
: SamsungTV
|
||||||
settings:
|
second:
|
||||||
CPU: AnyCPU
|
enabled: 0
|
||||||
OSXUniversal:
|
settings:
|
||||||
enabled: 1
|
STV_MODEL: STANDARD_13
|
||||||
settings:
|
- first:
|
||||||
CPU: AnyCPU
|
: WP8
|
||||||
SamsungTV:
|
second:
|
||||||
enabled: 0
|
enabled: 0
|
||||||
settings:
|
settings:
|
||||||
STV_MODEL: STANDARD_13
|
CPU: AnyCPU
|
||||||
WP8:
|
DontProcess: False
|
||||||
enabled: 0
|
PlaceholderPath:
|
||||||
settings:
|
- first:
|
||||||
CPU: AnyCPU
|
Android: Android
|
||||||
DontProcess: False
|
second:
|
||||||
PlaceholderPath:
|
enabled: 0
|
||||||
Win:
|
settings:
|
||||||
enabled: 0
|
CPU: AnyCPU
|
||||||
settings:
|
- first:
|
||||||
CPU: None
|
Any:
|
||||||
Win64:
|
second:
|
||||||
enabled: 1
|
enabled: 0
|
||||||
settings:
|
settings: {}
|
||||||
CPU: AnyCPU
|
- first:
|
||||||
WindowsStoreApps:
|
Editor: Editor
|
||||||
enabled: 0
|
second:
|
||||||
settings:
|
enabled: 1
|
||||||
CPU: AnyCPU
|
settings:
|
||||||
DontProcess: False
|
CPU: x86_64
|
||||||
PlaceholderPath:
|
DefaultValueInitialized: true
|
||||||
SDK: AnySDK
|
OS: Windows
|
||||||
iOS:
|
- first:
|
||||||
enabled: 0
|
Standalone: Linux64
|
||||||
settings:
|
second:
|
||||||
CompileFlags:
|
enabled: 1
|
||||||
FrameworkDependencies:
|
settings:
|
||||||
userData:
|
CPU: AnyCPU
|
||||||
assetBundleName:
|
- first:
|
||||||
assetBundleVariant:
|
Standalone: OSXUniversal
|
||||||
|
second:
|
||||||
|
enabled: 1
|
||||||
|
settings:
|
||||||
|
CPU: AnyCPU
|
||||||
|
- first:
|
||||||
|
Standalone: Win
|
||||||
|
second:
|
||||||
|
enabled: 0
|
||||||
|
settings:
|
||||||
|
CPU: None
|
||||||
|
- first:
|
||||||
|
Standalone: Win64
|
||||||
|
second:
|
||||||
|
enabled: 1
|
||||||
|
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:
|
||||||
|
|||||||
8
Assets/StreamingAssets/CharacterVoicelines.meta
Normal file
8
Assets/StreamingAssets/CharacterVoicelines.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3ca33810cadcc3f438e1c22aef4b84e2
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
8
Assets/StreamingAssets/CharacterVoicelines/Alien.meta
Normal file
8
Assets/StreamingAssets/CharacterVoicelines/Alien.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fdd84c412b9f8e54190abf5fb9d822e8
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Button_Imagination2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Button_Imagination2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b95ea1a21a2515b428e818f2ba0071ab
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Button_Press1 1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Button_Press1 1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6a5c837d928416b468e7886bb15a44ea
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Button_Press2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Button_Press2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d6c33fb52eb7c5d48b88b1ce923918e4
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Excellent_Arrow1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Excellent_Arrow1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 659e5b6b771c6e84288fab70870e71ca
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Excellent_Arrow2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Excellent_Arrow2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a802a304ac7a06f4aa7ec3a5343ec6ca
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Look2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Look2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9d9d2a3944a244a4cb506fe9a06b6eab
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Mic_Speak1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Mic_Speak1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 45fe15686901bcf4d806b3fcfa9767af
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Mic_Speak2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Mic_Speak2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d0a0941231c25de4599a045b84fbbbe4
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Resemble1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_Resemble1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 18de2bee3762c3d42aade5e9a1105f2d
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_UFO_Attack_1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Alien/Madis_UFO_Attack_1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 98d6925b0e4041d4cb810364c9e59186
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
8
Assets/StreamingAssets/CharacterVoicelines/Chef.meta
Normal file
8
Assets/StreamingAssets/CharacterVoicelines/Chef.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f20dfff913b4cf048ba81c8951e1d515
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Coming.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Coming.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c6a124544b1bffe4b98d7143af781d70
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Enjoy.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Enjoy.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1064f096f3015c74c943703650d7406b
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Excellent.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Excellent.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 254823b7963809f489ac39e4edfc6a46
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Get_Correctly.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Get_Correctly.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a122a6d15a6f1aa49893a06e3ecb16fc
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Here_It_Is1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Here_It_Is1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6da26a4752be7ce43a29e0e1bf247e72
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Here_It_Is2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Here_It_Is2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e0723bda80a360c4a954fee1242f8e6a
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Here_You_Go.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Here_You_Go.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a2ad72c769431494e87176ee57a9dbe5
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Is_Correct.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Is_Correct.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 477e8c72e4a98d84bb70bfb6e1399699
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Moment.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Moment.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 35b818bce640964478f8e964b97d2294
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Order.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Order.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a68ec6ce65a198c40a587c6e0f0c8faa
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Order_Is_Ready.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Order_Is_Ready.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0aa0fe8bc08f949459ac26cef320400e
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Order_Repeat.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Order_Repeat.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2fc4b956c3bddc841a11bec32d579b3f
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Ready_In.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Ready_In.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1629c3cacc79199489bb6696a90c6b74
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Serve.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Serve.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0322733d2ec0a5e4880d27eba19da8d4
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Terribly_Sorry_1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Terribly_Sorry_1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d8c0aa0bcbfc8724a87c386340b0c227
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Terribly_Sorry_2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Chef/Ulrich_Terribly_Sorry_2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 92658b78307678e4790910a8d7799650
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0c63edcea3f1eb64aa4eaa0f9b65d4ec
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Good_Job1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Good_Job1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3dadebd0d94106b44a80fbcb1965d6de
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Good_Job2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Good_Job2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9270b2bbe46c8fe4fb76644cf9e0c2a2
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Listen_Carefully1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Listen_Carefully1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b2c8a4e7715582b42a4b6eebff90743b
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Listen_Carefully2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Listen_Carefully2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ee35784d923986c4c832e3a1c02f7ea9
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Printing1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Printing1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 53dac4a8b4a6e5845b4ca1c859e81866
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Printing2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Printing2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 620343e30e35adf4aaf3fe1296540e0f
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Radio_Pickup1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Radio_Pickup1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bf6d885db63d3a542b3dd07acc16fc3b
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Radio_Pickup2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Radio_Pickup2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fb8a9fcfd50369448a9535727e91be9a
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_See_You1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_See_You1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 497e3485a60147a41a9a6df9ff32b6b6
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_See_You2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_See_You2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8d725d2a72e75474da7b2012a77b2039
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Well_Done1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Well_Done1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3301bed657a92434fb8f62ac4bd61406
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Well_Done2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_Well_Done2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d46684e8664c4ba4ba512f67e1c54310
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_You_There1.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_You_There1.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1ffe3d974ca4c4d45ae71410bd60ea1f
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_You_There2.wav
LFS
Normal file
BIN
Assets/StreamingAssets/CharacterVoicelines/Professor/Madis_You_There2.wav
LFS
Normal file
Binary file not shown.
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 634c2a7aac3130544aeae124c4c49bb0
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -2551,7 +2551,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3}
|
m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
target: 2
|
target: 5
|
||||||
--- !u!1 &3847096334227967442
|
--- !u!1 &3847096334227967442
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -3539,8 +3539,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -2000.1, y: 34.7}
|
m_AnchoredPosition: {x: -2404.8, y: 34.7}
|
||||||
m_SizeDelta: {x: 117.7, y: 49.6}
|
m_SizeDelta: {x: 220, y: 49.6}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2306375091028476275
|
--- !u!222 &2306375091028476275
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@@ -3570,7 +3570,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: 'Music:'
|
m_text: 'Voiceovers:'
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: d564a6b9a8a781b438125b614edcc297, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: d564a6b9a8a781b438125b614edcc297, type: 2}
|
||||||
m_sharedMaterial: {fileID: 2467261418627247352, guid: d564a6b9a8a781b438125b614edcc297,
|
m_sharedMaterial: {fileID: 2467261418627247352, guid: d564a6b9a8a781b438125b614edcc297,
|
||||||
@@ -4890,7 +4890,7 @@ GameObject:
|
|||||||
- component: {fileID: 9123126080211807181}
|
- component: {fileID: 9123126080211807181}
|
||||||
- component: {fileID: 2844805864736818914}
|
- component: {fileID: 2844805864736818914}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Music Slider
|
m_Name: Voiceover Slider
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ public class SliderToVCA : MonoBehaviour
|
|||||||
Ambiences,
|
Ambiences,
|
||||||
Music,
|
Music,
|
||||||
SFX,
|
SFX,
|
||||||
UI
|
UI,
|
||||||
|
Voiceovers
|
||||||
}
|
}
|
||||||
|
|
||||||
public VCATarget target;
|
public VCATarget target;
|
||||||
@@ -40,6 +41,8 @@ private float GetInitialValueFromAudioManager()
|
|||||||
return AudioManager.Instance.SFXVolume;
|
return AudioManager.Instance.SFXVolume;
|
||||||
case VCATarget.UI:
|
case VCATarget.UI:
|
||||||
return AudioManager.Instance.UIVolume;
|
return AudioManager.Instance.UIVolume;
|
||||||
|
case VCATarget.Voiceovers:
|
||||||
|
return AudioManager.Instance.VoiceoverVolume;
|
||||||
default:
|
default:
|
||||||
return 0.5f;
|
return 0.5f;
|
||||||
}
|
}
|
||||||
@@ -76,6 +79,10 @@ private float GetInitialValueFromAudioManager()
|
|||||||
case VCATarget.UI:
|
case VCATarget.UI:
|
||||||
AudioManager.Instance.SetUIVCA(value);
|
AudioManager.Instance.SetUIVCA(value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case VCATarget.Voiceovers:
|
||||||
|
AudioManager.Instance.SetVoiceoverVCA(value);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -184,8 +184,6 @@ public class TutorialAudioListener : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void HandleGrab(XRGrabInteractable grab)
|
private void HandleGrab(XRGrabInteractable grab)
|
||||||
{
|
{
|
||||||
if (grab == null)
|
if (grab == null)
|
||||||
|
|||||||
@@ -36,7 +36,11 @@ public class AlarmTrigger : MonoBehaviour
|
|||||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ServerRoomButton, PushButton.gameObject); //3d oneshot instance
|
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ServerRoomButton, PushButton.gameObject); //3d oneshot instance
|
||||||
Debug.Log("Alarm button Pressed!");
|
Debug.Log("Alarm button Pressed!");
|
||||||
|
|
||||||
AlarmSound.start();
|
|
||||||
|
if (!AudioManager.IsPlaying(AlarmSound))
|
||||||
|
{
|
||||||
|
AlarmSound.start();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
void Update()
|
void Update()
|
||||||
|
|||||||
@@ -131,4 +131,4 @@ MonoBehaviour:
|
|||||||
PlayerOcclusionWidening: 1
|
PlayerOcclusionWidening: 1
|
||||||
OcclusionLayer:
|
OcclusionLayer:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 0
|
m_Bits: 268438528
|
||||||
|
|||||||
Binary file not shown.
@@ -20,6 +20,7 @@ public class AudioManager : MonoBehaviour
|
|||||||
private VCA sfxVCA;
|
private VCA sfxVCA;
|
||||||
private VCA uiVCA;
|
private VCA uiVCA;
|
||||||
private VCA ambienceVCA;
|
private VCA ambienceVCA;
|
||||||
|
private VCA voiceoverVCA;
|
||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
[Header("Volume")]
|
[Header("Volume")]
|
||||||
@@ -40,6 +41,9 @@ public class AudioManager : MonoBehaviour
|
|||||||
public float UIVolume = 0.5f;
|
public float UIVolume = 0.5f;
|
||||||
[Range(0, 1)]
|
[Range(0, 1)]
|
||||||
|
|
||||||
|
public float VoiceoverVolume = 0.5f;
|
||||||
|
[Range(0, 1)]
|
||||||
|
|
||||||
private Bus masterBus;
|
private Bus masterBus;
|
||||||
private Bus ambientBus;
|
private Bus ambientBus;
|
||||||
private Bus musicBus;
|
private Bus musicBus;
|
||||||
@@ -63,6 +67,7 @@ public class AudioManager : MonoBehaviour
|
|||||||
// public static AudioManager instance;
|
// public static AudioManager instance;
|
||||||
private static EventInstance musicEventInstance;
|
private static EventInstance musicEventInstance;
|
||||||
|
|
||||||
|
private EVENT_CALLBACK dialogueCallback;
|
||||||
|
|
||||||
// public access for the Singleton
|
// public access for the Singleton
|
||||||
// and lazy instantiation if not exists
|
// and lazy instantiation if not exists
|
||||||
@@ -108,18 +113,22 @@ public class AudioManager : MonoBehaviour
|
|||||||
_instance.sfxBus = RuntimeManager.GetBus("bus:/SFX");
|
_instance.sfxBus = RuntimeManager.GetBus("bus:/SFX");
|
||||||
_instance.uiBus = RuntimeManager.GetBus("bus:/UI");
|
_instance.uiBus = RuntimeManager.GetBus("bus:/UI");
|
||||||
|
|
||||||
|
|
||||||
_instance.masterVCA = RuntimeManager.GetVCA("vca:/Master");
|
_instance.masterVCA = RuntimeManager.GetVCA("vca:/Master");
|
||||||
_instance.musicVCA = RuntimeManager.GetVCA("vca:/Music");
|
_instance.musicVCA = RuntimeManager.GetVCA("vca:/Music");
|
||||||
_instance.ambienceVCA = RuntimeManager.GetVCA("vca:/Ambiences");
|
_instance.ambienceVCA = RuntimeManager.GetVCA("vca:/Ambiences");
|
||||||
_instance.sfxVCA = RuntimeManager.GetVCA("vca:/SFX");
|
_instance.sfxVCA = RuntimeManager.GetVCA("vca:/SFX");
|
||||||
_instance.uiVCA = RuntimeManager.GetVCA("vca:/UI");
|
_instance.uiVCA = RuntimeManager.GetVCA("vca:/UI");
|
||||||
|
_instance.voiceoverVCA = RuntimeManager.GetVCA("vca:/Voiceovers");
|
||||||
|
|
||||||
_instance.masterVCA.setVolume(_instance.MasterVolume);
|
_instance.masterVCA.setVolume(_instance.MasterVolume);
|
||||||
_instance.musicVCA.setVolume(_instance.MusicVolume);
|
_instance.musicVCA.setVolume(_instance.MusicVolume);
|
||||||
_instance.ambienceVCA.setVolume(_instance.AmbienceVolume);
|
_instance.ambienceVCA.setVolume(_instance.AmbienceVolume);
|
||||||
_instance.sfxVCA.setVolume(_instance.SFXVolume);
|
_instance.sfxVCA.setVolume(_instance.SFXVolume);
|
||||||
_instance.uiVCA.setVolume(_instance.UIVolume);
|
_instance.uiVCA.setVolume(_instance.UIVolume);
|
||||||
|
_instance.voiceoverVCA.setVolume(_instance.VoiceoverVolume);
|
||||||
|
|
||||||
|
_instance.dialogueCallback = new EVENT_CALLBACK(DialogueEventCallback);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -152,6 +161,11 @@ public class AudioManager : MonoBehaviour
|
|||||||
UIVolume = value;
|
UIVolume = value;
|
||||||
uiVCA.setVolume(UIVolume);
|
uiVCA.setVolume(UIVolume);
|
||||||
}
|
}
|
||||||
|
public void SetVoiceoverVCA(float value)
|
||||||
|
{
|
||||||
|
VoiceoverVolume = value;
|
||||||
|
voiceoverVCA.setVolume(VoiceoverVolume);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
@@ -207,7 +221,7 @@ public class AudioManager : MonoBehaviour
|
|||||||
EventInstance instance = RuntimeManager.CreateInstance(sound);
|
EventInstance instance = RuntimeManager.CreateInstance(sound);
|
||||||
RuntimeManager.AttachInstanceToGameObject(instance, go);
|
RuntimeManager.AttachInstanceToGameObject(instance, go);
|
||||||
instance.start();
|
instance.start();
|
||||||
// instance.release();
|
instance.release();
|
||||||
|
|
||||||
eventInstances.Add(instance);
|
eventInstances.Add(instance);
|
||||||
return instance;
|
return instance;
|
||||||
@@ -280,6 +294,106 @@ public class AudioManager : MonoBehaviour
|
|||||||
//=====//
|
//=====//
|
||||||
//=====//
|
//=====//
|
||||||
|
|
||||||
|
public void PlayDialogue(string audioTableKey, GameObject emitter = null, float radioAmount = 0f)
|
||||||
|
{
|
||||||
|
|
||||||
|
var dialogueEvent = FMODEvents.Instance.VoiceoverAll;
|
||||||
|
|
||||||
|
if (dialogueEvent.IsNull)
|
||||||
|
{
|
||||||
|
Debug.LogWarning("Dialogue EventReference is not assigned!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
EventInstance instance = RuntimeManager.CreateInstance(dialogueEvent);
|
||||||
|
|
||||||
|
if (emitter != null)
|
||||||
|
{
|
||||||
|
RuntimeManager.AttachInstanceToGameObject(instance, emitter);
|
||||||
|
instance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(emitter.gameObject));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Assign the FMOD parameter value (in this case: Continous type)
|
||||||
|
instance.setParameterByName("Radio", radioAmount);
|
||||||
|
|
||||||
|
// Pin the key for programmer sound callback
|
||||||
|
GCHandle stringHandle = GCHandle.Alloc(audioTableKey);
|
||||||
|
instance.setUserData(GCHandle.ToIntPtr(stringHandle));
|
||||||
|
|
||||||
|
// Set the callback for programmer sounds
|
||||||
|
instance.setCallback(dialogueCallback);
|
||||||
|
|
||||||
|
// Add occlusion if available on the emitter
|
||||||
|
if (emitter != null)
|
||||||
|
{
|
||||||
|
FirstPersonOcclusion occlusion = emitter.GetComponent<FirstPersonOcclusion>();
|
||||||
|
if (occlusion != null)
|
||||||
|
{
|
||||||
|
occlusion.InitialiseWithInstance(instance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
instance.start();
|
||||||
|
instance.release();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[AOT.MonoPInvokeCallback(typeof(EVENT_CALLBACK))]
|
||||||
|
private static FMOD.RESULT DialogueEventCallback(
|
||||||
|
EVENT_CALLBACK_TYPE type,
|
||||||
|
IntPtr instancePtr,
|
||||||
|
IntPtr parameterPtr)
|
||||||
|
{
|
||||||
|
EventInstance instance = new EventInstance(instancePtr);
|
||||||
|
|
||||||
|
instance.getUserData(out IntPtr stringPtr);
|
||||||
|
GCHandle stringHandle = GCHandle.FromIntPtr(stringPtr);
|
||||||
|
string key = stringHandle.Target as string;
|
||||||
|
|
||||||
|
switch (type)
|
||||||
|
{
|
||||||
|
case EVENT_CALLBACK_TYPE.CREATE_PROGRAMMER_SOUND:
|
||||||
|
{
|
||||||
|
var parameter = Marshal.PtrToStructure<PROGRAMMER_SOUND_PROPERTIES>(parameterPtr);
|
||||||
|
|
||||||
|
FMOD.Studio.SOUND_INFO soundInfo;
|
||||||
|
var result = RuntimeManager.StudioSystem.getSoundInfo(key, out soundInfo);
|
||||||
|
if (result != FMOD.RESULT.OK)
|
||||||
|
break;
|
||||||
|
|
||||||
|
FMOD.Sound sound;
|
||||||
|
RuntimeManager.CoreSystem.createSound(
|
||||||
|
soundInfo.name_or_data,
|
||||||
|
soundInfo.mode | FMOD.MODE.CREATECOMPRESSEDSAMPLE,
|
||||||
|
ref soundInfo.exinfo,
|
||||||
|
out sound
|
||||||
|
);
|
||||||
|
|
||||||
|
parameter.sound = sound.handle;
|
||||||
|
parameter.subsoundIndex = soundInfo.subsoundindex;
|
||||||
|
Marshal.StructureToPtr(parameter, parameterPtr, false);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case EVENT_CALLBACK_TYPE.DESTROY_PROGRAMMER_SOUND:
|
||||||
|
{
|
||||||
|
var parameter = Marshal.PtrToStructure<PROGRAMMER_SOUND_PROPERTIES>(parameterPtr);
|
||||||
|
var sound = new FMOD.Sound(parameter.sound);
|
||||||
|
sound.release();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case EVENT_CALLBACK_TYPE.DESTROYED:
|
||||||
|
{
|
||||||
|
// Release pinned string
|
||||||
|
stringHandle.Free();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return FMOD.RESULT.OK;
|
||||||
|
}
|
||||||
|
|
||||||
public void StopSFX()
|
public void StopSFX()
|
||||||
{
|
{
|
||||||
sfxBus.stopAllEvents(FMOD.Studio.STOP_MODE.IMMEDIATE);
|
sfxBus.stopAllEvents(FMOD.Studio.STOP_MODE.IMMEDIATE);
|
||||||
|
|||||||
@@ -3,6 +3,9 @@ using UnityEngine;
|
|||||||
|
|
||||||
public class FMODEvents : MonoBehaviour
|
public class FMODEvents : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
[field: Header("Voiceline FMOD Programmer Event")]
|
||||||
|
[field: SerializeField] public EventReference VoiceoverAll { get; private set; }
|
||||||
|
|
||||||
[field: Header("Musical Ambiences")]
|
[field: Header("Musical Ambiences")]
|
||||||
|
|
||||||
[field: SerializeField] public EventReference Kosmos { get; private set; }
|
[field: SerializeField] public EventReference Kosmos { get; private set; }
|
||||||
@@ -19,6 +22,7 @@ public class FMODEvents : MonoBehaviour
|
|||||||
[field: SerializeField] public EventReference BowGrab { get; private set; }
|
[field: SerializeField] public EventReference BowGrab { get; private set; }
|
||||||
[field: SerializeField] public EventReference Spray { get; private set; }
|
[field: SerializeField] public EventReference Spray { get; private set; }
|
||||||
[field: SerializeField] public EventReference Coughing { get; private set; }
|
[field: SerializeField] public EventReference Coughing { get; private set; }
|
||||||
|
//[field: SerializeField] public EventReference MyNewSoundEffect { get; private set; }
|
||||||
|
|
||||||
[field: Header("CAR")]
|
[field: Header("CAR")]
|
||||||
[field: SerializeField] public EventReference DoorOpen { get; private set; }
|
[field: SerializeField] public EventReference DoorOpen { get; private set; }
|
||||||
|
|||||||
13
Assets/_PROJECT/Scripts/Audio/VoiceoverTester.cs
Normal file
13
Assets/_PROJECT/Scripts/Audio/VoiceoverTester.cs
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class VoiceoverTester : MonoBehaviour
|
||||||
|
{
|
||||||
|
//[Tooltip("Audio Table key")]
|
||||||
|
public string dialogueKey = "Chef/Ulrich_Terribly_Sorry1";
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
AudioManager.Instance.PlayDialogue(dialogueKey, gameObject, 0f);
|
||||||
|
//Debug.LogError("Voiceline played (in 3D)");
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/_PROJECT/Scripts/Audio/VoiceoverTester.cs.meta
Normal file
11
Assets/_PROJECT/Scripts/Audio/VoiceoverTester.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e77f6976a4505294797905646ff02a8a
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user