baz first encounter audio
This commit is contained in:
parent
d1475cf853
commit
a84bcd089a
BIN
game/Assets/Audio/VO/BAZ_0.wav (Stored with Git LFS)
BIN
game/Assets/Audio/VO/BAZ_0.wav (Stored with Git LFS)
Binary file not shown.
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
BIN
game/Assets/Audio/VO/BAZ_11.wav (Stored with Git LFS)
BIN
game/Assets/Audio/VO/BAZ_11.wav (Stored with Git LFS)
Binary file not shown.
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -0,0 +1,36 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d44ec659331711b41ae1b24dd0aa29e1
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 0
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
4:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 3
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -0,0 +1,36 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b0e08946e0afb8d4d90a9362c441ac3c
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 0
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
4:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 3
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ AudioImporter:
|
|||
forceToMono: 1
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
loadInBackground: 1
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ MonoBehaviour:
|
|||
interact: 6
|
||||
_hideAfter: 5
|
||||
_radioDialogueKey: event:/VO/Radio Dialogue Line
|
||||
_bazDialogueKey: event:/VO/Baz Dialogue Line
|
||||
_dialogueClips:
|
||||
- {fileID: 8300000, guid: c1690bc635976f14a80c9116e50283d3, type: 3}
|
||||
- {fileID: 8300000, guid: 898202449aaa9df418384303a39eb756, type: 3}
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ PrefabInstance:
|
|||
- target: {fileID: 13700000, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: a0427cf339e5891468d5f2b433b2d44a, type: 2}
|
||||
objectReference: {fileID: 2100000, guid: 5d5260a94884a404ca29f832ae73dc0f, type: 2}
|
||||
- target: {fileID: 13700000, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3}
|
||||
propertyPath: m_Materials.Array.data[1]
|
||||
value:
|
||||
|
|
|
|||
|
|
@ -429,6 +429,27 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!114 &444278960193166001
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 899404631555750584}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
|
||||
_speaker: 1
|
||||
_key:
|
||||
_keys:
|
||||
- BAZ_0
|
||||
- BAZ_1
|
||||
- BAZ_2
|
||||
- BAZ_3
|
||||
_log: 1
|
||||
--- !u!1 &1100975798506984023
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2108,7 +2129,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2450882644864764859}
|
||||
m_RootOrder: 144
|
||||
m_RootOrder: 123
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
|
||||
--- !u!108 &3009976366947780218
|
||||
Light:
|
||||
|
|
@ -15575,6 +15596,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
--- !u!1 &2751226988317436797 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2459802978564044542, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
m_PrefabInstance: {fileID: 291796746367999363}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &2751226988317436798 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2459802978564044541, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
|
|
@ -15585,11 +15611,6 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 2459802979327059716, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
m_PrefabInstance: {fileID: 291796746367999363}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &2751226988317436797 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2459802978564044542, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
m_PrefabInstance: {fileID: 291796746367999363}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &306742707821876137
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -17643,6 +17664,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
--- !u!4 &4537531518766285957 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2459802978197217342, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
m_PrefabInstance: {fileID: 2079102987037353147}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4537531520206852678 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2459802978564044541, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
|
|
@ -17653,11 +17679,6 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 2459802978564044542, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
m_PrefabInstance: {fileID: 2079102987037353147}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &4537531518766285957 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2459802978197217342, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
|
||||
m_PrefabInstance: {fileID: 2079102987037353147}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2154871241319455167
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18656,16 +18677,16 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 1461349035242361838, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477197472527}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1170184303236858142 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3735992582968959505, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477197472527}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1170184304258922646 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3735992581812067225, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477197472527}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1170184303236858142 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3735992582968959505, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477197472527}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2586681477597724647
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18819,16 +18840,16 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
--- !u!4 &8657027507187293339 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6613058589800293244, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477597724647}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8657027507322362388 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6613058589667321331, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477597724647}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8657027507187293339 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6613058589800293244, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477597724647}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2586681477875501226
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -18990,16 +19011,16 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
--- !u!4 &8657027507044576601 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6613058589667321331, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477875501226}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8657027506911472598 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6613058589800293244, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477875501226}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8657027507044576601 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6613058589667321331, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
|
||||
m_PrefabInstance: {fileID: 2586681477875501226}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2677707717147604239
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -22378,7 +22399,7 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 145
|
||||
value: 124
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
|
|
@ -23198,6 +23219,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
|
||||
--- !u!1 &899404631555750584 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4834652411730270464, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
|
||||
m_PrefabInstance: {fileID: 5720540744525259704}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &5804067414495682297
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -24795,31 +24821,31 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 571081256738378605, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 154
|
||||
value: 119
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1899895844885012620, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 151
|
||||
value: 116
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2319658650809593214, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 148
|
||||
value: 113
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2973946664641836638, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 150
|
||||
value: 115
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3868366237241383271, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 157
|
||||
value: 122
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4159393957142018208, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 153
|
||||
value: 118
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4572831935517906285, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 147
|
||||
value: 112
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4806866301421185648, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -24883,15 +24909,15 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6555808969146812634, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 146
|
||||
value: 111
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6865279060672720559, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 149
|
||||
value: 114
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6917656705483593979, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 155
|
||||
value: 120
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7551650046873796347, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_Range
|
||||
|
|
@ -24903,7 +24929,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7873106923330218815, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 156
|
||||
value: 121
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8018202599794603798, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -24915,7 +24941,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8959712560673148554, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 152
|
||||
value: 117
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: df527316f29db4547a5e77daa36392bc, type: 3}
|
||||
|
|
|
|||
|
|
@ -180,6 +180,56 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3}
|
||||
--- !u!1 &29567861
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 29567863}
|
||||
- component: {fileID: 29567862}
|
||||
m_Layer: 0
|
||||
m_Name: Loader
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &29567862
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 29567861}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b9468c5f457ace64f8d4df6d642b107f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
LoadEvent: 1
|
||||
UnloadEvent: 0
|
||||
Banks:
|
||||
- VO
|
||||
- SFX
|
||||
CollisionTag:
|
||||
PreloadSamples: 1
|
||||
--- !u!4 &29567863
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 29567861}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &117513429
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -246,7 +296,7 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 51324885066691022, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 155
|
||||
value: 123
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 732719499384555049, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -262,7 +312,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1005647015180190218, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 156
|
||||
value: 124
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1062590478707593016, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1170184304258922647, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
@ -280,13 +334,17 @@ PrefabInstance:
|
|||
propertyPath: m_LocalPosition.z
|
||||
value: 2.49
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1829815257108192832, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 112
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2029140596446036496, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 15.53
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2081059621408876479, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 152
|
||||
value: 120
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2249930330033776187, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
|
|
@ -352,6 +410,10 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: Boost Rooms
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2751226988317436797, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2960002578995079259, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 30
|
||||
|
|
@ -406,7 +468,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4200954845503136239, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 146
|
||||
value: 114
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4515224116292451270, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
@ -416,13 +478,17 @@ PrefabInstance:
|
|||
propertyPath: m_RootOrder
|
||||
value: 29
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4537531520206852677, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4579227052613592922, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4607320166347851674, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 149
|
||||
value: 117
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4642926045065704356, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
|
|
@ -442,7 +508,11 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4649745518653703243, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 148
|
||||
value: 116
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4656887790755867591, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 113
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5118931435587559007, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
@ -450,7 +520,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5328804086140919659, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 150
|
||||
value: 118
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5801649619324464217, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -508,21 +578,25 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 25.108
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6131951272763879506, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 111
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6378903312458380931, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 2.482082
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6417349562068914581, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 153
|
||||
value: 121
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6900594089853467736, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 147
|
||||
value: 115
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7447476906607065688, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 154
|
||||
value: 122
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8145454102417583418, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||
|
|
@ -574,7 +648,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8857431052829313465, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 151
|
||||
value: 119
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8910228407083381055, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -1110,19 +1184,19 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.6428797
|
||||
value: 0.6835427
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.08665984
|
||||
value: -0.17408861
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.6951665
|
||||
value: 0.41012284
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.30974072
|
||||
value: 0.5781537
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -1130,7 +1204,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.8675029
|
||||
value: -1.267503
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -1138,19 +1212,19 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.6940676
|
||||
value: 0.49880767
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.1970109
|
||||
value: -0.342424
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.66611344
|
||||
value: 0.6564143
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.18907617
|
||||
value: 0.4506186
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_Name
|
||||
|
|
@ -1270,19 +1344,19 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.6573677
|
||||
value: 0.8137647
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.016861176
|
||||
value: 0.014304773
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.71728384
|
||||
value: 0.44927052
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.23040684
|
||||
value: 0.36842707
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_XAxis.Value
|
||||
|
|
@ -1298,7 +1372,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.8675029
|
||||
value: -1.267503
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -1322,19 +1396,19 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.6478711
|
||||
value: 0.759475
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.10270675
|
||||
value: -0.08267866
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.68213177
|
||||
value: 0.44356626
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.32312635
|
||||
value: 0.46862665
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4676633833077728950, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_XAxis.Value
|
||||
|
|
@ -1358,7 +1432,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.8675029
|
||||
value: -1.267503
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -1366,19 +1440,19 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.6940676
|
||||
value: 0.49880764
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.1970109
|
||||
value: -0.34242404
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.66611344
|
||||
value: 0.6564142
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.18907617
|
||||
value: 0.45061862
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7693506703464935808, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ public class PickUpDisplay : MonoBehaviour
|
|||
else if (!hasSpoken)
|
||||
{
|
||||
hasSpoken = true;
|
||||
dialogue.PlayLine( _chosenArtefact.dialogueKey );
|
||||
dialogue.PlayLineRadio( _chosenArtefact.dialogueKey );
|
||||
}
|
||||
|
||||
if ( t < _unlockedSfxDelay )
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ public class DialogueSettings : ScriptableObject
|
|||
public string RadioDialogueKey => _radioDialogueKey;
|
||||
[SerializeField] private string _radioDialogueKey;
|
||||
|
||||
public string BazDialogueKey => _bazDialogueKey;
|
||||
[SerializeField] private string _bazDialogueKey;
|
||||
|
||||
[SerializeField] private AudioClip[] _dialogueClips;
|
||||
private readonly Dictionary<string, AudioClip> _keyClips = new Dictionary<string, AudioClip>();
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ public partial class DialogueSystem : ScriptableObject
|
|||
private readonly List<string> _usedClips = new List<string>();
|
||||
|
||||
private EVENT_CALLBACK _dialogueCallback;
|
||||
private EventInstance _currentInstance;
|
||||
private EventInstance _radioInstance;
|
||||
private EventInstance _bazInstance;
|
||||
|
||||
private string _currentControlScheme;
|
||||
|
||||
private void OnEnable()
|
||||
|
|
@ -114,8 +116,13 @@ public partial class DialogueSystem : ScriptableObject
|
|||
return RESULT.OK;
|
||||
}
|
||||
|
||||
public float GetLineDuration(string key) => _settings.GetDialogueClip(key).length;
|
||||
|
||||
public void PlayLineBaz(string key) => PlayLine(ref _bazInstance, _settings.BazDialogueKey, key);
|
||||
public void PlayLineRadio(string key) => PlayLine(ref _radioInstance, _settings.RadioDialogueKey, key);
|
||||
|
||||
// noRepeat locks this key off from further use. further attempts to use the key will be discarded
|
||||
public void PlayLine(string key, bool noRepeat = true)
|
||||
private void PlayLine(ref EventInstance eventInstance, string speakerKey, string key, bool noRepeat = true)
|
||||
{
|
||||
if (noRepeat)
|
||||
{
|
||||
|
|
@ -124,16 +131,16 @@ public partial class DialogueSystem : ScriptableObject
|
|||
_usedClips.Add(key);
|
||||
}
|
||||
|
||||
if ( _currentInstance.isValid() )
|
||||
if ( eventInstance.isValid() )
|
||||
{
|
||||
_currentInstance.stop( STOP_MODE.IMMEDIATE );
|
||||
_currentInstance.release();
|
||||
eventInstance.stop( STOP_MODE.IMMEDIATE );
|
||||
eventInstance.release();
|
||||
}
|
||||
|
||||
_currentInstance = RuntimeManager.CreateInstance(_settings.RadioDialogueKey);
|
||||
eventInstance = RuntimeManager.CreateInstance(speakerKey);
|
||||
|
||||
GCHandle stringHandle = GCHandle.Alloc(key, GCHandleType.Pinned);
|
||||
_currentInstance.setUserData(GCHandle.ToIntPtr(stringHandle));
|
||||
eventInstance.setUserData(GCHandle.ToIntPtr(stringHandle));
|
||||
|
||||
DialogueLine dl;
|
||||
var line = DialogueDatabase.ReadDialogue(key);
|
||||
|
|
@ -144,8 +151,8 @@ public partial class DialogueSystem : ScriptableObject
|
|||
var clip = _settings.GetDialogueClip(key);
|
||||
dl.duration = clip.length;
|
||||
|
||||
_currentInstance.setCallback(_dialogueCallback);
|
||||
_currentInstance.start();
|
||||
eventInstance.setCallback(_dialogueCallback);
|
||||
eventInstance.start();
|
||||
|
||||
onDialogueLine?.Invoke(this, dl);
|
||||
}
|
||||
|
|
@ -180,36 +187,4 @@ public struct DialogueLine
|
|||
{
|
||||
public string text;
|
||||
public float duration;
|
||||
}
|
||||
|
||||
#region Editor
|
||||
|
||||
#if UNITY_EDITOR
|
||||
|
||||
[CustomEditor(typeof(DialogueSystem))]
|
||||
public class DialogueSystemEditor : Editor
|
||||
{
|
||||
private DialogueSystem _dialogue;
|
||||
private string _key;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
_dialogue = target as DialogueSystem;
|
||||
}
|
||||
|
||||
public override void OnInspectorGUI()
|
||||
{
|
||||
base.OnInspectorGUI();
|
||||
|
||||
_key = EditorGUILayout.TextField("key", _key);
|
||||
|
||||
if (GUILayout.Button("Play Line"))
|
||||
{
|
||||
_dialogue.PlayLine(_key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
|
@ -1,16 +1,47 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Configuration;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
|
||||
public class ScriptedDialogueTrigger : MonoBehaviour
|
||||
{
|
||||
[Serializable]
|
||||
private enum Speaker
|
||||
{
|
||||
Radio,
|
||||
Baz
|
||||
}
|
||||
|
||||
[SerializeField] private DialogueSystem _dialogue;
|
||||
|
||||
[SerializeField] private Speaker _speaker = Speaker.Radio;
|
||||
[Obsolete]
|
||||
[SerializeField] private string _key;
|
||||
|
||||
[SerializeField] private string[] _keys;
|
||||
private float[] _durations;
|
||||
|
||||
[SerializeField] private bool _log;
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
if (_keys.Length == 0) return;
|
||||
|
||||
_durations = new float[_keys.Length];
|
||||
for (int i = 0; i < _keys.Length; i++)
|
||||
{
|
||||
_durations[i] = _dialogue.GetLineDuration(_keys[i]);
|
||||
|
||||
if (_speaker == Speaker.Radio)
|
||||
{
|
||||
// fudge because radio has a bit of a delay before starting the clip
|
||||
_durations[i] += 0.3f;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
if ( !other.CompareTag( "Player" ) )
|
||||
|
|
@ -20,7 +51,49 @@ public class ScriptedDialogueTrigger : MonoBehaviour
|
|||
{
|
||||
Debug.Log($"{other} triggered dialogue {_key}");
|
||||
}
|
||||
|
||||
if (_keys.Length == 0)
|
||||
{
|
||||
PlayLine(_key);
|
||||
}
|
||||
else
|
||||
{
|
||||
StartCoroutine(PlayKeys());
|
||||
}
|
||||
}
|
||||
|
||||
private IEnumerator PlayKeys()
|
||||
{
|
||||
var idx = 0;
|
||||
var elapsed = 0f;
|
||||
|
||||
// play first line
|
||||
PlayLine(_keys[0]);
|
||||
|
||||
_dialogue.PlayLine(_key);
|
||||
while (idx < _keys.Length)
|
||||
{
|
||||
elapsed += Time.deltaTime;
|
||||
if (elapsed > _durations[idx])
|
||||
{
|
||||
elapsed = 0;
|
||||
PlayLine(_keys[idx++]);
|
||||
}
|
||||
|
||||
yield return null;
|
||||
}
|
||||
}
|
||||
|
||||
private void PlayLine(string key)
|
||||
{
|
||||
switch (_speaker)
|
||||
{
|
||||
case Speaker.Radio:
|
||||
_dialogue.PlayLineRadio(key);
|
||||
break;
|
||||
|
||||
case Speaker.Baz:
|
||||
_dialogue.PlayLineBaz(key);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ public class PlayerController : MonoBehaviour
|
|||
if ( _powers.Freeze.timeSinceConsume > frozenTime && TimeIsFrozen )
|
||||
{
|
||||
UnfreezeTime();
|
||||
_dialogueSystem.PlayLine( _freezeFirstUseDialogueKey, true );
|
||||
_dialogueSystem.PlayLineRadio( _freezeFirstUseDialogueKey );
|
||||
_freezeVfx.SetActive( false );
|
||||
// TODO: unfreeze sfx?
|
||||
}
|
||||
|
|
|
|||
BIN
game/Assets/StreamingAssets/Master.bank (Stored with Git LFS)
BIN
game/Assets/StreamingAssets/Master.bank (Stored with Git LFS)
Binary file not shown.
|
|
@ -0,0 +1,209 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.01.00">
|
||||
<object class="Event" id="{886404c3-0312-4dc8-af6f-46f6ff1ed7a1}">
|
||||
<property name="note">
|
||||
<value>In this example we have an event that recreates the static effect of RF radios.
|
||||
|
||||
The event is designed to use VO supplied by the game via an asynchronous programmer instrument. You can audition your own VO by selecting the programmer instrument and dragging a new asset into the placeholder section.
|
||||
|
||||
To handle VO of different lengths there is a conditional loop region to keep the playback position steady until the programmer instrument has finished playing.
|
||||
|
||||
The loop region condition is based on the "VO Sidechain" parameter value which is driven by a sidechain modulator. The sidechain modulator's input signal comes from the sidechain effect on the "VO" track.
|
||||
|
||||
https://www.fmod.com/resources/documentation-studio?page=working-with-instruments.html#programmer-instruments
|
||||
|
||||
https://www.fmod.com/resources/documentation-studio?page=working-with-instruments.html#synchronous-and-asynchronous-instruments
|
||||
|
||||
https://www.fmod.com/resources/documentation-studio?page=authoring-events.html#parameters
|
||||
|
||||
https://www.fmod.com/resources/documentation-studio?page=modulator-reference.html#sidechain-modulator
|
||||
|
||||
The placeholder VO is from NASA's public library of space mission sounds.
|
||||
|
||||
https://soundcloud.com/nasa</value>
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>Baz Dialogue Line</value>
|
||||
</property>
|
||||
<property name="outputFormat">
|
||||
<value>1</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{aacc9c7d-10bf-4006-bcdd-9a56dd0d03e4}</destination>
|
||||
</relationship>
|
||||
<relationship name="tags">
|
||||
<destination>{b25c4f9d-1f47-4b94-89e1-8b05ecc39502}</destination>
|
||||
<destination>{ff19646f-4dc8-43be-9d99-73cde9536edf}</destination>
|
||||
<destination>{721cf887-761f-4cf4-a1cf-2e8790901610}</destination>
|
||||
<destination>{95d562e5-0dc1-428c-9296-79fa91967a77}</destination>
|
||||
<destination>{5e618944-886a-41d0-96a0-a08198069cb1}</destination>
|
||||
<destination>{bdccd9d1-5ce9-49be-94c0-ba0a070cb181}</destination>
|
||||
<destination>{d04b5409-a5d8-48c6-bd2b-4ed1630f88da}</destination>
|
||||
<destination>{0561d714-637a-45af-bd52-33501f57b446}</destination>
|
||||
<destination>{c993486d-84e1-468e-9f5a-d1b045016729}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixer">
|
||||
<destination>{61f2fc30-960a-4bba-8d4b-66a7d375f900}</destination>
|
||||
</relationship>
|
||||
<relationship name="masterTrack">
|
||||
<destination>{9428b603-974b-4a87-bb18-b2b9d73587b7}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixerInput">
|
||||
<destination>{ba3125ef-c4cb-44c6-a87e-0ea2c45ce978}</destination>
|
||||
</relationship>
|
||||
<relationship name="automatableProperties">
|
||||
<destination>{2b0dd391-6e4d-48d1-8166-716b7c7e04e5}</destination>
|
||||
</relationship>
|
||||
<relationship name="markerTracks">
|
||||
<destination>{349ac33a-89de-4b2b-8bec-9f7bbdf673c9}</destination>
|
||||
</relationship>
|
||||
<relationship name="groupTracks">
|
||||
<destination>{9c2114ad-0ef9-45dc-a4e9-396f0459e2d2}</destination>
|
||||
</relationship>
|
||||
<relationship name="timeline">
|
||||
<destination>{9706bb6a-6f65-480a-a5ac-a721b6dcfdc0}</destination>
|
||||
</relationship>
|
||||
<relationship name="banks">
|
||||
<destination>{d6e4340a-dfdb-4393-b4dc-b55091d858cd}</destination>
|
||||
<destination>{561cd480-bd2b-4c2e-b919-d775f9c4f409}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixer" id="{61f2fc30-960a-4bba-8d4b-66a7d375f900}">
|
||||
<relationship name="masterBus">
|
||||
<destination>{1ac949bd-8f90-4ea6-beff-7928cfd093ec}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MasterTrack" id="{9428b603-974b-4a87-bb18-b2b9d73587b7}">
|
||||
<relationship name="mixerGroup">
|
||||
<destination>{1ac949bd-8f90-4ea6-beff-7928cfd093ec}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerInput" id="{ba3125ef-c4cb-44c6-a87e-0ea2c45ce978}">
|
||||
<relationship name="effectChain">
|
||||
<destination>{7da394b6-2e0d-4e97-86ea-79106d8f0e98}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{951a61ea-cdab-4d75-9743-770ce75367a7}</destination>
|
||||
</relationship>
|
||||
<relationship name="output">
|
||||
<destination>{69d0d47a-7f4b-4d6c-bfc3-bda91e9f7f1f}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventAutomatableProperties" id="{2b0dd391-6e4d-48d1-8166-716b7c7e04e5}" />
|
||||
<object class="MarkerTrack" id="{349ac33a-89de-4b2b-8bec-9f7bbdf673c9}" />
|
||||
<object class="GroupTrack" id="{9c2114ad-0ef9-45dc-a4e9-396f0459e2d2}">
|
||||
<relationship name="modules">
|
||||
<destination>{f8f3eca6-9036-4821-935a-e75b9c2c36a9}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixerGroup">
|
||||
<destination>{9e3590d7-747f-40c2-a071-72c13d93b0c4}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="Timeline" id="{9706bb6a-6f65-480a-a5ac-a721b6dcfdc0}">
|
||||
<relationship name="modules">
|
||||
<destination>{f8f3eca6-9036-4821-935a-e75b9c2c36a9}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerMaster" id="{1ac949bd-8f90-4ea6-beff-7928cfd093ec}">
|
||||
<relationship name="effectChain">
|
||||
<destination>{70ec0f3f-81b6-4925-a9bd-974170a1b219}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{1a5b9e49-1b29-4c35-a757-9d8a760ffb14}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixer">
|
||||
<destination>{61f2fc30-960a-4bba-8d4b-66a7d375f900}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusEffectChain" id="{7da394b6-2e0d-4e97-86ea-79106d8f0e98}">
|
||||
<relationship name="effects">
|
||||
<destination>{9c499a59-ee7f-45ff-b2dd-58a0109955a4}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{951a61ea-cdab-4d75-9743-770ce75367a7}" />
|
||||
<object class="ProgrammerSound" id="{f8f3eca6-9036-4821-935a-e75b9c2c36a9}">
|
||||
<property name="isAsync">
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="length">
|
||||
<value>0.32000000000000001</value>
|
||||
</property>
|
||||
<property name="voiceStealing">
|
||||
<value>3</value>
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>VOClip</value>
|
||||
</property>
|
||||
<relationship name="placeholder">
|
||||
<destination>{2b3fcc82-caef-4b50-8673-aa035b792ec5}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerGroup" id="{9e3590d7-747f-40c2-a071-72c13d93b0c4}">
|
||||
<property name="name">
|
||||
<value>VO</value>
|
||||
</property>
|
||||
<relationship name="effectChain">
|
||||
<destination>{e71dc133-b94e-4751-ac3d-b3448490d3d3}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{e3b527d1-bd33-4059-b1f6-18cf1387fdcb}</destination>
|
||||
</relationship>
|
||||
<relationship name="output">
|
||||
<destination>{1ac949bd-8f90-4ea6-beff-7928cfd093ec}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusEffectChain" id="{70ec0f3f-81b6-4925-a9bd-974170a1b219}">
|
||||
<relationship name="effects">
|
||||
<destination>{1d02e252-40d7-45a2-918e-171d67ad50a3}</destination>
|
||||
<destination>{aa3974fd-9122-4ef6-91bd-d1cbbd5d9c18}</destination>
|
||||
<destination>{2cf8ef76-9df1-4b8a-905e-279aeec02cd2}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{1a5b9e49-1b29-4c35-a757-9d8a760ffb14}" />
|
||||
<object class="MixerBusFader" id="{9c499a59-ee7f-45ff-b2dd-58a0109955a4}" />
|
||||
<object class="MixerBusEffectChain" id="{e71dc133-b94e-4751-ac3d-b3448490d3d3}">
|
||||
<relationship name="effects">
|
||||
<destination>{3f4f241b-4126-48a1-9fe1-1f3b222aaf7a}</destination>
|
||||
<destination>{775bff57-00c4-4edc-bf5f-634a2e8d26b1}</destination>
|
||||
<destination>{2c618b8a-2fb0-4f55-b3a8-abe355681c08}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{e3b527d1-bd33-4059-b1f6-18cf1387fdcb}" />
|
||||
<object class="DistortionEffect" id="{1d02e252-40d7-45a2-918e-171d67ad50a3}">
|
||||
<property name="level">
|
||||
<value>0.800000012</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="ThreeEQEffect" id="{aa3974fd-9122-4ef6-91bd-d1cbbd5d9c18}">
|
||||
<property name="lowGain">
|
||||
<value>-18.5</value>
|
||||
</property>
|
||||
<property name="highGain">
|
||||
<value>-32</value>
|
||||
</property>
|
||||
<property name="lowCrossover">
|
||||
<value>90</value>
|
||||
</property>
|
||||
<property name="highCrossover">
|
||||
<value>13500</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="MixerBusFader" id="{2cf8ef76-9df1-4b8a-905e-279aeec02cd2}" />
|
||||
<object class="ThreeEQEffect" id="{3f4f241b-4126-48a1-9fe1-1f3b222aaf7a}">
|
||||
<property name="bypass">
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="lowGain">
|
||||
<value>-26</value>
|
||||
</property>
|
||||
<property name="highGain">
|
||||
<value>-10.5</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="MixerBusFader" id="{775bff57-00c4-4edc-bf5f-634a2e8d26b1}" />
|
||||
<object class="Sidechain" id="{2c618b8a-2fb0-4f55-b3a8-abe355681c08}">
|
||||
<property name="bypass">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</object>
|
||||
</objects>
|
||||
Loading…
Reference in New Issue