diff --git a/Assets/_Content/Scenes/Theatre.unity b/Assets/_Content/Scenes/Theatre.unity index 278cc725..c2d2c38c 100644 --- a/Assets/_Content/Scenes/Theatre.unity +++ b/Assets/_Content/Scenes/Theatre.unity @@ -1358,6 +1358,133 @@ Light: m_LightUnit: 1 m_LuxAtDistance: 1 m_EnableSpotReflector: 1 +--- !u!1 &94927757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 94927758} + - component: {fileID: 94927760} + - component: {fileID: 94927759} + m_Layer: 0 + m_Name: Spot Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &94927758 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94927757} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0.10899999, y: 4.75, z: 0.054000854} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2117369718} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &94927759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94927757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &94927760 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94927757} + m_Enabled: 1 + serializedVersion: 12 + m_Type: 0 + m_Color: {r: 0.42274833, g: 0.621802, b: 0.7169812, a: 1} + m_Intensity: 200 + m_Range: 10.007583 + m_SpotAngle: 179 + m_InnerSpotAngle: 0 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &99572583 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3} @@ -2154,6 +2281,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 832575519} + - {fileID: 1057717016} - {fileID: 1103987438} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2311,7 +2439,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &249418330 Transform: m_ObjectHideFlags: 0 @@ -2320,13 +2448,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 249418329} serializedVersion: 2 - m_LocalRotation: {x: 0.16258073, y: 0.8252836, z: -0.29678136, w: 0.4521011} - m_LocalPosition: {x: 2.77, y: 3.545, z: 5.9470005} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.109, y: 6.005, z: 7.554} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1196872730} - m_LocalEulerAnglesHint: {x: 39.558, y: 122.571, z: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &249418331 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2366,10 +2494,10 @@ Light: m_Enabled: 1 serializedVersion: 12 m_Type: 0 - m_Color: {r: 0.4575472, g: 1, b: 0.9331727, a: 1} + m_Color: {r: 0.42274833, g: 0.621802, b: 0.7169812, a: 1} m_Intensity: 100 - m_Range: 10 - m_SpotAngle: 55.571426 + m_Range: 10.007583 + m_SpotAngle: 179 m_InnerSpotAngle: 0 m_CookieSize2D: {x: 0.5, y: 0.5} m_Shadows: @@ -3542,6 +3670,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2002434880} + - {fileID: 532523936} m_Father: {fileID: 1786720794} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &461116116 stripped @@ -4077,6 +4206,57 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &532523935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532523936} + - component: {fileID: 532523937} + m_Layer: 0 + m_Name: SubtitlesPostProcess + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &532523936 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532523935} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 459022362} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &532523937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532523935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8794f9ed5592b56489a289359e19bfed, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Hallucination.HallucinationPostProcess + _volume: {fileID: 1057717017} + _shaderMaterial: {fileID: 0} + _initialSanity: 0 + _autoDecayRate: 0 + _wrapperAddAmount: 1 + _wrapperRemoveAmount: 1 + _wrapperDuration: 3 --- !u!1 &578572311 GameObject: m_ObjectHideFlags: 0 @@ -5238,6 +5418,133 @@ MonoBehaviour: _fadeIn: 0.05 _hold: 0.2 _fadeOut: 0.1 +--- !u!1 &695579608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 695579609} + - component: {fileID: 695579611} + - component: {fileID: 695579610} + m_Layer: 21 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &695579609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695579608} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.739, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1026168398} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &695579610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695579608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_CustomShadowLayers: 0 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 + m_RenderingLayersMask: + serializedVersion: 0 + m_Bits: 2 + m_ShadowRenderingLayersMask: + serializedVersion: 0 + m_Bits: 1 + m_Version: 4 + m_LightLayerMask: 1 + m_ShadowLayerMask: 1 + m_RenderingLayers: 1 + m_ShadowRenderingLayers: 1 +--- !u!108 &695579611 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 695579608} + m_Enabled: 1 + serializedVersion: 12 + m_Type: 2 + m_Color: {r: 0.42274833, g: 0.621802, b: 0.7169812, a: 1} + m_Intensity: 3 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize2D: {x: 0.5, y: 0.5} + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 2 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1 &704206558 GameObject: m_ObjectHideFlags: 0 @@ -7624,7 +7931,6 @@ GameObject: - component: {fileID: 938880778} - component: {fileID: 938880777} - component: {fileID: 938880781} - - component: {fileID: 938880776} - component: {fileID: 938880775} - component: {fileID: 938880780} m_Layer: 0 @@ -7704,22 +8010,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &938880776 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 938880773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1023fdbb836c50f48bd4b52575ed3689, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Localization.OctoLocalizedText - data: {fileID: 11400000, guid: 973e511f44be1e7419527fbc54fa0bf1, type: 2} - text: {fileID: 0} - textMeshPro: {fileID: 0} - textMeshProUGUI: {fileID: 938880778} --- !u!114 &938880777 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7897,7 +8187,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2fcf97d75546f147adf431e737bce52, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Dialogue.LocalizedSubtitle - _data: {fileID: 0} + _data: {fileID: 11400000, guid: 973e511f44be1e7419527fbc54fa0bf1, type: 2} --- !u!1 &939771951 GameObject: m_ObjectHideFlags: 0 @@ -9013,6 +9303,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 423150183} + - {fileID: 695579609} m_Father: {fileID: 1584967890} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1026168399 @@ -9330,6 +9621,55 @@ CapsuleCollider: m_Height: 2.8500001 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0.057512857} +--- !u!1 &1057717015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1057717016} + - component: {fileID: 1057717017} + m_Layer: 0 + m_Name: DizzyVolume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1057717016 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057717015} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 235456880} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1057717017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057717015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.Volume + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 0 + sharedProfile: {fileID: 11400000, guid: e58de8c69bee6784183c1e01e4657fa8, type: 2} --- !u!64 &1075075867 MeshCollider: m_ObjectHideFlags: 0 @@ -10035,6 +10375,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 532523937} + m_TargetAssemblyTypeName: Unheimlich.Features.Hallucination.HallucinationPostProcess, + Assembly-CSharp + m_MethodName: RemoveSanityWrapper + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 _onTriggerDelayed: m_PersistentCalls: m_Calls: [] @@ -10071,7 +10424,6 @@ GameObject: - component: {fileID: 1161394549} - component: {fileID: 1161394548} - component: {fileID: 1161394547} - - component: {fileID: 1161394550} - component: {fileID: 1161394551} - component: {fileID: 1161394545} m_Layer: 0 @@ -10265,22 +10617,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161394543} m_CullTransparentMesh: 1 ---- !u!114 &1161394550 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161394543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1023fdbb836c50f48bd4b52575ed3689, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Localization.OctoLocalizedText - data: {fileID: 11400000, guid: 85460826065aec64b8a5fff1d999ba26, type: 2} - text: {fileID: 0} - textMeshPro: {fileID: 0} - textMeshProUGUI: {fileID: 1161394548} --- !u!114 &1161394551 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10293,7 +10629,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2fcf97d75546f147adf431e737bce52, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Dialogue.LocalizedSubtitle - _data: {fileID: 0} + _data: {fileID: 11400000, guid: 85460826065aec64b8a5fff1d999ba26, type: 2} --- !u!1 &1164710798 GameObject: m_ObjectHideFlags: 0 @@ -11270,8 +11606,8 @@ GameObject: - component: {fileID: 1221498298} - component: {fileID: 1221498297} - component: {fileID: 1221498300} - - component: {fileID: 1221498296} - component: {fileID: 1221498295} + - component: {fileID: 1221498301} m_Layer: 0 m_Name: DialogueC m_TagString: Untagged @@ -11338,22 +11674,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1221498296 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1221498293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1023fdbb836c50f48bd4b52575ed3689, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Localization.OctoLocalizedText - data: {fileID: 11400000, guid: 1775f09327d76ab4eac9a8b4b75480ff, type: 2} - text: {fileID: 0} - textMeshPro: {fileID: 0} - textMeshProUGUI: {fileID: 1221498298} --- !u!114 &1221498297 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11491,7 +11811,71 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2fcf97d75546f147adf431e737bce52, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Dialogue.LocalizedSubtitle - _data: {fileID: 0} + _data: {fileID: 11400000, guid: 1775f09327d76ab4eac9a8b4b75480ff, type: 2} +--- !u!114 &1221498301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221498293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5170627695bd877419928fa9ca37865d, type: 3} + m_Name: + m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoWorldEvent + _trigger: 3 + _action: 0 + _condition: 0 + _tags: [] + _targets: [] + _tolerance: 0.5 + _duration: 1 + _execution: 1 + _delay: 6 + _onTrigger: + m_PersistentCalls: + m_Calls: [] + _onTriggerDelayed: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1221498293} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 532523937} + m_TargetAssemblyTypeName: Unheimlich.Features.Hallucination.HallucinationPostProcess, + Assembly-CSharp + m_MethodName: RemoveSanityWrapper + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 625490235} + m_TargetAssemblyTypeName: Unheimlich.World.CameraSystem.LostFootageRig, Assembly-CSharp + m_MethodName: Disable + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1233009596 GameObject: m_ObjectHideFlags: 0 @@ -11548,7 +11932,6 @@ GameObject: - component: {fileID: 1270400838} - component: {fileID: 1270400837} - component: {fileID: 1270400841} - - component: {fileID: 1270400836} - component: {fileID: 1270400835} - component: {fileID: 1270400840} m_Layer: 0 @@ -11628,22 +12011,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1270400836 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1270400833} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1023fdbb836c50f48bd4b52575ed3689, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Localization.OctoLocalizedText - data: {fileID: 11400000, guid: 3c05ba91d318d524fbcf867fe886c553, type: 2} - text: {fileID: 0} - textMeshPro: {fileID: 0} - textMeshProUGUI: {fileID: 1270400838} --- !u!114 &1270400837 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11821,7 +12188,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2fcf97d75546f147adf431e737bce52, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Dialogue.LocalizedSubtitle - _data: {fileID: 0} + _data: {fileID: 11400000, guid: 3c05ba91d318d524fbcf867fe886c553, type: 2} --- !u!1 &1276767359 GameObject: m_ObjectHideFlags: 0 @@ -12664,6 +13031,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 532523937} + m_TargetAssemblyTypeName: Unheimlich.Features.Hallucination.HallucinationPostProcess, + Assembly-CSharp + m_MethodName: AddSanityWrapper + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 _onTriggerDelayed: m_PersistentCalls: m_Calls: [] @@ -12680,8 +13060,6 @@ GameObject: - component: {fileID: 1385908342} - component: {fileID: 1385908341} - component: {fileID: 1385908345} - - component: {fileID: 1385908344} - - component: {fileID: 1385908339} - component: {fileID: 1385908346} m_Layer: 0 m_Name: DialogueB @@ -12709,57 +13087,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -78} m_SizeDelta: {x: 1820, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1385908339 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1385908337} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5170627695bd877419928fa9ca37865d, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoWorldEvent - _trigger: 3 - _action: 0 - _condition: 0 - _tags: [] - _targets: [] - _tolerance: 0.5 - _duration: 1 - _execution: 1 - _delay: 6 - _onTrigger: - m_PersistentCalls: - m_Calls: [] - _onTriggerDelayed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1161394543} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 1385908337} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!114 &1385908341 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12885,22 +13212,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385908337} m_CullTransparentMesh: 1 ---- !u!114 &1385908344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1385908337} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1023fdbb836c50f48bd4b52575ed3689, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Localization.OctoLocalizedText - data: {fileID: 11400000, guid: ca474a334f870624eabfb3cbb9357f3f, type: 2} - text: {fileID: 0} - textMeshPro: {fileID: 0} - textMeshProUGUI: {fileID: 1385908342} --- !u!114 &1385908345 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12913,7 +13224,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2fcf97d75546f147adf431e737bce52, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Dialogue.LocalizedSubtitle - _data: {fileID: 0} + _data: {fileID: 11400000, guid: ca474a334f870624eabfb3cbb9357f3f, type: 2} --- !u!114 &1385908346 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21364,6 +21675,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1475429332} + - {fileID: 94927758} m_Father: {fileID: 1584967890} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &2117369719 @@ -21775,8 +22087,6 @@ GameObject: - component: {fileID: 160056245658704172} - component: {fileID: 6984622148685993083} - component: {fileID: 6984622148685993087} - - component: {fileID: 6984622148685993085} - - component: {fileID: 6984622148685993084} - component: {fileID: 6984622148685993088} m_Layer: 0 m_Name: DialogueA @@ -21877,6 +22187,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 532523937} + m_TargetAssemblyTypeName: Unheimlich.Features.Hallucination.HallucinationPostProcess, + Assembly-CSharp + m_MethodName: AddSanityWrapper + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 _onTriggerDelayed: m_PersistentCalls: m_Calls: [] @@ -24271,73 +24594,6 @@ MonoBehaviour: _fontSize: 0 _overrideColor: 0 _textColor: {r: 1, g: 1, b: 1, a: 1} ---- !u!114 &6984622148685993084 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011309933828299120} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5170627695bd877419928fa9ca37865d, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Components.OctoWorldEvent - _trigger: 3 - _action: 0 - _condition: 0 - _tags: [] - _targets: [] - _tolerance: 0.5 - _duration: 1 - _execution: 1 - _delay: 6 - _onTrigger: - m_PersistentCalls: - m_Calls: [] - _onTriggerDelayed: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1385908337} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - - m_Target: {fileID: 1011309933828299120} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &6984622148685993085 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1011309933828299120} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1023fdbb836c50f48bd4b52575ed3689, type: 3} - m_Name: - m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.Localization.OctoLocalizedText - data: {fileID: 11400000, guid: f8c2c11cba7317b49b0cf7e0748c1af4, type: 2} - text: {fileID: 0} - textMeshPro: {fileID: 0} - textMeshProUGUI: {fileID: 160056245658704172} --- !u!114 &6984622148685993087 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24350,7 +24606,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2fcf97d75546f147adf431e737bce52, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Features.Dialogue.LocalizedSubtitle - _data: {fileID: 0} + _data: {fileID: 11400000, guid: f8c2c11cba7317b49b0cf7e0748c1af4, type: 2} --- !u!114 &6984622148685993088 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_Content/Scenes/Theatre/DizzyVolume.asset b/Assets/_Content/Scenes/Theatre/DizzyVolume.asset new file mode 100644 index 00000000..766881e5 --- /dev/null +++ b/Assets/_Content/Scenes/Theatre/DizzyVolume.asset @@ -0,0 +1,117 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5214240790702103992 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.MotionBlur + active: 1 + mode: + m_OverrideState: 1 + m_Value: 0 + quality: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 1 + clamp: + m_OverrideState: 1 + m_Value: 0.2 +--- !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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: DizzyVolume + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.VolumeProfile + components: + - {fileID: 2572373776886746051} + - {fileID: -5214240790702103992} + - {fileID: 6541330083691399874} +--- !u!114 &2572373776886746051 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.DepthOfField + active: 1 + mode: + m_OverrideState: 1 + m_Value: 1 + gaussianStart: + m_OverrideState: 1 + m_Value: 0 + gaussianEnd: + m_OverrideState: 1 + m_Value: 0 + gaussianMaxRadius: + m_OverrideState: 1 + m_Value: 1 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 10 + aperture: + m_OverrideState: 1 + m_Value: 5.6 + focalLength: + m_OverrideState: 1 + m_Value: 50 + bladeCount: + m_OverrideState: 1 + m_Value: 5 + bladeCurvature: + m_OverrideState: 1 + m_Value: 1 + bladeRotation: + m_OverrideState: 1 + m_Value: 0 +--- !u!114 &6541330083691399874 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.Vignette + active: 1 + color: + m_OverrideState: 1 + m_Value: {r: 0, g: 0, b: 0, a: 1} + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0.431 + smoothness: + m_OverrideState: 1 + m_Value: 0.351 + rounded: + m_OverrideState: 0 + m_Value: 0 diff --git a/Assets/_Content/Scenes/Theatre/DizzyVolume.asset.meta b/Assets/_Content/Scenes/Theatre/DizzyVolume.asset.meta new file mode 100644 index 00000000..979634b4 --- /dev/null +++ b/Assets/_Content/Scenes/Theatre/DizzyVolume.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e58de8c69bee6784183c1e01e4657fa8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Scripts/Features/Dialogue/Runtime/LocalizedSubtitle.cs b/Assets/_Content/Scripts/Features/Dialogue/Runtime/LocalizedSubtitle.cs index 3d1e4890..126c9fcc 100644 --- a/Assets/_Content/Scripts/Features/Dialogue/Runtime/LocalizedSubtitle.cs +++ b/Assets/_Content/Scripts/Features/Dialogue/Runtime/LocalizedSubtitle.cs @@ -10,52 +10,41 @@ namespace Unheimlich.Features.Dialogue public class LocalizedSubtitle : MonoBehaviour { [SerializeField] private OctoLocalizedTextData _data; - - private OctoLocalizedText _localizedText; // A retirer + private PerLetterFontShifter _shifter; - private Action localize; + private Action _localize; void Awake() { - _localizedText = GetComponent(); // A retirer _shifter = GetComponent(); + } + void Start() + { if (!OctoFramework.Instance) { - Debug.LogWarning($"OctoCore.Instance not found"); + Debug.LogWarning("[LocalizedSubtitle] OctoCore.Instance not found"); return; } Localize(); - OctoFramework.Instance.Localization.SubscribeOnLanguageWrittenChange(localize = Localize); + OctoFramework.Instance.Localization.SubscribeOnLanguageWrittenChange(_localize = Localize); } void OnDestroy() { if (!OctoFramework.Instance) return; - if (localize != null) + if (_localize != null) { - OctoFramework.Instance.Localization.UnsubscribeOnLanguageWrittenChange(localize); - localize = null; + OctoFramework.Instance.Localization.UnsubscribeOnLanguageWrittenChange(_localize); + _localize = null; } } - private void Localize() + void Localize() { - string localized = "Not localized"; - - if (_data) - { - localized = OctoLocalization.GetLocalizedText(_data); - } - else // A retirer - { // A retirer - _localizedText.Localize(); // A retirer - localized = GetComponent().text; // A retirer - } // A retirer - - // Read it back from the source TMP (it's disabled but the .text field is still set). + string localized = _data ? OctoLocalization.GetLocalizedText(_data) : string.Empty; _shifter.SetText(localized); } } diff --git a/Assets/_Content/Scripts/Features/ShifitingSubtitles/PerLetterFontShifter.cs b/Assets/_Content/Scripts/Features/ShifitingSubtitles/PerLetterFontShifter.cs index 5d028bc1..d2262b51 100644 --- a/Assets/_Content/Scripts/Features/ShifitingSubtitles/PerLetterFontShifter.cs +++ b/Assets/_Content/Scripts/Features/ShifitingSubtitles/PerLetterFontShifter.cs @@ -124,6 +124,7 @@ namespace Unheimlich.UI /// private void BuildLetterObjects() { + if (_sourceTmp == null) return; DestroyLetterObjects(); foreach (char c in _sourceText)