From 555d1ec82d511314cf8835ecf721ab24bfa15bc1 Mon Sep 17 00:00:00 2001 From: szczuras4 Date: Wed, 26 Feb 2025 03:40:02 +0100 Subject: [PATCH] new VO, Scroll. Cave, devil spider fix , new Cover gaze Roots and FX --- Assets/AI/Devil Spider #2.prefab | 597 +- Assets/Dialogue/TestDialogueBase.asset | 196 +- .../Prefabs/BranchCover.prefab | 432 + .../Prefabs/BranchCover.prefab.meta | 7 + .../Lever_wheel_mat_invisible 1.mat | 12 +- .../Lever_wheel_mat_invisible 2.mat | 196 + .../Lever_wheel_mat_invisible 2.mat.meta | 8 + Assets/Meshes/Terrain/Terrain_Land01.asset | Bin 13590332 -> 13590332 bytes .../Editor/Resources/EditorStartupPrefs.asset | 2 +- .../Land_01/Land_01/Land1_S02_night.asset | 41 +- .../Scenes/Land_01/Land_Of_Death_Demo.unity | 11612 ++++++++++++++-- .../Scenes/POST_PROCESS/BascileusTarget.asset | 2 +- Assets/Scripts/Effects/CameraShaker.cs | 66 +- Assets/testy/Marcin/TesttRenderer.asset | 4 +- 14 files changed, 11518 insertions(+), 1657 deletions(-) create mode 100644 Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab create mode 100644 Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab.meta create mode 100644 Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat create mode 100644 Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat.meta diff --git a/Assets/AI/Devil Spider #2.prefab b/Assets/AI/Devil Spider #2.prefab index 69412c43a..cadfafe7a 100644 --- a/Assets/AI/Devil Spider #2.prefab +++ b/Assets/AI/Devil Spider #2.prefab @@ -23,13 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161869717217319131} + 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: 6165488025419503930} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3740313232900152944 GameObject: @@ -55,13 +55,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3740313232900152944} + 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: 3741924868844747900} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3636870369316370452 MonoBehaviour: @@ -102,13 +102,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3741924868844962808} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0.245, z: 0.189} m_LocalScale: {x: 0.62877, y: 0.62877, z: 0.62877} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3741924868844747900} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &3741924868826436044 ParticleSystem: @@ -292,6 +292,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -321,6 +322,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -534,6 +536,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 0 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 15 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1236,6 +1239,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -1265,6 +1269,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3404,6 +3409,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3433,6 +3439,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -3822,6 +3829,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -3864,6 +3872,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3893,6 +3902,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -3980,6 +3990,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4009,6 +4020,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4047,6 +4059,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4076,6 +4089,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4329,6 +4343,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4358,6 +4373,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4595,6 +4611,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4633,13 +4652,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 1 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 1 m_VertexStreams: 0001030405050809 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4674,13 +4695,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3741924868844988118} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.62877, y: 0.62877, z: 0.62877} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3741924868844747900} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &3741924868826393898 ParticleSystem: @@ -4864,6 +4885,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4893,6 +4915,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5106,6 +5129,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 0 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 80 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -5817,6 +5841,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 minGradient: @@ -5846,6 +5871,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -7976,6 +8002,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8005,6 +8032,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -8394,6 +8422,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -8436,6 +8465,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8465,6 +8495,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -8552,6 +8583,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8581,6 +8613,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -8619,6 +8652,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8648,6 +8682,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -8901,6 +8936,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8930,6 +8966,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9167,6 +9204,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9205,13 +9245,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 1 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 1 m_VertexStreams: 0001030405050809 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -9246,13 +9288,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3741924868844998116} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0} m_LocalScale: {x: 0.62877, y: 0.62877, z: 0.62877} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3741924868844747900} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &3741924868826432354 ParticleSystem: @@ -9454,6 +9496,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9483,6 +9526,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -9750,6 +9794,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 220 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -10470,6 +10515,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 4 m_NumAlphaKeys: 4 minGradient: @@ -10499,6 +10545,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -12629,6 +12676,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -12658,6 +12706,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -13047,6 +13096,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -13089,6 +13139,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13118,6 +13169,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -13205,6 +13257,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13234,6 +13287,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -13272,6 +13326,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13301,6 +13356,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -13554,6 +13610,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13583,6 +13640,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -13820,6 +13878,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13858,13 +13919,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -13899,6 +13962,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3741924868845055030} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00057464454, y: 0.0038144244, z: -0.0020629386} m_LocalScale: {x: 0.010609999, y: 0.010609999, z: 0.010610003} @@ -13909,7 +13973,6 @@ Transform: - {fileID: 3741924868844730806} - {fileID: 3738999065208914938} m_Father: {fileID: 6979665511429410181} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3741924868834780560 MonoBehaviour: @@ -13965,13 +14028,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269398} + 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: 6165488025419503928} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &6165488025432934494 SkinnedMeshRenderer: @@ -13990,6 +14053,9 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 3 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -14083,6 +14149,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269400} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -14090,7 +14157,6 @@ Transform: m_Children: - {fileID: 6165488025419503926} m_Father: {fileID: 6165488025419503930} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269402 GameObject: @@ -14108,7 +14174,6 @@ GameObject: - component: {fileID: 4562452256660863503} - component: {fileID: 3993438222454465810} - component: {fileID: 1011757545749875884} - - component: {fileID: 8244280978345316276} - component: {fileID: 8934803221890528398} - component: {fileID: 3212597502398447521} - component: {fileID: 4024574562712301904} @@ -14117,6 +14182,7 @@ GameObject: - component: {fileID: 4015697649958947475} - component: {fileID: -7442331143875165508} - component: {fileID: 3264789773867314085} + - component: {fileID: 1550643323848923153} m_Layer: 9 m_Name: Devil Spider #2 m_TagString: Enemy @@ -14131,6 +14197,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269402} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 66.92567, y: 31.198088, z: -199.27527} m_LocalScale: {x: 0.644052, y: 0.644052, z: 0.644052} @@ -14144,11 +14211,10 @@ Transform: - {fileID: 2805448753107001327} - {fileID: 6979665511429410181} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6165488025428768414 Animator: - serializedVersion: 4 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -14162,10 +14228,12 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!54 &8825529225173807633 Rigidbody: m_ObjectHideFlags: 0 @@ -14173,10 +14241,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269402} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 450 m_Drag: 0 m_AngularDrag: 100 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -14190,8 +14269,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269402} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.49 m_Height: 2.6 m_Direction: 1 @@ -14264,42 +14352,6 @@ NavMeshAgent: m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 ---- !u!114 &8244280978345316276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6165488025419269402} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d02d7fc772c5168479e3f345a487d428, type: 3} - m_Name: - m_EditorClassIdentifier: - openCloseEvents: 1 - openCloseWindow: 1 - selectedToolbar: 0 - _fsmBehaviour: {fileID: 11400000, guid: 478bc6a7e9fd82c4a9d395af400e05e6, type: 2} - _stop: 0 - _debugMode: 1 - onStartFSM: - m_PersistentCalls: - m_Calls: [] - onPauseFSM: - m_PersistentCalls: - m_Calls: [] - onResetFSM: - m_PersistentCalls: - m_Calls: [] - onStateEnter: - m_PersistentCalls: - m_Calls: [] - onStateExit: - m_PersistentCalls: - m_Calls: [] - onChangeBehaviour: - m_PersistentCalls: - m_Calls: [] --- !u!114 &8934803221890528398 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14509,12 +14561,33 @@ MonoBehaviour: m_Calls: [] deathBy: 0 removeComponentsAfterDie: 1 + debugActionListener: 0 + OnCrouch: + m_PersistentCalls: + m_Calls: [] + OnStandUp: + m_PersistentCalls: + m_Calls: [] + _onActiveRagdoll: + m_PersistentCalls: + m_Calls: [] + onDisableRagdoll: + m_PersistentCalls: + m_Calls: [] + onActionEnter: + m_PersistentCalls: + m_Calls: [] + onActionStay: + m_PersistentCalls: + m_Calls: [] + onActionExit: + m_PersistentCalls: + m_Calls: [] disableControllerOnStart: 0 currentSpeed: 2 animatorSpeed: 1.47 inputMagnitudeSmooth: 0.2 useRootMotion: 0 - turnOnSpotAnim: 0 freeSpeed: rotationSpeed: 13.19 walkSpeed: 3.15 @@ -14551,9 +14624,6 @@ MonoBehaviour: onDisableController: m_PersistentCalls: m_Calls: [] - _onActiveRagdoll: - m_PersistentCalls: - m_Calls: [] _rigidbody: {fileID: 0} frictionPhysics: {fileID: 0} maxFrictionPhysics: {fileID: 0} @@ -14567,7 +14637,6 @@ MonoBehaviour: isJumping: 0 doingCustomAction: 0 customAction: 0 - triggerDieBehaviour: 0 disableAgentOnStart: 1 useNavMeshAgent: 1 updatePathQuality: 2 @@ -14610,15 +14679,16 @@ MonoBehaviour: _obstacles: serializedVersion: 2 m_Bits: 1 + targetsInRange: [] + _currentTarget: + _tag: + _transform: {fileID: 0} + isFixedTarget: 1 + isLost: 0 + _secundaryTargets: [] _debugVisualDetection: 1 _debugRaySight: 1 _debugLastTargetPosition: 1 - _currentTarget: - _transform: {fileID: 0} - _collider: {fileID: 0} - isFixedTarget: 1 - isLost: 0 - _hadHealthController: 1 _receivedDamage: isValid: 0 lastValue: 15 @@ -14796,9 +14866,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 37134623f0d0b40dd92f9c5a21685700, type: 3} m_Name: m_EditorClassIdentifier: - easyHealthScale: 0.7 - normalHealthScale: 1 - hardHealthScale: 1.2 --- !u!114 &3264789773867314085 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14812,6 +14879,42 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: brightnessToAdd: 0.15 +--- !u!114 &1550643323848923153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6165488025419269402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9fb374bd0aad974e9798f071eb5ecb8, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 1 + selectedToolbar: 0 + _fsmBehaviour: {fileID: 11400000, guid: 478bc6a7e9fd82c4a9d395af400e05e6, type: 2} + _stop: 0 + _debugMode: 0 + onStartFSM: + m_PersistentCalls: + m_Calls: [] + onPauseFSM: + m_PersistentCalls: + m_Calls: [] + onResetFSM: + m_PersistentCalls: + m_Calls: [] + onStateEnter: + m_PersistentCalls: + m_Calls: [] + onStateExit: + m_PersistentCalls: + m_Calls: [] + onChangeBehaviour: + m_PersistentCalls: + m_Calls: [] --- !u!1 &6165488025419269404 GameObject: m_ObjectHideFlags: 0 @@ -14835,13 +14938,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269404} + serializedVersion: 2 m_LocalRotation: {x: -0.021630965, y: 0.0053558443, z: 0.9995212, w: -0.021466268} m_LocalPosition: {x: 0.010622673, y: -0.00000009313226, z: 0.09366919} m_LocalScale: {x: 1.000001, y: 1, z: 1.000001} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503934} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269406 GameObject: @@ -14866,6 +14969,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269406} + serializedVersion: 2 m_LocalRotation: {x: 0.5124088, y: -0.5124087, z: -0.48727533, w: -0.48727545} m_LocalPosition: {x: -0.032573704, y: 0.235214, z: 0.0211985} m_LocalScale: {x: 0.999999, y: 1, z: 0.999999} @@ -14881,7 +14985,6 @@ Transform: - {fileID: 6165488025419503948} - {fileID: 6165488025419503932} m_Father: {fileID: 6165488025419503930} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269408 GameObject: @@ -14906,13 +15009,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269408} + serializedVersion: 2 m_LocalRotation: {x: 0.109342605, y: -0.34230426, z: 0.19851454, w: 0.91184646} m_LocalPosition: {x: -0.35535955, y: 0.00000011920929, z: 0.00000029802322} m_LocalScale: {x: 0.999999, y: 0.999999, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503940} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269410 GameObject: @@ -14937,13 +15040,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269410} + serializedVersion: 2 m_LocalRotation: {x: -0.10934209, y: -0.34230408, z: -0.19851519, w: 0.91184646} m_LocalPosition: {x: -0.35536042, y: -0.0000014454126, z: 0.00000047683716} m_LocalScale: {x: 0.999999, y: 1.000001, z: 1.000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503942} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269412 GameObject: @@ -14968,6 +15071,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269412} + serializedVersion: 2 m_LocalRotation: {x: -0.034547888, y: -0.14323707, z: 0.0062177964, w: 0.9890657} m_LocalPosition: {x: -0.30963326, y: 0.0000005736947, z: -0.0000004172325} m_LocalScale: {x: 1.000001, y: 0.999999, z: 0.999999} @@ -14975,7 +15079,6 @@ Transform: m_Children: - {fileID: 6165488025419503936} m_Father: {fileID: 6165488025419503944} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269414 GameObject: @@ -15000,6 +15103,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269414} + serializedVersion: 2 m_LocalRotation: {x: 0.034304418, y: -0.16072358, z: -0.0051845405, w: 0.9863895} m_LocalPosition: {x: -0.30963394, y: 0.0000008121133, z: -0.00000047683716} m_LocalScale: {x: 1, y: 0.999999, z: 0.999998} @@ -15007,7 +15111,6 @@ Transform: m_Children: - {fileID: 6165488025419503938} m_Father: {fileID: 6165488025419503946} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269416 GameObject: @@ -15032,6 +15135,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269416} + serializedVersion: 2 m_LocalRotation: {x: -0.019203393, y: -0.7595221, z: -0.019342477, w: 0.6499103} m_LocalPosition: {x: -0.36587945, y: -0.0000008046627, z: -0.00000010151416} m_LocalScale: {x: 1.000003, y: 1.000001, z: 1} @@ -15039,7 +15143,6 @@ Transform: m_Children: - {fileID: 6165488025419503940} m_Father: {fileID: 6165488025419503948} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269418 GameObject: @@ -15064,6 +15167,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269418} + serializedVersion: 2 m_LocalRotation: {x: 0.018523486, y: -0.7727224, z: 0.018875966, w: 0.6341929} m_LocalPosition: {x: -0.3658809, y: -0.0000005811453, z: -0.000000018626451} m_LocalScale: {x: 0.999999, y: 1, z: 1.000002} @@ -15071,7 +15175,6 @@ Transform: m_Children: - {fileID: 6165488025419503942} m_Father: {fileID: 6165488025419503950} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269420 GameObject: @@ -15096,6 +15199,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269420} + serializedVersion: 2 m_LocalRotation: {x: -0.4941243, y: 0.19752003, z: 0.7379129, w: 0.4151043} m_LocalPosition: {x: 0.04963979, y: -0.13234065, z: -0.033390775} m_LocalScale: {x: 1.000001, y: 1, z: 0.999999} @@ -15103,7 +15207,6 @@ Transform: m_Children: - {fileID: 6165488025419503944} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269422 GameObject: @@ -15128,6 +15231,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269422} + serializedVersion: 2 m_LocalRotation: {x: -0.5038226, y: -0.18968256, z: 0.73754716, w: -0.40768564} m_LocalPosition: {x: 0.049639713, y: 0.13233829, z: -0.033390775} m_LocalScale: {x: 1, y: 1, z: 1.000001} @@ -15135,7 +15239,6 @@ Transform: m_Children: - {fileID: 6165488025419503946} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269424 GameObject: @@ -15160,13 +15263,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269424} + serializedVersion: 2 m_LocalRotation: {x: 0.048626114, y: 0.12718454, z: -0.03798306, w: 0.98995805} m_LocalPosition: {x: -0.3068662, y: 0.000001206994, z: -0.00000071525574} m_LocalScale: {x: 1, y: 1.000001, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503956} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269426 GameObject: @@ -15191,13 +15294,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269426} + serializedVersion: 2 m_LocalRotation: {x: -0.048626695, y: 0.12718453, z: 0.03798236, w: 0.98995805} m_LocalPosition: {x: -0.3068648, y: 0.00000052154064, z: -0.00000059604645} m_LocalScale: {x: 1, y: 1, z: 1.000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503958} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269428 GameObject: @@ -15222,6 +15325,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269428} + serializedVersion: 2 m_LocalRotation: {x: -0.011473102, y: -0.17738868, z: 0.017724197, w: 0.9839144} m_LocalPosition: {x: -0.23443797, y: -0.00000047311187, z: 0.000002026558} m_LocalScale: {x: 1.000001, y: 1, z: 1.000001} @@ -15229,7 +15333,6 @@ Transform: m_Children: - {fileID: 6165488025419503952} m_Father: {fileID: 6165488025419503960} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269430 GameObject: @@ -15254,6 +15357,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269430} + serializedVersion: 2 m_LocalRotation: {x: 0.009046651, y: -0.24348235, z: -0.019732114, w: 0.9696624} m_LocalPosition: {x: -0.23443899, y: 0.00000033527613, z: -0.0000007748604} m_LocalScale: {x: 1.000001, y: 0.999999, z: 1} @@ -15261,7 +15365,6 @@ Transform: m_Children: - {fileID: 6165488025419503954} m_Father: {fileID: 6165488025419503962} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269432 GameObject: @@ -15286,6 +15389,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269432} + serializedVersion: 2 m_LocalRotation: {x: 0.013641561, y: -0.768031, z: -0.017515862, w: 0.6400277} m_LocalPosition: {x: -0.3355037, y: -0.00000032037497, z: 0.00000048801303} m_LocalScale: {x: 1, y: 0.999999, z: 1.000001} @@ -15293,7 +15397,6 @@ Transform: m_Children: - {fileID: 6165488025419503956} m_Father: {fileID: 6165488025419503964} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269434 GameObject: @@ -15318,6 +15421,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269434} + serializedVersion: 2 m_LocalRotation: {x: -0.01885107, y: -0.77447224, z: 0.016813012, w: 0.6321034} m_LocalPosition: {x: -0.3355044, y: -0.00000070780516, z: -0.00000046379864} m_LocalScale: {x: 1, y: 1.000002, z: 0.999999} @@ -15325,7 +15429,6 @@ Transform: m_Children: - {fileID: 6165488025419503958} m_Father: {fileID: 6165488025419503966} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269436 GameObject: @@ -15350,6 +15453,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269436} + serializedVersion: 2 m_LocalRotation: {x: -0.40634173, y: 0.2767879, z: 0.67991406, w: 0.54405123} m_LocalPosition: {x: -0.01103393, y: -0.11685069, z: -0.04925272} m_LocalScale: {x: 1, y: 1.000001, z: 1} @@ -15357,7 +15461,6 @@ Transform: m_Children: - {fileID: 6165488025419503960} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269438 GameObject: @@ -15382,6 +15485,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269438} + serializedVersion: 2 m_LocalRotation: {x: 0.4126226, y: 0.3022284, z: -0.6616665, w: 0.5482682} m_LocalPosition: {x: -0.011034001, y: 0.11685529, z: -0.04925272} m_LocalScale: {x: 1.000002, y: 1, z: 1} @@ -15389,7 +15493,6 @@ Transform: m_Children: - {fileID: 6165488025419503962} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269440 GameObject: @@ -15414,13 +15517,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269440} + serializedVersion: 2 m_LocalRotation: {x: -0.025247192, y: -0.15881892, z: -0.042935375, w: 0.98605055} m_LocalPosition: {x: -0.45496598, y: -0.00000011920929, z: -0.000003695488} m_LocalScale: {x: 1, y: 0.999999, z: 1.000001} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503972} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269442 GameObject: @@ -15445,13 +15548,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269442} + serializedVersion: 2 m_LocalRotation: {x: 0.025246982, y: -0.15881929, z: 0.042935222, w: 0.9860505} m_LocalPosition: {x: -0.45496714, y: 0.000001475215, z: -0.0000034570694} m_LocalScale: {x: 1.000001, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503974} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269444 GameObject: @@ -15476,6 +15579,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269444} + serializedVersion: 2 m_LocalRotation: {x: -0.0029075635, y: -0.27062237, z: -0.035623748, w: 0.9620219} m_LocalPosition: {x: -0.26643664, y: 0.0000007599592, z: 0.000000834465} m_LocalScale: {x: 0.999999, y: 1.000001, z: 1} @@ -15483,7 +15587,6 @@ Transform: m_Children: - {fileID: 6165488025419503968} m_Father: {fileID: 6165488025419503976} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269446 GameObject: @@ -15508,6 +15611,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269446} + serializedVersion: 2 m_LocalRotation: {x: 0.004182951, y: -0.28103906, z: 0.03829382, w: 0.9589229} m_LocalPosition: {x: -0.2664355, y: -0.0000009983778, z: 0.0000010728836} m_LocalScale: {x: 0.999999, y: 1, z: 1} @@ -15515,7 +15619,6 @@ Transform: m_Children: - {fileID: 6165488025419503970} m_Father: {fileID: 6165488025419503978} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269448 GameObject: @@ -15540,6 +15643,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269448} + serializedVersion: 2 m_LocalRotation: {x: 0.014049433, y: -0.4980673, z: -0.036163308, w: 0.86627007} m_LocalPosition: {x: -0.41885132, y: -0.0000006146729, z: -0.00000055879354} m_LocalScale: {x: 1.000001, y: 1, z: 0.999998} @@ -15547,7 +15651,6 @@ Transform: m_Children: - {fileID: 6165488025419503972} m_Father: {fileID: 6165488025419503980} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269450 GameObject: @@ -15572,6 +15675,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269450} + serializedVersion: 2 m_LocalRotation: {x: -0.011696828, y: -0.5090157, z: 0.036886342, w: 0.859887} m_LocalPosition: {x: -0.41885266, y: 0.00000011920929, z: -0.0000011995435} m_LocalScale: {x: 1.000002, y: 1.000001, z: 0.999999} @@ -15579,7 +15683,6 @@ Transform: m_Children: - {fileID: 6165488025419503974} m_Father: {fileID: 6165488025419503982} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269452 GameObject: @@ -15604,6 +15707,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269452} + serializedVersion: 2 m_LocalRotation: {x: -0.09430899, y: 0.3243531, z: 0.19008917, w: 0.9218281} m_LocalPosition: {x: -0.07781792, y: -0.075020224, z: -0.051261187} m_LocalScale: {x: 0.999999, y: 1.000002, z: 1.000001} @@ -15611,7 +15715,6 @@ Transform: m_Children: - {fileID: 6165488025419503976} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269454 GameObject: @@ -15636,6 +15739,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269454} + serializedVersion: 2 m_LocalRotation: {x: 0.07866175, y: 0.33664986, z: -0.1681089, w: 0.92315686} m_LocalPosition: {x: -0.07781696, y: 0.07501727, z: -0.051261142} m_LocalScale: {x: 1.000001, y: 1, z: 1} @@ -15643,7 +15747,6 @@ Transform: m_Children: - {fileID: 6165488025419503978} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269456 GameObject: @@ -15668,13 +15771,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269456} + serializedVersion: 2 m_LocalRotation: {x: -0.18533084, y: -0.118321545, z: -0.05773174, w: 0.973817} m_LocalPosition: {x: -0.3118782, y: -0.0000012665987, z: 0.0000017881393} m_LocalScale: {x: 1, y: 1.000001, z: 0.999999} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503988} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269458 GameObject: @@ -15699,13 +15802,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269458} + serializedVersion: 2 m_LocalRotation: {x: 0.185331, y: -0.11832211, z: 0.057732053, w: 0.9738169} m_LocalPosition: {x: -0.31187734, y: 0.00000022351742, z: 0.00000011920929} m_LocalScale: {x: 1, y: 0.999997, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503990} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269460 GameObject: @@ -15730,6 +15833,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269460} + serializedVersion: 2 m_LocalRotation: {x: 0.017358331, y: -0.24344459, z: -0.08177957, w: 0.96630514} m_LocalPosition: {x: -0.22153726, y: 0.0000013709068, z: 0.00000011920929} m_LocalScale: {x: 1, y: 1, z: 1.000002} @@ -15737,7 +15841,6 @@ Transform: m_Children: - {fileID: 6165488025419503984} m_Father: {fileID: 6165488025419503992} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269462 GameObject: @@ -15762,6 +15865,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269462} + serializedVersion: 2 m_LocalRotation: {x: -0.012688285, y: -0.2753306, z: 0.08413842, w: 0.9575765} m_LocalPosition: {x: -0.2215361, y: -0.0000006556511, z: -0.000001847744} m_LocalScale: {x: 1, y: 1.000002, z: 0.999999} @@ -15769,7 +15873,6 @@ Transform: m_Children: - {fileID: 6165488025419503986} m_Father: {fileID: 6165488025419503994} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269464 GameObject: @@ -15794,6 +15897,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269464} + serializedVersion: 2 m_LocalRotation: {x: 0.012730513, y: -0.57649964, z: -0.07941478, w: 0.81312937} m_LocalPosition: {x: -0.30872816, y: -0.00000051036477, z: -0.00000074505806} m_LocalScale: {x: 0.999999, y: 1, z: 1.000001} @@ -15801,7 +15905,6 @@ Transform: m_Children: - {fileID: 6165488025419503988} m_Father: {fileID: 6165488025419503996} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269466 GameObject: @@ -15826,6 +15929,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269466} + serializedVersion: 2 m_LocalRotation: {x: -0.00013371323, y: -0.6029523, z: 0.07589396, w: 0.79415905} m_LocalPosition: {x: -0.30872983, y: -0.00000055134296, z: -0.0000014193356} m_LocalScale: {x: 1.000001, y: 0.999998, z: 1} @@ -15833,7 +15937,6 @@ Transform: m_Children: - {fileID: 6165488025419503990} m_Father: {fileID: 6165488025419503998} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269468 GameObject: @@ -15858,6 +15961,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269468} + serializedVersion: 2 m_LocalRotation: {x: -0.17788622, y: 0.29683226, z: 0.4772066, w: 0.8077877} m_LocalPosition: {x: -0.05463931, y: -0.110200316, z: -0.03166771} m_LocalScale: {x: 0.999999, y: 1, z: 1.000001} @@ -15865,7 +15969,6 @@ Transform: m_Children: - {fileID: 6165488025419503992} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6165488025419269470 GameObject: @@ -15890,6 +15993,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6165488025419269470} + serializedVersion: 2 m_LocalRotation: {x: 0.1616097, y: 0.33207023, z: -0.45476574, w: 0.8104319} m_LocalPosition: {x: -0.05463837, y: 0.11019528, z: -0.031667665} m_LocalScale: {x: 1, y: 1.000001, z: 1} @@ -15897,7 +16001,6 @@ Transform: m_Children: - {fileID: 6165488025419503994} m_Father: {fileID: 6165488025419503934} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8440460190533922207 GameObject: @@ -15923,13 +16026,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8440460190533922207} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.1899996, z: 0} m_LocalScale: {x: 1.2644631, y: 1.2644631, z: 1.2644631} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6165488025419503930} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &5376707267729055580 AudioSource: @@ -15942,6 +16045,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 8cd84ede9c274f44aa517c99d0601365, type: 3} + m_Resource: {fileID: 8300000, guid: 8cd84ede9c274f44aa517c99d0601365, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -16032,6 +16136,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6165488025419503930} m_Modifications: - target: {fileID: 6720367892902461033, guid: 87d4d88caa7ded241a5490f70b56733d, @@ -16122,7 +16227,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6881989521974562195, guid: 87d4d88caa7ded241a5490f70b56733d, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 99a055298d6265042874374609cea0f3, type: 2} - target: {fileID: 6915302622637438283, guid: 87d4d88caa7ded241a5490f70b56733d, @@ -16136,6 +16241,13 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6721671508262800503, guid: 87d4d88caa7ded241a5490f70b56733d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 282259349285337588} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87d4d88caa7ded241a5490f70b56733d, type: 3} --- !u!1 &7644377956254234855 stripped GameObject: @@ -16154,6 +16266,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6165488025419503930} m_Modifications: - target: {fileID: 937708172521592213, guid: 38d2d59f74a114d4bac7a891298b3871, @@ -16257,6 +16370,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 38d2d59f74a114d4bac7a891298b3871, type: 3} --- !u!198 &3808262129228122910 stripped ParticleSystem: @@ -16275,6 +16391,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7646530930590763769} m_Modifications: - target: {fileID: 6720367892902461033, guid: 87d4d88caa7ded241a5490f70b56733d, @@ -16363,12 +16480,22 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87d4d88caa7ded241a5490f70b56733d, type: 3} +--- !u!4 &282259349285337588 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6721671508262800503, guid: 87d4d88caa7ded241a5490f70b56733d, + type: 3} + m_PrefabInstance: {fileID: 6819265666125739395} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7446272834977327726 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6165488025419503930} m_Modifications: - target: {fileID: -8679921383154817045, guid: 87fb9bdec4e3d4741bd2245928606191, @@ -16473,12 +16600,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -6195767538593635260, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a9593e7f52d0541419870f84ea82cb14, type: 2} - target: {fileID: -1041279737980340588, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a9593e7f52d0541419870f84ea82cb14, type: 2} - target: {fileID: 919132149155446097, guid: 87fb9bdec4e3d4741bd2245928606191, @@ -16508,7 +16635,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3418002285673343216, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a9593e7f52d0541419870f84ea82cb14, type: 2} - target: {fileID: 4604872823351332646, guid: 87fb9bdec4e3d4741bd2245928606191, @@ -16528,7 +16655,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5117269737276333718, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a9593e7f52d0541419870f84ea82cb14, type: 2} - target: {fileID: 6430287856991936409, guid: 87fb9bdec4e3d4741bd2245928606191, @@ -16588,20 +16715,111 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8535133971147982272, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a9593e7f52d0541419870f84ea82cb14, type: 2} - target: {fileID: 8684717250140277553, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a9593e7f52d0541419870f84ea82cb14, type: 2} - target: {fileID: 8835409689826365435, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a9593e7f52d0541419870f84ea82cb14, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3741924868844747900} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8144394004440419581, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1610533824167474858} + - targetCorrespondingSourceObject: {fileID: 8144394004440419581, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4168476870746126675} + - targetCorrespondingSourceObject: {fileID: 8144394004440419581, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 531274476873397429} + - targetCorrespondingSourceObject: {fileID: -2422315340263230684, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1897064902477906882} + - targetCorrespondingSourceObject: {fileID: -2422315340263230684, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3501417827346608845} + - targetCorrespondingSourceObject: {fileID: -2422315340263230684, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8552642435964574588} + - targetCorrespondingSourceObject: {fileID: -6250076149019478384, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4811386334023473262} + - targetCorrespondingSourceObject: {fileID: -6250076149019478384, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8816799916263978627} + - targetCorrespondingSourceObject: {fileID: -6250076149019478384, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1253370153427175401} + - targetCorrespondingSourceObject: {fileID: 6159819195323411483, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3017872639192151868} + - targetCorrespondingSourceObject: {fileID: 6159819195323411483, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4275178250829465275} + - targetCorrespondingSourceObject: {fileID: 6159819195323411483, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4933316637554222141} + - targetCorrespondingSourceObject: {fileID: -2254504247542753893, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 676364817233719038} + - targetCorrespondingSourceObject: {fileID: -2254504247542753893, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5477763041834072455} + - targetCorrespondingSourceObject: {fileID: -2254504247542753893, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5639956917331419015} + - targetCorrespondingSourceObject: {fileID: -1554193974251969968, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6127115874379770890} + - targetCorrespondingSourceObject: {fileID: -1554193974251969968, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2415363684215950377} + - targetCorrespondingSourceObject: {fileID: -1554193974251969968, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3126795446674232062} + - targetCorrespondingSourceObject: {fileID: -4507900262165122138, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7285709145003405843} + - targetCorrespondingSourceObject: {fileID: -4507900262165122138, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4254253322283685158} + - targetCorrespondingSourceObject: {fileID: -4507900262165122138, guid: 87fb9bdec4e3d4741bd2245928606191, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5686128220789977625} m_SourcePrefab: {fileID: 100100000, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} --- !u!1 &567486418439127029 stripped GameObject: @@ -16616,10 +16834,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567486418439127029} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 5 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -16633,9 +16862,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567486418439127029} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 9186633843763367028, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} @@ -16665,10 +16902,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952543620984883262} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 5 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -16682,9 +16930,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952543620984883262} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -2639241166356525208, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} @@ -16714,10 +16970,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1608007729954743955} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 5 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -16731,9 +16998,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1608007729954743955} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3292925553009838691, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} @@ -16763,10 +17038,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2749097002577369544} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 5 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -16780,9 +17066,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2749097002577369544} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 7733717212360752527, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} @@ -16812,10 +17106,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3614819697902782069} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 5 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -16829,9 +17134,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3614819697902782069} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -8113768720884857512, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} @@ -16861,10 +17174,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4122003915545221450} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 5 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -16878,9 +17202,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4122003915545221450} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3996760141626369306, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} @@ -16910,10 +17242,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5626470842125491454} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 5 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -16927,9 +17270,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5626470842125491454} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -3531946766418785785, guid: 87fb9bdec4e3d4741bd2245928606191, type: 3} diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 5d53b5318..16802a1b8 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -12253,7 +12253,7 @@ MonoBehaviour: type: 0 typeString: CustomFieldType_Text - title: Sequence - value: AudioWait(Dialogues/VO/CH01/CH01_wasteland_vo_altar_sword_03) + value: type: 0 typeString: CustomFieldType_Text - title: pl @@ -15007,6 +15007,200 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 51 + fields: + - title: Title + value: CH01/WASTELAND/CH01_wasteland_vo_blocked_wanderer_03 + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Parenthetical + value: + type: 0 + typeString: + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 51 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 51 + originDialogueID: 0 + destinationConversationID: 51 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 30 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: Hope this works... + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: AudioWait(Dialogues/VO/CH01/CH01_wasteland_vo_blocked_wanderer_03) + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 51 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 syncInfo: syncActors: 0 syncItems: 0 diff --git a/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab new file mode 100644 index 000000000..7df5af484 --- /dev/null +++ b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab @@ -0,0 +1,432 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1497420419617872917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7257659499529129619} + - component: {fileID: 1837406258967506319} + m_Layer: 0 + m_Name: BranchCover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 123 + m_IsActive: 1 +--- !u!4 &7257659499529129619 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497420419617872917} + serializedVersion: 2 + m_LocalRotation: {x: 0.35574338, y: 0.25114653, z: 0.1623773, w: -0.88544095} + m_LocalPosition: {x: 0.019614656, y: 0.17691268, z: -0.08489122} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9040205157737034373} + - {fileID: 2710082916543302058} + - {fileID: 6926166161010421711} + - {fileID: 4005722864868966192} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: -51.058, y: -440.523, z: 100.56} +--- !u!205 &1837406258967506319 +LODGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497420419617872917} + serializedVersion: 2 + m_LocalReferencePoint: {x: 0.0015814304, y: 0.09445303, z: 0.12561618} + m_Size: 1.1703997 + m_FadeMode: 0 + m_AnimateCrossFading: 0 + m_LastLODIsBillboard: 0 + m_LODs: + - screenRelativeHeight: 0.25467095 + fadeTransitionWidth: 0 + renderers: + - renderer: {fileID: 4720068011836271386} + - screenRelativeHeight: 0.017059961 + fadeTransitionWidth: 0 + renderers: + - renderer: {fileID: 2248912649001209629} + - screenRelativeHeight: 0.01 + fadeTransitionWidth: 0 + renderers: + - renderer: {fileID: 648246670343201785} + m_Enabled: 1 +--- !u!1 &2875679375857110401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4005722864868966192} + - component: {fileID: 691800114865048957} + - component: {fileID: 648246670343201785} + m_Layer: 0 + m_Name: Branch_LOD2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 123 + m_IsActive: 1 +--- !u!4 &4005722864868966192 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2875679375857110401} + 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: 7257659499529129619} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &691800114865048957 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2875679375857110401} + m_Mesh: {fileID: -255461491153596998, guid: 03e68ba86c9a390479bec471d38d77d2, type: 3} +--- !u!23 &648246670343201785 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2875679375857110401} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 00423bf1d35812a43aca7b507910a466, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5359103696675785573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9040205157737034373} + - component: {fileID: 1377361068899509117} + - component: {fileID: 6918250171107859647} + - component: {fileID: 3871725948618129725} + m_Layer: 0 + m_Name: Branch_Colider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 123 + m_IsActive: 0 +--- !u!4 &9040205157737034373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5359103696675785573} + 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: 7257659499529129619} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1377361068899509117 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5359103696675785573} + m_Mesh: {fileID: 3693085672007481136, guid: 03e68ba86c9a390479bec471d38d77d2, type: 3} +--- !u!23 &6918250171107859647 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5359103696675785573} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 47197316fbe35ef44a5f56e1af52a9f8, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &3871725948618129725 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5359103696675785573} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3693085672007481136, guid: 03e68ba86c9a390479bec471d38d77d2, type: 3} +--- !u!1 &6846076387428292552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2710082916543302058} + - component: {fileID: 2204122970969468455} + - component: {fileID: 4720068011836271386} + m_Layer: 0 + m_Name: Branch_LOD0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 123 + m_IsActive: 1 +--- !u!4 &2710082916543302058 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6846076387428292552} + 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: 7257659499529129619} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2204122970969468455 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6846076387428292552} + m_Mesh: {fileID: 5253388961407463442, guid: 03e68ba86c9a390479bec471d38d77d2, type: 3} +--- !u!23 &4720068011836271386 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6846076387428292552} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 00423bf1d35812a43aca7b507910a466, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7197539298788284758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6926166161010421711} + - component: {fileID: 2815535147154476497} + - component: {fileID: 2248912649001209629} + m_Layer: 0 + m_Name: Branch_LOD1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 123 + m_IsActive: 1 +--- !u!4 &6926166161010421711 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7197539298788284758} + 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: 7257659499529129619} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2815535147154476497 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7197539298788284758} + m_Mesh: {fileID: 6286432733348144391, guid: 03e68ba86c9a390479bec471d38d77d2, type: 3} +--- !u!23 &2248912649001209629 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7197539298788284758} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 00423bf1d35812a43aca7b507910a466, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab.meta b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab.meta new file mode 100644 index 000000000..914d9b78a --- /dev/null +++ b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Prefabs/BranchCover.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2008f8b1eed6cf848b24f4c873c8cf7a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat index 0d372789b..917942422 100644 --- a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat @@ -116,7 +116,7 @@ Material: - USEDISSOLVEMASK: 0 - USEFRESNEL: 1 - Vector1_473704f964214ae2bc68475022d1524b: 0 - - _AOStrength: 1.2 + - _AOStrength: 0.489 - _AlphaClip: 0 - _AlphaToMask: 0 - _BendEffect: 0 @@ -139,14 +139,14 @@ Material: - _EnvironmentReflections: 1 - _FadeDistance: 0 - _FarFadeDistance: 500 - - _FresnelPower: 2.43 + - _FresnelPower: 1.97 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _InverseFadeRange: 1 - _InverseFarFadeRange: 0.5 - _Metallic: 0 - - _NormalStrength: 3 + - _NormalStrength: 1.876 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 @@ -165,17 +165,17 @@ Material: - _ZTest: 4 - _ZWrite: 1 - _ZWriteControl: 1 - - _alpha: 0.37 + - _alpha: 0.9 m_Colors: - BaseColor: {r: 0.4245283, g: 0.4245283, b: 0.4245283, a: 0} - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} - - _AdditionalColor: {r: 16.948383, g: 6.1274548, b: 0, a: 0} + - _AdditionalColor: {r: 4.597549, g: 0.36867145, b: 0.5674405, a: 0} - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BendVector: {r: 0, g: -1, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FresnelColor: {r: 2.9960787, g: 0.15450208, b: 0, a: 0} + - _FresnelColor: {r: 2.7547174, g: 0.051819082, b: 0, a: 0} - _ScanWaveColor: {r: 0, g: 0.5949242, b: 1, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _UVMul: {r: 0.01, g: 0.04, b: 0, a: 0} diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat new file mode 100644 index 000000000..6f1889534 --- /dev/null +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat @@ -0,0 +1,196 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lever_wheel_mat_invisible 2 + m_Shader: {fileID: -6465566751694194690, guid: d078d39b162634ce8a82ea005db89ed0, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - USEFRESNEL + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - MOTIONVECTORS + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - BaseTex: + m_Texture: {fileID: 2800000, guid: 55d97f02382f8664a948d4481e42ecc2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - DissolveMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - NOSMap: + m_Texture: {fileID: 2800000, guid: e9412958850270d4995099f2338feefb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 0ce2ee197205be840a93a83be6ec6812, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: c7b792c50248fb348a205117e859a4cb, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 0ce2ee197205be840a93a83be6ec6812, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 2800000, guid: 5606ff56eb2691d49be66f1b36e4cfb3, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NOSMap: + m_Texture: {fileID: 2800000, guid: 821057944911c4042abd68e2d996de28, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 2800000, guid: 5180550cff92aa842a17841e393c5cab, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - AOStrength: 3 + - AlphaClipThreshold: 0 + - BASETEXTYPE: 1 + - DissolveNoiseScale: 25 + - EffectStrenght: 1 + - FresnelPower: 4 + - Metalness: 0.26 + - NormalStrength: 1.47 + - Smoothness: 0.19 + - USEDISSOLVE: 1 + - USEDISSOLVEMASK: 0 + - USEFRESNEL: 1 + - Vector1_473704f964214ae2bc68475022d1524b: 0 + - _AOStrength: 1.2 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BendEffect: 0 + - _BendMaxDistance: 1 + - _BendMaxHeight: 0 + - _BendMinDistance: 0.2 + - _BendMinHeight: 1 + - _Blend: 0 + - _BlendModePreserveSpecular: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EffectThreshold: 0 + - _EnvironmentReflections: 1 + - _FadeDistance: 0 + - _FarFadeDistance: 500 + - _FresnelPower: 2.43 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _InverseFadeRange: 1 + - _InverseFarFadeRange: 0.5 + - _Metallic: 0 + - _NormalStrength: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 2.44 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Surface: 1 + - _Threshold: 0 + - _USEDISTANCEFADE: 0 + - _USESCANWAVE: 0 + - _WaveTrail: 4 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 1 + - _alpha: 0.37 + m_Colors: + - BaseColor: {r: 0.4245283, g: 0.4245283, b: 0.4245283, a: 0} + - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} + - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} + - _AdditionalColor: {r: 16.948383, g: 6.1274548, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BendVector: {r: 0, g: -1, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FresnelColor: {r: 2.9960787, g: 0.15450208, b: 0, a: 0} + - _ScanWaveColor: {r: 0, g: 0.5949242, b: 1, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UVMul: {r: 0.01, g: 0.04, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7919621170187625885 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat.meta b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat.meta new file mode 100644 index 000000000..ba8d28c3f --- /dev/null +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a7d1e724a0dc31a44affc476c0ee3994 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index 551889b714cee27d4f06be32dddb182d3a58252c..9382b9d78c10d3542f03326fb051bd80ad75c6a5 100644 GIT binary patch delta 3092 zcmYM$30M?I769FqIRdU7Hf48&vR$z6mqRz9Kx$XWn@cIf3U5lJNRusQuZ@z^b6 z48l1^778Czqk6jQOzR?&q>bxN1m@>Owh*Za@_r?>t)9q?7F|;x?yo3(hQSbYnAdYn zlt`V2TuJ5!i{e}QL|~xcrgSaSi=VQ2v=VbN<>LxJR21*W`{c>qo))C}pkI|oO*Q!Q zSmz0Yn3E?@P~_inPy^qVx;Bmn70TV^t*Gx1;|k?u#j~kjD&(gcjKhWXfV^8_3c8BJ zToNXg#R+SPyjS6g3qP>(*h;m(uwIl8DAGM1RjH27vDV691O^`92`2CYGg!bI6lexM z;0u0W1%GG`0nh>hAqaw@CA0z?gg_{SK{&LA2xtS5&=%f-cF-O=Ku72VouLbKg(!Fz zxkajIh?mewiz8!FB(T`)p+ayd>P$AS!0ttC_4|9YeV- zCpSctrP;5tAdA$rvf9ON4c?$-N#bO>{VGcC>ptj@u73S@Mu%0|A5Z^sSS_YcsR){D$aVy3^9E=rlE5`lf zs7Y_YMzbMN5u^Kze~m zs@D{W_=ZY#h0bi|EvnSzl9}@=HN$`#1A(jR8?IETMxDjNFCCA!@~+kDM<%SI#cZ}% zEM~s7T3v)XiWZA@MCdiusnyZ!?xFCSx?Jlz^m^lW;dM1bZ`J}eYPtyp?TSbkbZ3pa zz)P!Z5sAz^;)d$f0%!*uvGazSu5}fDQ%z^?Fe*E4s>_+#!)!zfZ+A;w>}fVLFAF}+ zeD5uFzQydm^a#pY=$+eYnorZQX03M*S+A4$sbIU6m)uq-S>0_C8q8*IFAuYahlh6N zx0;9WQMKv_bc^X=GG@NLR&{ElG*!dzsEa)QSKD?+U5u%U;Jd1)q|G_9PR(?m_MW=N z^B3*zsXFbvJJze|+SHJ}uU<`x63;!Cek}3K{mj5i>U{mRx>@GU3I-Z@UUYmbj{2;e zp|*JVPz<$AU_a`Tiul<23E{dPwK>lE3GfG)D4g|^Qit%8j7bLhCcDk9ix-_7|74cy ztd2co4eS~F1+iB>9KSN3D#RYK=j=6mg?KG17r*y)ykI`n>@G5YWiQe83;HM*{~Cz6 z-!)`EL+mkns$(_mGAk2rM>?Ldup5XyMQ%OfcW^`vt6~?~dH4SXhJPNnc5(pky4JBv zoR4=zF#l>~KVc7$Ux(6TlI*)-tu2D_xqf!h-&`-#vLM>X@ifY4<$+;b26 z5W`*(UQR5BQpPITefAqp`ySe_2+MNED`vTjZeC+C>e)?JA(T~Gtc+D7=PtX-D%fS= zvla`?o9%KKq_P~#Mh8rWDey-~fT=JIro#;Q2om8>kOVVf7R-h@kPIm>7v{lyNQE?5 z01Lqhi-cw4;sJ;BWAsLA{{Nkr^7qV*}l)Y?^{bhbQgOjtOCXmxaBd0h%o z%Nvd5*#++7>0EcBh#Fz)rX8d_Z)}_~k!a#%qMqA{=Aq{T&_>Hz)_BlkJQbH^3DW@A z8KrmM&xxW1-p5TnYl%^K=r=3F)MgT$4k9{&cY8?;kpmrSQ;pw4)aE+3O&c7*Bg&1L zV%s=Z7e(^oQxkK8o3}bav}9J}P{|2+)Vw4LyuC_jZXuSFV-^fJ`&$F#yXrOYJVm_s%?_@!hSda2cZbQgF|o_{ssb$!1p4r^ytN0TL^yK zwfuyr!_P#$e;}HqB27ZK}M0@AY4fVcluw>DTh^B8M8hL=ovy_LOG=_+w zjM5l#3t@onxmU>7S6$W zp__5xDw#t$u=Pw-qZODX>@+G{?Z tDKiiofg4q_`vz+7vT>qdc=>K`oia%Dn^?YAuamoJ6Ac#fl=Ana{{oiyISK#( delta 3060 zcmX}u2Urwm8VB%qc6WBR0JBsD6c7;=8;BZDEUXG@^b~_bL>9ze5Tl@LA-W=-#1an0 z@FrG_<&1h!EcdC{^-N*`^ei#NJ;`HB)~wB@QWc6kGX6KE-Q_8 zaN>p(lW?cVLJg86WQYX4zyL@^<{o@1%+g8ZWy^cih|Wf$AOy@{1B!;85D&<$w;m_* zW*~2*KQcLxU$6A{!|&Y*jX-i+F3b+{=U?iU2Z?Em(*t|C(r;x`EMM!FYpE*P{9Gd;0OK?0D%w$O`s_RLkNUIGiVNB5DpR00wSR$L_sTv zhStyq+CmJp1O5IwKu72Vu@DEHAs)IwSLg=sL3j8Q^ne8D3B8~<^brB~6F07qEAaMm z*>{uDgil8LnZ%VG=l6=*3>~QtEq#Q9;GOU7(=!>KhgI>fM^Bc4cdJlQE! z^y)n#zuq2$r}L9c6d3FjRqeIP1Zl9yovekb(j>8Lj%Lr2y!f+gS|JD3qy=)j>sk(% zJ<->`7T$JSD=?6OBkyPh4NZ~R%3JSf3l+1)s!xAzdsmxll`V?h+p6Gl=Ur{4x4mJq z8?B0Lx0<=lJuTn2p-qEqw_CluEV9uc@u^T}0H3_4WdtMwD ziwQUMzBa`A?*5Ft<-X>&nj5as0!Kd3=2#jElWgG4545=k3yIJlHLJu&9{Txk=ZD%X zBUUK>>Y=s(Jzy1WA87`xZ`{64E0D?C+glR5>$J&n!r@4hB~kn7hudU!tVuF)X+m0a zuGpD2wRlii8hj`Qg^g6cF+48f59&rn;{RfI-AG7>QNmr9kvEWQ>oUy7YsyXWtb^-U zh3~g=c}dsAi>|Jp6|Q}eVN+_A8vLro%U-T$NP3!KvDPY=l#BXLyiRIJ)ayVZOWR%k z!ZOtLSdp(NSCm?QFxwSuyoAW`lFTL?TjJU-E~dGn6r&!Ls$I=FF*(!1HnYo%Ba&TP zxnj*Iv#8EO7O5daOOCB~nRv$IOtXlX=(?`3`%bzKr%Xt9aO@kGO@vK%{h)A4ZhAAl zDzgZ2yB;a!U%P@tz(Q9&A`{ZR*s6g$dYkO^5Z z8nR&wjD>M99wxv^QL7P`YBL^FpF9T?oW z>*yQI<&MG@k3zu43g z&Jy+c0vqa5qTu~R>8YrYeXsWOH(%&NG<_9^jUCX0qiW2H#O72_C$(G5QIx8}g8K?> z>+M6#8O-rF*!d?C9cunZazpq8R>7=wJgh#p3D;guGKm)BJVIqDKRJN^o9FSeJ;h`> zi|L%%MHuou`6_0Nd$DJ!xxY#j6(bBqo~f#j-q5=vqMMk%+VfoXOD!Q%kV`+zgRq92 z6AQoeoL9R=-69HmfbWJU*bbiJ$sQy4KjcC+?at$V&*6gueIL1_p={%yvtr>s&#x-( zq~YLIMrS~A>1huvf^_R>bimk@p_Y%d%@u}nH1Wr6ygkot`tVAcR!&|5!YI}&N<65Ez z*2ZFo6NoxoK@t6h|HPf5{F>`uLeYG4@k)nujmLC6>0cffXyWYD#U}A2tE#6WC3Ez| zs`$X)8cW&k5ou$IO0jguj1nu@;Ih(5{2x%D)+ zIAIPKgIwn?7=ywwaRTn+t6(nC`qo7Df1^ncKilUF69co)?>72`Ji-^wU3}$YDz#r# zY#4tYF2F@$7=P*c5nBuNTJmzDDT~CLuEfRy>51*tR4~Y7R>b!be(@jL`RTR$< zQ`MUN3HFche4~kcuyC;C^b6K|G*zq_T(iT+;OH-UkE+>eG??S{8x0k5R?U0T{{f= duration) + { + isShaking = false; + mainCamera.localPosition -= lastShakeOffset; // Resetujemy shake + lastShakeOffset = Vector3.zero; + } } } -} \ No newline at end of file +} diff --git a/Assets/testy/Marcin/TesttRenderer.asset b/Assets/testy/Marcin/TesttRenderer.asset index c380b3186..b3f9e39b5 100644 --- a/Assets/testy/Marcin/TesttRenderer.asset +++ b/Assets/testy/Marcin/TesttRenderer.asset @@ -348,8 +348,8 @@ MonoBehaviour: AfterOpaque: 0 Source: 0 NormalSamples: 0 - Intensity: 45.09 - DirectLightingStrength: 0.444 + Intensity: 6.75 + DirectLightingStrength: 0.428 Radius: 0.2 Samples: 2 BlurQuality: 2