Merge branch 'feat/dark_sim' of https://git.robofob.ru/sirius/sirius_unity_sim into feat/dark_sim

feat/dark_sim
Leushina Vlada 4 weeks ago
commit 4a9f3d45dc

@ -8438,14 +8438,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 75796153} m_GameObject: {fileID: 75796153}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 0 m_Type: 0
m_Color: {r: 1, g: 0.9946615, b: 0.8254717, a: 1} m_Color: {r: 1, g: 0.9946615, b: 0.8254717, a: 1}
m_Intensity: 1 m_Intensity: 1
m_Range: 10 m_Range: 30
m_SpotAngle: 70 m_SpotAngle: 70
m_InnerSpotAngle: 1 m_InnerSpotAngle: 1
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 1 m_Type: 1
m_Resolution: -1 m_Resolution: -1
@ -20639,14 +20639,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 190349998} m_GameObject: {fileID: 190349998}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.7 m_Intensity: 0.7
m_Range: 80 m_Range: 80
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -22056,14 +22056,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 202452458} m_GameObject: {fileID: 202452458}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.7 m_Intensity: 0.7
m_Range: 100 m_Range: 100
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -25711,14 +25711,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 232458814} m_GameObject: {fileID: 232458814}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1 m_Intensity: 1
m_Range: 60 m_Range: 60
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -26612,14 +26612,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 238935305} m_GameObject: {fileID: 238935305}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.7 m_Intensity: 0.7
m_Range: 50 m_Range: 50
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -30686,14 +30686,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 274867499} m_GameObject: {fileID: 274867499}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1 m_Intensity: 1
m_Range: 80 m_Range: 80
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -44819,14 +44819,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 393229417} m_GameObject: {fileID: 393229417}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1 m_Intensity: 1
m_Range: 80 m_Range: 80
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -55136,14 +55136,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 479326425} m_GameObject: {fileID: 479326425}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1 m_Intensity: 1
m_Range: 60 m_Range: 60
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -57516,7 +57516,6 @@ Terrain:
m_AllowAutoConnect: 1 m_AllowAutoConnect: 1
m_EnableHeightmapRayTracing: 1 m_EnableHeightmapRayTracing: 1
m_EnableTreesAndDetailsRayTracing: 0 m_EnableTreesAndDetailsRayTracing: 0
m_EnableHeightmapLODFrustumCulling: 1
m_TreeMotionVectorModeOverride: 3 m_TreeMotionVectorModeOverride: 3
--- !u!4 &500605641 --- !u!4 &500605641
Transform: Transform:
@ -61247,14 +61246,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 526050772} m_GameObject: {fileID: 526050772}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 0 m_Type: 0
m_Color: {r: 0.6156863, g: 0.6901961, b: 0.78039217, a: 1} m_Color: {r: 0.6156863, g: 0.6901961, b: 0.78039217, a: 1}
m_Intensity: 0.7 m_Intensity: 0.7
m_Range: 1000 m_Range: 1000
m_SpotAngle: 60 m_SpotAngle: 60
m_InnerSpotAngle: 12 m_InnerSpotAngle: 12
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 2 m_Type: 2
m_Resolution: -1 m_Resolution: -1
@ -111313,6 +111312,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1 m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1 m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -111334,9 +111335,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &993688091 --- !u!33 &993688091
MeshFilter: MeshFilter:
@ -124432,14 +124435,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1113175257} m_GameObject: {fileID: 1113175257}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.7 m_Intensity: 0.7
m_Range: 70 m_Range: 70
m_SpotAngle: 77 m_SpotAngle: 77
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 0 m_Type: 0
m_Resolution: -1 m_Resolution: -1
@ -166073,6 +166076,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1 m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1 m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -166094,9 +166099,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1514552604 --- !u!33 &1514552604
MeshFilter: MeshFilter:
@ -174999,6 +175006,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1 m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1 m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -175020,9 +175029,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1594045262 --- !u!33 &1594045262
MeshFilter: MeshFilter:
@ -180313,14 +180324,14 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1643870768} m_GameObject: {fileID: 1643870768}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 11 serializedVersion: 12
m_Type: 0 m_Type: 0
m_Color: {r: 1, g: 0.9946615, b: 0.8254717, a: 1} m_Color: {r: 1, g: 0.9946615, b: 0.8254717, a: 1}
m_Intensity: 1 m_Intensity: 1
m_Range: 10 m_Range: 30
m_SpotAngle: 70 m_SpotAngle: 70
m_InnerSpotAngle: 1 m_InnerSpotAngle: 1
m_CookieSize: 10 m_CookieSize2D: {x: 10, y: 10}
m_Shadows: m_Shadows:
m_Type: 1 m_Type: 1
m_Resolution: -1 m_Resolution: -1
@ -186224,6 +186235,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1 m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1 m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -186245,9 +186258,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1697588534 --- !u!33 &1697588534
MeshFilter: MeshFilter:
@ -220490,6 +220505,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1 m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1 m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -220511,9 +220528,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2011357769 --- !u!33 &2011357769
MeshFilter: MeshFilter:
@ -226333,6 +226352,8 @@ MeshRenderer:
m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1 m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1 m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -226354,9 +226375,11 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0} m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2069775186 --- !u!33 &2069775186
MeshFilter: MeshFilter:

Loading…
Cancel
Save