Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC

Assets/Wwise/ScriptableObjects/Event/213CEB48-4DCE-4A16-BEF2-7F16679976D1.asset

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c945e91273b87a045b723cc8ddded56c, type: 3}
+  m_Name: 213CEB48-4DCE-4A16-BEF2-7F16679976D1
+  m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseEventReference
+  objectName: Play_AMB_Theatre_Bed_RoomTone_Loop
+  id: 2261430053
+  guid: 213CEB48-4DCE-4A16-BEF2-7F16679976D1
+  IsInUserDefinedSoundBank: 0

Assets/Wwise/ScriptableObjects/Event/213CEB48-4DCE-4A16-BEF2-7F16679976D1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d85f0908830fb2f4093fdee812de9327
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Wwise/ScriptableObjects/Event/2DE336EE-C77E-4DFF-824F-D2BD7894D38C.asset

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c945e91273b87a045b723cc8ddded56c, type: 3}
+  m_Name: 2DE336EE-C77E-4DFF-824F-D2BD7894D38C
+  m_EditorClassIdentifier: AK.Wwise.Unity.API.WwiseTypes::WwiseEventReference
+  objectName: Play_AMB_Theater_Emitter_CRTHead_Loop
+  id: 2630619322
+  guid: 2DE336EE-C77E-4DFF-824F-D2BD7894D38C
+  IsInUserDefinedSoundBank: 0

Assets/Wwise/ScriptableObjects/Event/2DE336EE-C77E-4DFF-824F-D2BD7894D38C.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d1dcd5b446da15b47a7733c5eb4f1fb2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Content/Scenes/Theatre.unity

@@ -3236,11 +3236,11 @@ PrefabInstance:
     - target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
       propertyPath: reverbAuxBus.WwiseObjectReference
       value: 
-      objectReference: {fileID: 11400000, guid: 2250685977792764f9923476afdf22ec, type: 2}
+      objectReference: {fileID: 0}
     - target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
       propertyPath: roomToneEvent.WwiseObjectReference
       value: 
