Compare commits

...

2 Commits

Author SHA1 Message Date
Ali b5cae58199 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 13:31:35 +01:00
Ali 62de2a91d7 levs 1 2 textures 2021-01-31 13:31:11 +01:00
2 changed files with 223 additions and 35 deletions

View File

@ -1362,7 +1362,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 84f36545290558b4999deaf40861d198, type: 2}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

View File

@ -323,7 +323,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: bf4d0317d916c494f869f9d8d88aa680, type: 2}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -416,7 +416,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -740,7 +740,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 63df64019e65f7c4ab13dda27a395b1d, type: 2}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -833,7 +833,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -926,7 +926,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1019,7 +1019,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1112,7 +1112,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: bef0a68cde57f9446973c9f63186f13d, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1205,7 +1205,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1298,7 +1298,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: bef0a68cde57f9446973c9f63186f13d, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1391,7 +1391,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9188b3e8b3ae59b46a111e8a47a13a00, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1577,7 +1577,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -1670,7 +1670,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -2115,6 +2115,99 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &578153793
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 578153794}
- component: {fileID: 578153797}
- component: {fileID: 578153796}
- component: {fileID: 578153795}
m_Layer: 0
m_Name: wall (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &578153794
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578153793}
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: -199.56, y: -14.81, z: -3.2}
m_LocalScale: {x: 10.351837, y: 4.1650596, z: 7.333479}
m_Children: []
m_Father: {fileID: 634512923}
m_RootOrder: 54
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!65 &578153795
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578153793}
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}
--- !u!23 &578153796
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578153793}
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_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, 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
--- !u!33 &578153797
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578153793}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &592012780
GameObject:
m_ObjectHideFlags: 0
@ -2179,7 +2272,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -2288,8 +2381,10 @@ Transform:
- {fileID: 886314376}
- {fileID: 592012781}
- {fileID: 1353537199}
- {fileID: 1461628884}
- {fileID: 578153794}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &643948503
PrefabInstance:
@ -2493,7 +2588,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -2817,7 +2912,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -3444,7 +3539,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -3537,7 +3632,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9188b3e8b3ae59b46a111e8a47a13a00, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -3954,7 +4049,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 3f2d233aa8a002c4b82838100e97bc2d, type: 2}
- {fileID: 2100000, guid: 382cda4fd75cc1043bb28f8256028de0, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -4047,7 +4142,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -4140,7 +4235,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -4233,7 +4328,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -4488,7 +4583,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 3f2d233aa8a002c4b82838100e97bc2d, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -4610,6 +4705,99 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1457297064}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1461628883
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1461628884}
- component: {fileID: 1461628887}
- component: {fileID: 1461628886}
- component: {fileID: 1461628885}
m_Layer: 0
m_Name: floor (11)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1461628884
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1461628883}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -183.58, y: -16.6, z: -2.8053}
m_LocalScale: {x: 3.294363, y: 0.71362835, z: 7.333479}
m_Children: []
m_Father: {fileID: 634512923}
m_RootOrder: 53
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1461628885
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1461628883}
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}
--- !u!23 &1461628886
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1461628883}
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_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
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
--- !u!33 &1461628887
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1461628883}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1465368452
GameObject:
m_ObjectHideFlags: 0
@ -4860,7 +5048,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -4953,7 +5141,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 3f2d233aa8a002c4b82838100e97bc2d, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5046,7 +5234,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5208,7 +5396,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f9ab68b7517ed34488cdbbbf976b7ffd, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5394,7 +5582,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5487,7 +5675,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 521403030cac0b84e8740f04dc03b26a, type: 2}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5580,7 +5768,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5766,7 +5954,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9188b3e8b3ae59b46a111e8a47a13a00, type: 2}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5859,7 +6047,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5cd89167416b68048802338ad9219ab9, type: 2}
- {fileID: 8748892135801146194, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -5952,7 +6140,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 0a366e5a36fbbc849ba636dde51beea3, type: 2}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -6300,7 +6488,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2476790706971504607, guid: 8f528d04933af024398be82cbc1d5cac, type: 3}
- {fileID: 2100000, guid: 7843873bd9c3b8043a0ee72ad1c16c27, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0