forked from cgvr/DeltaVR
Compare commits
20 Commits
c5c8fe1259
...
SamWorkset
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a13928a59 | ||
| 52701f3231 | |||
|
|
aeee055e18 | ||
|
|
389707b5f7 | ||
|
|
6def60df98 | ||
|
|
641fe43472 | ||
| 91275418e4 | |||
| 85edf6b43f | |||
|
|
e6db72778b | ||
|
|
27fc11f8b2 | ||
| fe2f08f7a3 | |||
|
|
50b043bad5 | ||
|
|
a65562e701 | ||
| 1a9746bb3c | |||
|
|
23e453de77 | ||
|
|
6a90182014 | ||
|
|
34d102bcf4 | ||
| 174582e56e | |||
|
|
50dba2cd81 | ||
|
|
27d5fdd68c |
Binary file not shown.
@@ -1,78 +1,113 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 684d4d47a018ed14080e15f4c99b8e86
|
||||
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: 684d4d47a018ed14080e15f4c99b8e86
|
||||
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: 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:
|
||||
@@ -78,7 +78,7 @@ public class KeyboardManager : NetworkBehaviour
|
||||
|
||||
string letter = label.text;
|
||||
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, button.gameObject);
|
||||
switch (_shiftMode)
|
||||
{
|
||||
case ShiftMode.Lowercase:
|
||||
@@ -99,7 +99,7 @@ public class KeyboardManager : NetworkBehaviour
|
||||
|
||||
void OnShiftPressed()
|
||||
{
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, shiftButton.gameObject);
|
||||
|
||||
_shiftMode = _shiftMode switch
|
||||
{
|
||||
@@ -114,7 +114,7 @@ public class KeyboardManager : NetworkBehaviour
|
||||
|
||||
void OnBackspacePressed()
|
||||
{
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, backspaceButton.gameObject);
|
||||
|
||||
if (_input.Length > 0)
|
||||
_input = _input.Substring(0, _input.Length - 1);
|
||||
@@ -123,7 +123,7 @@ public class KeyboardManager : NetworkBehaviour
|
||||
|
||||
void OnEnterPressed()
|
||||
{
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Click, gameObject);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, enterButton.gameObject);
|
||||
|
||||
if (_input.Length > 0)
|
||||
{
|
||||
@@ -134,7 +134,7 @@ public class KeyboardManager : NetworkBehaviour
|
||||
|
||||
void OnSpacePressed()
|
||||
{
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, spaceButton.gameObject);
|
||||
|
||||
addToInput(" ");
|
||||
UpdateOutput();
|
||||
|
||||
@@ -4960,7 +4960,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 5
|
||||
_componentIndexCache: 4
|
||||
_addedNetworkObject: {fileID: 1717143407103097221}
|
||||
_networkObjectCache: {fileID: 1717143407103097221}
|
||||
_synchronizeParent: 0
|
||||
@@ -5130,6 +5130,7 @@ GameObject:
|
||||
- component: {fileID: 933290339694180838}
|
||||
- component: {fileID: 2246675829434997248}
|
||||
- component: {fileID: 1717143407103097221}
|
||||
- component: {fileID: 2818003123056565107}
|
||||
m_Layer: 0
|
||||
m_Name: PaintGun
|
||||
m_TagString: Untagged
|
||||
@@ -5153,7 +5154,7 @@ Transform:
|
||||
- {fileID: 4826320045276546127}
|
||||
- {fileID: 316164716384481213}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 15}
|
||||
--- !u!95 &894335529310106930
|
||||
Animator:
|
||||
@@ -5426,7 +5427,6 @@ MonoBehaviour:
|
||||
- {fileID: 2246675829434997248}
|
||||
- {fileID: 7380372828037789915}
|
||||
- {fileID: 6466137562046178737}
|
||||
- {fileID: 0}
|
||||
- {fileID: 6641346233749009521}
|
||||
- {fileID: 7265139984553989061}
|
||||
<ParentNetworkObject>k__BackingField: {fileID: 0}
|
||||
@@ -5442,6 +5442,19 @@ MonoBehaviour:
|
||||
<SceneId>k__BackingField: 0
|
||||
<AssetPathHash>k__BackingField: 8708812106909896480
|
||||
_sceneNetworkObjects: []
|
||||
--- !u!114 &2818003123056565107
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5253637933564617113}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7405dee79e06eca4795d2d3f39801f47, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
grabSoundType: 2
|
||||
--- !u!1 &8789365678454855824
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5486,7 +5499,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_componentIndexCache: 4
|
||||
_componentIndexCache: 3
|
||||
_addedNetworkObject: {fileID: 1717143407103097221}
|
||||
_networkObjectCache: {fileID: 1717143407103097221}
|
||||
_synchronizeParent: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -32,7 +32,7 @@ public class FloorButtonVisualizer : MonoBehaviour
|
||||
{
|
||||
buttonImage.sprite = ActiveSprite;
|
||||
// Play FMOD sound here
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, buttonImage.gameObject);
|
||||
}
|
||||
|
||||
public void OnDeselect(BaseEventData eventData) // joystick moves away
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
using UnityEngine;
|
||||
using static FMODEvents;
|
||||
|
||||
public class GrabAudioProfile : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private GrabSoundType grabSoundType = GrabSoundType.Default;
|
||||
|
||||
public GrabSoundType GrabSoundType => grabSoundType;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7405dee79e06eca4795d2d3f39801f47
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -23,7 +23,7 @@ public class HoverSlideButton : MonoBehaviour, IPointerEnterHandler, IPointerExi
|
||||
public void OnPointerEnter(PointerEventData eventData)
|
||||
{
|
||||
SlideToPosition(onPosition);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject); //3d oneshot sound
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, buttonTransform.gameObject); //3d oneshot sound
|
||||
}
|
||||
|
||||
public void OnPointerExit(PointerEventData eventData)
|
||||
|
||||
@@ -91,7 +91,7 @@ public class MenuTeleportButton : MonoBehaviour
|
||||
button.targetGraphic.GetComponent<Image>().sprite = HoverSprite;
|
||||
}
|
||||
// Play FMOD hover sound
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, button.gameObject);
|
||||
}
|
||||
|
||||
public void OnDeselect(BaseEventData eventData)
|
||||
|
||||
@@ -8,7 +8,8 @@ public class SliderToVCA : MonoBehaviour
|
||||
Ambiences,
|
||||
Music,
|
||||
SFX,
|
||||
UI
|
||||
UI,
|
||||
Voiceovers
|
||||
}
|
||||
|
||||
public VCATarget target;
|
||||
@@ -40,6 +41,8 @@ private float GetInitialValueFromAudioManager()
|
||||
return AudioManager.Instance.SFXVolume;
|
||||
case VCATarget.UI:
|
||||
return AudioManager.Instance.UIVolume;
|
||||
case VCATarget.Voiceovers:
|
||||
return AudioManager.Instance.VoiceoverVolume;
|
||||
default:
|
||||
return 0.5f;
|
||||
}
|
||||
@@ -76,6 +79,10 @@ private float GetInitialValueFromAudioManager()
|
||||
case VCATarget.UI:
|
||||
AudioManager.Instance.SetUIVCA(value);
|
||||
break;
|
||||
|
||||
case VCATarget.Voiceovers:
|
||||
AudioManager.Instance.SetVoiceoverVCA(value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,8 @@ using _PROJECT.NewHandPresence;
|
||||
using UnityEngine;
|
||||
using UnityEngine.InputSystem;
|
||||
using UnityEngine.XR.Interaction.Toolkit;
|
||||
using static FMODEvents;
|
||||
using FMODUnity;
|
||||
|
||||
public class TutorialAudioListener : MonoBehaviour
|
||||
{
|
||||
@@ -61,6 +63,9 @@ public class TutorialAudioListener : MonoBehaviour
|
||||
locomotionConfigurator.OnLocomotionToggled += HandleLocomotionToggled;
|
||||
locomotionConfigurator.OnSpeedChanged += HandleSpeedChanged;
|
||||
}
|
||||
|
||||
if (tutorialController != null)
|
||||
tutorialController.OnGrab += HandleGrab;
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
@@ -82,6 +87,8 @@ public class TutorialAudioListener : MonoBehaviour
|
||||
locomotionConfigurator.OnLocomotionToggled -= HandleLocomotionToggled;
|
||||
locomotionConfigurator.OnSpeedChanged -= HandleSpeedChanged;
|
||||
}
|
||||
if (tutorialController != null)
|
||||
tutorialController.OnGrab -= HandleGrab;
|
||||
}
|
||||
|
||||
private void HandleLocomotionToggled(bool enabled)
|
||||
@@ -158,4 +165,40 @@ public class TutorialAudioListener : MonoBehaviour
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Steps, gameObject);
|
||||
Debug.Log("[TeleportationListen] Teleport sound played.");
|
||||
}
|
||||
|
||||
private EventReference GetGrabEvent(GrabSoundType type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case GrabSoundType.Bow:
|
||||
return FMODEvents.Instance.BowGrab;
|
||||
|
||||
case GrabSoundType.Sprayer:
|
||||
return FMODEvents.Instance.SprayerGrab;
|
||||
|
||||
//Add more objects for grabbing here and do not forget to define them in FMODEvents.cs
|
||||
//Add the GrabAudioProfile.cs component to an object instance
|
||||
|
||||
default:
|
||||
return FMODEvents.Instance.DefaultGrab;
|
||||
}
|
||||
}
|
||||
|
||||
private void HandleGrab(XRGrabInteractable grab)
|
||||
{
|
||||
if (grab == null)
|
||||
return;
|
||||
|
||||
var profile = grab.GetComponent<GrabAudioProfile>();
|
||||
GrabSoundType type = profile != null
|
||||
? profile.GrabSoundType
|
||||
: GrabSoundType.Default;
|
||||
|
||||
EventReference grabEvent = GetGrabEvent(type);
|
||||
Debug.Log(grabEvent);
|
||||
AudioManager.Instance.PlayAttachedInstance(grabEvent, grab.gameObject);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -40,6 +40,7 @@ namespace _PROJECT.NewHandPresence
|
||||
|
||||
private List<XRGrabInteractable> _grabInteractables = new List<XRGrabInteractable>();
|
||||
private XRGrabInteractable _grabInteractable;
|
||||
public event Action<XRGrabInteractable> OnGrab;
|
||||
|
||||
private GameObject _billboard;
|
||||
|
||||
@@ -219,6 +220,11 @@ namespace _PROJECT.NewHandPresence
|
||||
|
||||
private void OnGripPerformed(SelectEnterEventArgs arg0)
|
||||
{
|
||||
var grab = arg0.interactableObject as XRGrabInteractable;
|
||||
|
||||
// Notify any listeners
|
||||
OnGrab?.Invoke(grab);
|
||||
|
||||
if (_state != TutorialState.Grip) return;
|
||||
Debug.Log("Grip performed");
|
||||
UpdateState(_state.Next());
|
||||
|
||||
@@ -1,43 +1,28 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.Remoting.Messaging;
|
||||
using UnityEngine;
|
||||
using UnityEngine.PlayerLoop;
|
||||
using UnityEngine.XR.Content.Interaction;
|
||||
using FMOD.Studio;
|
||||
|
||||
public class AlarmTrigger : MonoBehaviour
|
||||
{
|
||||
public XRPushButton PushButton;
|
||||
public AudioSource AlarmSequence;
|
||||
public AudioSource VentilationSequence;
|
||||
|
||||
private EventInstance RoomHum;
|
||||
private EventInstance AlarmSound;
|
||||
|
||||
private FirstPersonOcclusion occlusion;
|
||||
|
||||
private bool hasAlarm = false;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
RoomHum = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomHumming); //initialise the instance
|
||||
RoomHum.setParameterByName("AlarmLogic", 1);
|
||||
RoomHum.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //make it 3d
|
||||
|
||||
//AlarmSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomAlarm); //initialise the instance
|
||||
//AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //make it 3d
|
||||
AlarmSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomAlarm); //initialise the instance
|
||||
|
||||
occlusion = GetComponent<FirstPersonOcclusion>();
|
||||
occlusion = GetComponent<FirstPersonOcclusion>(); //apply occlusion
|
||||
if (occlusion != null)
|
||||
occlusion.InitialiseWithInstance(RoomHum);
|
||||
{
|
||||
occlusion.InitialiseWithInstance(AlarmSound);
|
||||
|
||||
}
|
||||
}
|
||||
void Start()
|
||||
{
|
||||
RoomHum.start();
|
||||
//start playing the sound
|
||||
|
||||
if (PushButton != null)
|
||||
{
|
||||
@@ -51,24 +36,17 @@ public class AlarmTrigger : MonoBehaviour
|
||||
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ServerRoomButton, PushButton.gameObject); //3d oneshot instance
|
||||
Debug.Log("Alarm button Pressed!");
|
||||
|
||||
RoomHum.setParameterByName("AlarmLogic", 0);
|
||||
hasAlarm = true;
|
||||
|
||||
if (!AudioManager.IsPlaying(AlarmSound))
|
||||
{
|
||||
AlarmSound.start();
|
||||
}
|
||||
|
||||
}
|
||||
void Update()
|
||||
{
|
||||
RoomHum.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
|
||||
AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
|
||||
|
||||
if (hasAlarm && !AudioManager.IsPlaying(AlarmSound)) // If alarm state has ended.
|
||||
{
|
||||
VentilationSequence.Play(); // Return to normal.
|
||||
|
||||
RoomHum.start();
|
||||
AlarmSound.stop(FMOD.Studio.STOP_MODE.ALLOWFADEOUT);
|
||||
|
||||
hasAlarm = false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -96,10 +96,6 @@ PrefabInstance:
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 3964068808109647281}
|
||||
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ac65e655dd40bcd48b72b3f8ddcf45bd,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2488785156293713400}
|
||||
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ac65e655dd40bcd48b72b3f8ddcf45bd,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
@@ -133,129 +129,6 @@ MeshCollider:
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 6074735673208717538, guid: ac65e655dd40bcd48b72b3f8ddcf45bd, type: 3}
|
||||
--- !u!82 &2488785156293713400
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7023167506039495560}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: 5bcb02b6a0d913d4c90781538c787b2f, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 0.05
|
||||
m_Pitch: 1
|
||||
Loop: 1
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 10
|
||||
Pan2D: 0
|
||||
rolloffMode: 2
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0.1
|
||||
value: 1
|
||||
inSlope: -10.0039835
|
||||
outSlope: -10.0039835
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 0.2
|
||||
value: 0.5
|
||||
inSlope: -2.5009959
|
||||
outSlope: -2.5009959
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 0.4
|
||||
value: 0.25
|
||||
inSlope: -0.62524897
|
||||
outSlope: -0.62524897
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 0.7940491
|
||||
value: 0.057891846
|
||||
inSlope: -0.27374932
|
||||
outSlope: -0.27374932
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.24773687
|
||||
outWeight: 0
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0.018304445
|
||||
inSlope: -0.10003988
|
||||
outSlope: -0.10003988
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!114 &7307865721977554787
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -279,4 +152,4 @@ MonoBehaviour:
|
||||
PlayerOcclusionWidening: 1
|
||||
OcclusionLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 268442624
|
||||
m_Bits: 268438528
|
||||
|
||||
@@ -234,6 +234,7 @@ GameObject:
|
||||
- component: {fileID: 7888619987859216817}
|
||||
- component: {fileID: 4423156612440135391}
|
||||
- component: {fileID: 7492444969113415356}
|
||||
- component: {fileID: 7342908215105292480}
|
||||
m_Layer: 2
|
||||
m_Name: TwoHandedBow
|
||||
m_TagString: Untagged
|
||||
@@ -258,7 +259,7 @@ Transform:
|
||||
- {fileID: 390935087474091724}
|
||||
- {fileID: 4619910383191300727}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!136 &6168004718997640786
|
||||
CapsuleCollider:
|
||||
@@ -663,7 +664,19 @@ MonoBehaviour:
|
||||
arrowPrefab: {fileID: 5016704277711162129, guid: 5c51937e899ec9443a1757aefe9d49cb,
|
||||
type: 3}
|
||||
_arrowNetworkObject: {fileID: 0}
|
||||
lastKnownLaunchDirection: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &7342908215105292480
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6208239738837795797}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7405dee79e06eca4795d2d3f39801f47, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
grabSoundType: 1
|
||||
--- !u!1 &6812977384739690676
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -817,9 +830,9 @@ LineRenderer:
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: -76.62825, y: 6.285376, z: -11.368651}
|
||||
- {x: -76.61169, y: 5.785746, z: -11.358892}
|
||||
- {x: -76.59347, y: 5.2361526, z: -11.348157}
|
||||
- {x: -4.723722, y: 5.7963943, z: 73.294556}
|
||||
- {x: -4.7137837, y: 5.496616, z: 73.30041}
|
||||
- {x: -4.702852, y: 5.1668596, z: 73.30685}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 0.01
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user