-      objectReference: {fileID: 11400000, guid: 85171d08b855c9345b6c6c28acb8a83a, type: 2}
+      objectReference: {fileID: 11400000, guid: d85f0908830fb2f4093fdee812de9327, type: 2}
     m_RemovedComponents:
     - {fileID: 3976092107026356747, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
     m_RemovedGameObjects: []
@@ -34594,6 +34594,67 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: 6802767204323751312, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3}
+--- !u!1001 &1463114954
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.003
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.697
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 16.194
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5856443040925330738, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: m_Name
+      value: WwiseAkEmitter_CRTHead
+      objectReference: {fileID: 0}
+    - target: {fileID: 8660823651490621642, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
+      propertyPath: data.WwiseObjectReference
+      value: 
+      objectReference: {fileID: 11400000, guid: d1dcd5b446da15b47a7733c5eb4f1fb2, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
 --- !u!1 &1466363513
 GameObject:
   m_ObjectHideFlags: 0
@@ -64016,3 +64077,4 @@ SceneRoots:
   - {fileID: 622343290}
   - {fileID: 1321486799}
   - {fileID: 1669380717}
+  - {fileID: 1463114954}

Assets/_Content/Shaders/Postprocess/Include/EnkiBillalFullscreen.hlsl

@@ -267,9 +267,12 @@ void EnkiBillalFullscreen_float
     // DISTORTION
     
     float distortAtten = pow(smoothstep(5, 20, depthMeters), 2);
-    float nDistort = FBMNoise3D(positionWS * float3(1, 2, 1) - time * .1 - np0 * .5, 1.5, 1, 2, .5) * 2 - 1;
+    float nDistort0 = FBMNoise3D(positionWS * float3(1, 2.0, 1) - time * .1 - np0 * .5 + np3 * 3, 1.5, 1, 2, .5) * 2 - 1;
-    float2 uvDistort = uv0 + nDistort * .03;
+    float nDistort1 = FBMNoise3D(positionWS * float3(1, 1.5, 1) - time * .1 - np0 * .5 + np4 * 3, 1.5, 1, 2, .5) * 2 - 1;
-    float3 sceneColor2 = SampleSceneColor(uvDistort);
+    float2 uvDistort0 = uv0 + nDistort0 * .005;
+    float2 uvDistort1 = uv0 + nDistort1 * .015;
+    float3 sceneColor2 = SampleSceneColor(uvDistort0);
+    sceneColor2 = lerp(sceneColor2, SampleSceneColor(uvDistort1), .3);
     float3 cDistort = saturate(sceneColor2 - sceneColor) * distortAtten;
     
     // OUTLINE
@@ -314,7 +317,7 @@ void EnkiBillalFullscreen_float
     //c = lerp(c, sceneColor2, (greyscale + smoothstep(5, 35, depthMeters) * .8) * .5);
     //c += sceneColor2 * greyscale * .5;
     c = lerp(c, outlineColor, outline);
-    c += cDistort * .5;
+    c += cDistort * 1;
     //c = ((c + 1) * (sceneColor2 + 0));
     //c = smoothstep(-.1, 0, np2);
     //c = greyscale;

Assets/_Recovery/0 (5).unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0f6e3d132b917c448bcbc370856ee87b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Recovery/0 (6).unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 868da284af87ce84e8d809efef136c4c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

RESIDENCY_POC_WwiseProject/Busses/Default Work Unit.wwu

@@ -139,8 +139,30 @@
 														<ObjectList Name="Effects">
 															<EffectSlot Name="" ID="{842354AA-1FD6-4275-9D1B-E5BF91E76FD5}" ShortID="182192425">
 																<ReferenceList>
-																	<Reference Name="Effect" PluginName="Wwise RoomVerb" CompanyID="0" PluginID="118" PluginType="3">
+																	<Reference Name="Effect">
-																		<ObjectRef Name="Medium" ID="{AEB3F175-958B-45F2-A4C2-3FBD4F456568}" WorkUnitID="{E8613F7D-BAD3-45CD-A3ED-505576F31277}"/>
+																		<Custom CreatedFrom="{C4A4605C-42EF-476A-B53C-E31C7A442C24}">
+																			<Effect Name="Metal_Hangar (Custom)" ID="{74A1AE46-1B1C-4D41-A4BB-5B621E31487F}" ShortID="91581037" PluginName="Wwise RoomVerb" CompanyID="0" PluginID="118" PluginType="3">
+																				<PropertyList>
+																					<Property Name="DecayTime" Type="Real32" Value="6.2"/>
+																					<Property Name="Density" Type="Real32" Value="94"/>
+																					<Property Name="Diffusion" Type="Real32" Value="53"/>
+																					<Property Name="ERLevel" Type="Real32" Value="-22"/>
+																					<Property Name="ERPattern" Type="int32" Value="30"/>
+																					<Property Name="Filter1Freq" Type="Real32" Value="590"/>
+																					<Property Name="Filter1Gain" Type="Real32" Value="-7"/>
+																					<Property Name="Filter2Freq" Type="Real32" Value="2200"/>
+																					<Property Name="Filter2InsertPos" Type="int32" Value="0"/>
+																					<Property Name="Filter2Q" Type="Real32" Value="0.1"/>
+																					<Property Name="Filter3Freq" Type="Real32" Value="12000"/>
+																					<Property Name="Filter3Gain" Type="Real32" Value="2.5"/>
+																					<Property Name="HFDamping" Type="Real32" Value="5.65"/>
+																					<Property Name="PreDelay" Type="Real32" Value="125"/>
+																					<Property Name="Quality" Type="int32" Value="14"/>
+																					<Property Name="RoomSize" Type="Real32" Value="71"/>
+																					<Property Name="StereoWidth" Type="Real32" Value="140"/>
+																				</PropertyList>
+																			</Effect>
+																		</Custom>
 																	</Reference>
 																</ReferenceList>
 															</EffectSlot>

RESIDENCY_POC_WwiseProject/Containers/Movement.wwu

@@ -52,6 +52,7 @@
 											</ValueList>
 										</Property>
 										<Property Name="NormalOrShuffle" Type="int16" Value="0"/>
+										<Property Name="OverrideEffect" Type="bool" Value="True"/>
 										<Property Name="Pitch" Type="int32">
 											<ModifierList>
 												<ModifierInfo>
@@ -65,6 +66,11 @@
 												</ModifierInfo>
 											</ModifierList>
 										</Property>
+										<Property Name="Volume" Type="Real64">
+											<ValueList>
+												<Value>-2</Value>
+											</ValueList>
+										</Property>
 									</PropertyList>
 									<ReferenceList>
 										<Reference Name="Conversion">
@@ -346,6 +352,28 @@
 											</ActiveSourceList>
 										</Sound>
 									</ChildrenList>
+									<ObjectLists>
+										<ObjectList Name="Effects">
+											<EffectSlot Name="" ID="{CB107B13-FF41-4010-85EB-D8B5CE188CAB}" ShortID="588313056">
+												<PropertyList>
+													<Property Name="Render" Type="bool" Value="True"/>
+												</PropertyList>
+												<ReferenceList>
+													<Reference Name="Effect">
+														<Custom CreatedFrom="{F9627628-0B10-4272-BC30-D4C20423CB38}">
+															<Effect Name="High_Pass_60Hz (Custom)" ID="{8E5B2663-DC31-4557-B220-678C66379BF0}" ShortID="808033265" PluginName="Wwise Parametric EQ" CompanyID="0" PluginID="105" PluginType="3">
+																<PropertyList>
+																	<Property Name="FilterTypeBand1" Type="int32" Value="1"/>
+																	<Property Name="FrequencyBand1" Type="Real32" Value="70"/>
+																	<Property Name="OnOffBand2" Type="bool" Value="False"/>
+																</PropertyList>
+															</Effect>
+														</Custom>
+													</Reference>
+												</ReferenceList>
+											</EffectSlot>
+										</ObjectList>
+									</ObjectLists>
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="carpet" ID="{19127009-7785-4A19-B32F-6B68D7ACC650}" ShortID="171124363">
 									<PropertyList>

RESIDENCY_POC_WwiseProject/Containers/Theater.wwu

@@ -10,7 +10,7 @@
 						<Property Name="OverridePositioning" Type="bool" Value="True"/>
 						<Property Name="Volume" Type="Real64">
 							<ValueList>
-								<Value>-10</Value>
+								<Value>-96</Value>
 							</ValueList>
 						</Property>
 					</PropertyList>