Merge branch 'main' into feature/blink-rework

game/Assets/Materials/Glitch/Glitch_Blend_Mat.mat

@@ -117,7 +117,7 @@ Material:
     - _QueueOffset: 0
     - _RadiusWithDistance: 0.003
     - _ReceiveShadows: 1
-    - _Sample: 0.05
+    - _Sample: 0.01789935
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1

game/Assets/Prefabs/Environment/BigEntrance.prefab.meta

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

game/Assets/Prefabs/Environment/Foliage.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 41722076adaadb74fb9381c20c40e6c9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/Prefabs/Environment/Foliage/Tree.prefab

@@ -0,0 +1,224 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1987555662840858142
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1987555662840858141}
+  - component: {fileID: 1987555662840858138}
+  - component: {fileID: 1987555662840858139}
+  - component: {fileID: 1987555662840858140}
+  m_Layer: 0
+  m_Name: Sphere
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1987555662840858141
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555662840858142}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 8, z: 0}
+  m_LocalScale: {x: 4, y: 4, z: 4}
+  m_Children: []
+  m_Father: {fileID: 1987555663557151206}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1987555662840858138
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555662840858142}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1987555662840858139
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555662840858142}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: eb636cd5856d1094d9c404118357f54a, 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!135 &1987555662840858140
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555662840858142}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &1987555663557151207
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1987555663557151206}
+  m_Layer: 0
+  m_Name: Tree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1987555663557151206
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555663557151207}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -16.33665, y: -0.61, z: 141.67}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1987555662840858141}
+  - {fileID: 1987555663787371870}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1987555663787371871
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1987555663787371870}
+  - component: {fileID: 1987555663787371867}
+  - component: {fileID: 1987555663787371868}
+  - component: {fileID: 1987555663787371869}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1987555663787371870
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555663787371871}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 4.02, z: 0}
+  m_LocalScale: {x: 1, y: 9.4123, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1987555663557151206}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1987555663787371867
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555663787371871}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1987555663787371868
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555663787371871}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &1987555663787371869
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1987555663787371871}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}

game/Assets/Prefabs/Environment/Foliage/Tree.prefab.meta

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

game/Assets/Scenes/Main.unity

@@ -1280,19 +1280,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.7449414
+      value: 0.7449385
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.65121967
+      value: -0.65121716
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.13206832
+      value: 0.13209218
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0.059441224
+      value: 0.059451986
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_RendererIndex
@@ -1316,19 +1316,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.16395633
+      value: -0.1639763
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.09869421
+      value: 0.098706245
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.8409189
+      value: 0.840915
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0.50619483
+      value: 0.5061925
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_Name
@@ -1344,7 +1344,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -30.3
+      value: -19
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalPosition.y
@@ -1352,7 +1352,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 114.5
+      value: 90.8
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.w
@@ -1508,19 +1508,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.84453773
+      value: 0.84453714
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.53227365
+      value: -0.5322731
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.056581475
+      value: 0.056594577
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0.0154718105
+      value: 0.015475392
       objectReference: {fileID: 0}
     - target: {fileID: 4676633833077728950, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_XAxis.Value
@@ -1564,19 +1564,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.16395633
+      value: -0.1639763
       objectReference: {fileID: 0}
     - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.09869421
+      value: 0.098706245
       objectReference: {fileID: 0}
     - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.8409189
+      value: 0.840915
       objectReference: {fileID: 0}
     - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0.50619483
+      value: 0.5061925
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
@@ -2781,31 +2781,31 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -30.26
+      value: -21.4
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.91
+      value: -0.9
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 114.21
+      value: 87.5
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.99669254
+      value: 0.9766723
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.08126568
+      value: -0.21473534
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2813,7 +2813,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: -9.323
+      value: -24.8
       objectReference: {fileID: 0}
     - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z