diff --git a/Assets/Characters/AlienCharacter/Materials/SwordRed_M.mat b/Assets/Characters/AlienCharacter/Materials/SwordRed_M.mat index 6761179..ec7eb7a 100644 --- a/Assets/Characters/AlienCharacter/Materials/SwordRed_M.mat +++ b/Assets/Characters/AlienCharacter/Materials/SwordRed_M.mat @@ -64,7 +64,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 62b568aa9f5a32f429dedc8576484d2c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab index a47c697..f67a885 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/CatWalk Stairs Wide.prefab @@ -25,8 +25,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5471734309729208620} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.002, y: 4.25, z: 3.007} - m_LocalScale: {x: 2.0164, y: 0.52, z: 6.0696} + m_LocalPosition: {x: 2.011, y: 5.13, z: 0.585} + m_LocalScale: {x: 0.13706012, y: 0.6983065, z: 1.1825931} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5548154041112411600} @@ -78,6 +78,7 @@ Transform: - {fileID: 5548154041112411604} - {fileID: 5910955290905813950} - {fileID: 4109190533743521814} + - {fileID: 304283705997399579} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 0} @@ -420,3 +421,48 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8293897056650551903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 304283705997399579} + - component: {fileID: 2554966023328353444} + m_Layer: 0 + m_Name: collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &304283705997399579 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8293897056650551903} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.011, y: 5.13, z: 5.415} + m_LocalScale: {x: 0.13706012, y: 0.6983065, z: 1.1825931} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5548154041112411600} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2554966023328353444 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8293897056650551903} + 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} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab index b4b1cf3..2c5c278 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Catwalk Stairs.prefab @@ -417,6 +417,98 @@ Transform: - {fileID: 3127370351060509642} - {fileID: 3522318549388432330} - {fileID: 6344560399686966151} + - {fileID: 8782407804057266452} + - {fileID: 1888890951447584915} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7460239321945548495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1888890951447584915} + - component: {fileID: 2528183225739539148} + m_Layer: 0 + m_Name: collider (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1888890951447584915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7460239321945548495} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000029504295} + m_LocalPosition: {x: 2.0110247, y: 5.13, z: 0.983} + m_LocalScale: {x: 0.13706, y: 0.69830996, z: 1.9446129} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7515332717815086903} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!65 &2528183225739539148 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7460239321945548495} + 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!1 &8325685179414279430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8782407804057266452} + - component: {fileID: 9000639615967787093} + m_Layer: 0 + m_Name: collider (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8782407804057266452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8325685179414279430} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000029504295} + m_LocalPosition: {x: 2.011, y: 5.13, z: 5.039} + m_LocalScale: {x: 0.13706, y: 0.69830996, z: 1.9066899} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7515332717815086903} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!65 &9000639615967787093 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8325685179414279430} + 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} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs Wide.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs Wide.prefab index bab0c46..b4d34cf 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs Wide.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs Wide.prefab @@ -24,11 +24,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4410478108093735952} m_LocalRotation: {x: -0, y: -0.70710576, z: -0, w: 0.70710784} - m_LocalPosition: {x: 53.9, y: 10, z: -10.3} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4410478108094232628} - {fileID: 4410478108094232630} + - {fileID: 1907863116634385597} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90.00001, z: 0} @@ -60,6 +62,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 4410478108094232624} m_RootOrder: 0 @@ -83,9 +86,12 @@ MeshRenderer: 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_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -97,6 +103,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -109,6 +116,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4410478108093735958 GameObject: m_ObjectHideFlags: 0 @@ -138,6 +146,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 4410478108094232624} m_RootOrder: 1 @@ -161,9 +170,12 @@ MeshRenderer: 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_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -175,6 +187,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -187,6 +200,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &6272120501050589157 MeshCollider: m_ObjectHideFlags: 0 @@ -197,7 +211,52 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 2a67f3a3d4c67e54dbc646451a36a15f, type: 3} +--- !u!1 &6970533701162605766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1907863116634385597} + - component: {fileID: 8163524379666239848} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1907863116634385597 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6970533701162605766} + m_LocalRotation: {x: 0.0000002533197, y: 0.0000048875804, z: -0.4999994, w: -0.8660257} + m_LocalPosition: {x: 0.986, y: 0.549, z: 2.996} + m_LocalScale: {x: 0.32546666, y: 2.32957, z: 3.524762} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4410478108094232624} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 60} +--- !u!65 &8163524379666239848 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6970533701162605766} + 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} diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs.prefab index 3756b83..5576a36 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Structures/Catwalk/Short Stairs.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 1024725969411930292} m_RootOrder: 0 @@ -51,9 +52,12 @@ MeshRenderer: 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_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -65,6 +69,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -77,6 +82,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1024725969412154514 GameObject: m_ObjectHideFlags: 0 @@ -106,6 +112,7 @@ Transform: m_LocalRotation: {x: 0.000000021855694, 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: 1024725969411930292} m_RootOrder: 1 @@ -129,9 +136,12 @@ MeshRenderer: 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_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -143,6 +153,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -155,6 +166,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &5253236508061737775 MeshCollider: m_ObjectHideFlags: 0 @@ -165,9 +177,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 66efbdba25775854a96fa31f4e19368f, type: 3} --- !u!1 &1024725969412154516 GameObject: @@ -193,11 +205,58 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1024725969412154516} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.0000029504295} - m_LocalPosition: {x: 42, y: 9, z: 17.9} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1024725969411930288} - {fileID: 1024725969411930290} + - {fileID: 3673949041147361070} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180.00002, z: 0} +--- !u!1 &3798645932307331038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3673949041147361070} + - component: {fileID: 6130294617358776122} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3673949041147361070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3798645932307331038} + m_LocalRotation: {x: 0.0000029504245, y: 2.2737368e-13, z: 0.49999917, w: 0.8660259} + m_LocalPosition: {x: 0.991, y: 0.494, z: 3} + m_LocalScale: {x: 0.40041, y: 2.329568, z: 1.9386} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1024725969411930292} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 60} +--- !u!65 &6130294617358776122 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3798645932307331038} + 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} diff --git a/Assets/Prefabs/Environment/CubeEater.prefab b/Assets/Prefabs/Environment/CubeEater.prefab new file mode 100644 index 0000000..522fa10 --- /dev/null +++ b/Assets/Prefabs/Environment/CubeEater.prefab @@ -0,0 +1,196 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1115504609355437225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115504609355738475} + - component: {fileID: 1115504609352307133} + - component: {fileID: 1115504609353332907} + m_Layer: 0 + m_Name: Fan_01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1115504609355738475 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609355437225} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: -8.122036e-15, z: 0.00000018581053} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1115504609355747467} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1115504609352307133 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609355437225} + m_Mesh: {fileID: 4300000, guid: 64d2cd6749bca4f3892daf258e7c68a2, type: 3} +--- !u!23 &1115504609353332907 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609355437225} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 34e48a3ce50b34c339d8fc61e309e31d, 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: 0 + 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 &1115504609355440805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115504609355747467} + m_Layer: 0 + m_Name: Fan_01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &1115504609355747467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609355440805} + m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0.308, z: 0} + m_LocalScale: {x: 1.9270203, y: 1.9270203, z: 1.9270203} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1115504609355738475} + m_Father: {fileID: 1115504609363592119} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} +--- !u!1 &1115504609363592120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115504609363592119} + - component: {fileID: 1115504609363592118} + - component: {fileID: 1115504609363592117} + - component: {fileID: 1115504609363592116} + m_Layer: 0 + m_Name: CubeEater + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1115504609363592119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609363592120} + 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: + - {fileID: 1115504609355747467} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1115504609363592118 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609363592120} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.21, y: 1.74, z: 2.21} + m_Center: {x: 0, y: 0.22, z: 0} +--- !u!114 &1115504609363592117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609363592120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd9ed3cef6cbe7d42898fac9a49facd3, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 +--- !u!114 &1115504609363592116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115504609363592120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneId: 0 + serverOnly: 0 + visible: 0 + m_AssetId: 95026c01f0003f9459c443f53b1eb516 + hasSpawned: 0 diff --git a/Assets/Prefabs/Environment/CubeEater.prefab.meta b/Assets/Prefabs/Environment/CubeEater.prefab.meta new file mode 100644 index 0000000..7f3ddcb --- /dev/null +++ b/Assets/Prefabs/Environment/CubeEater.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 95026c01f0003f9459c443f53b1eb516 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment/CubeForEat.prefab b/Assets/Prefabs/Environment/CubeForEat.prefab new file mode 100644 index 0000000..229f29d --- /dev/null +++ b/Assets/Prefabs/Environment/CubeForEat.prefab @@ -0,0 +1,429 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &622025399336259391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6875673965032713355} + m_Layer: 0 + m_Name: RightHandPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6875673965032713355 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 622025399336259391} + m_LocalRotation: {x: -0.020219773, y: -0.7067699, z: 0.7068653, w: 0.020222504} + m_LocalPosition: {x: 0.3555999, y: 0, z: 0} + m_LocalScale: {x: 0.6999999, y: 0.7, z: 0.6999999} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8040387065364850832} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 86.723, y: -89.865, z: 90.135} +--- !u!1 &2352355441573259686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8040387065364850832} + - component: {fileID: 3263265459545684793} + - component: {fileID: 957268803896765688} + - component: {fileID: 5548888651989132254} + - component: {fileID: 6479628441846702289} + - component: {fileID: 2673253594858415260} + - component: {fileID: 125724200648987588} + - component: {fileID: 2882785016289707988} + - component: {fileID: -2128681185880880537} + m_Layer: 0 + m_Name: CubeForEat + m_TagString: Prop + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8040387065364850832 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + 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: + - {fileID: 7963603851784520173} + - {fileID: 79024357367539290} + - {fileID: 6875673965032713355} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &3263265459545684793 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 1 +--- !u!114 &957268803896765688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneId: 0 + serverOnly: 0 + visible: 0 + m_AssetId: fb20dc5a22e38934dbd64e9158977eec + hasSpawned: 0 +--- !u!114 &5548888651989132254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.02 + clientAuthority: 0 + sendInterval: 0.01 + syncPosition: 1 + syncRotation: 1 + syncScale: 0 + interpolatePosition: 1 + interpolateRotation: 1 + interpolateScale: 0 + bufferTimeMultiplier: 1 + bufferSizeLimit: 64 + catchupThreshold: 4 + catchupMultiplier: 0.1 + onlySyncOnChange: 1 + bufferResetMultiplier: 5 + positionSensitivity: 0.01 + rotationSensitivity: 0.01 + scaleSensitivity: 0.01 + showGizmos: 0 + showOverlay: 0 + overlayColor: {r: 0, g: 0, b: 0, a: 0.5} +--- !u!114 &6479628441846702289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83392ae5c1b731446909f252fd494ae4, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0 + target: {fileID: 5416187376414254737, guid: 00f8dcb9ddb24214ea8c93f5ce05f918, type: 3} + clientAuthority: 0 + syncVelocity: 1 + clearVelocity: 1 + velocitySensitivity: 0.1 + syncAngularVelocity: 1 + clearAngularVelocity: 1 + angularVelocitySensitivity: 0.1 +--- !u!114 &2673253594858415260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c302decb53db0e3498b0ef7fe86f1dda, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + leftHandPos: {fileID: 79024357367539290} + rightHandPos: {fileID: 6875673965032713355} + Original: 0 +--- !u!65 &125724200648987588 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.7, y: 0.7, z: 0.7} + m_Center: {x: 0, y: 0, z: 0} +--- !u!208 &2882785016289707988 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.35, y: 0.35, z: 0.35} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 0 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!114 &-2128681185880880537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352355441573259686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c1eacd87abe804d954e95752047fa2, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0 + _player: {fileID: 0} +--- !u!1 &4771268620797002463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 79024357367539290} + m_Layer: 0 + m_Name: LeftHandPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &79024357367539290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4771268620797002463} + m_LocalRotation: {x: 0.15965319, y: -0.6888964, z: -0.67855215, w: -0.19874507} + m_LocalPosition: {x: -0.35559988, y: 0, z: 0} + m_LocalScale: {x: 0.70000005, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8040387065364850832} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 266.723, y: -89.86499, z: 240.492} +--- !u!1001 &7570233214266107398 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8040387065364850832} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalPosition.x + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalPosition.y + value: -0.35 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalPosition.z + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5693431221397475390, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_Name + value: Wooden Box 2 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} +--- !u!1 &7336283726327634775 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + m_PrefabInstance: {fileID: 7570233214266107398} + m_PrefabAsset: {fileID: 0} +--- !u!108 &1415158865099482888 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7336283726327634775} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 0, b: 0.17609787, a: 1} + m_Intensity: 1 + m_Range: 2.3500004 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &4570877452874949823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7336283726327634775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 0 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!4 &7963603851784520173 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + m_PrefabInstance: {fileID: 7570233214266107398} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Environment/CubeForEat.prefab.meta b/Assets/Prefabs/Environment/CubeForEat.prefab.meta new file mode 100644 index 0000000..84bbe70 --- /dev/null +++ b/Assets/Prefabs/Environment/CubeForEat.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 07dfe65296154e14dbaf7036089cb26e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Environment/Energy/CellSpawner.prefab b/Assets/Prefabs/Environment/Energy/CellSpawner.prefab index b8eb936..c1195d3 100644 --- a/Assets/Prefabs/Environment/Energy/CellSpawner.prefab +++ b/Assets/Prefabs/Environment/Energy/CellSpawner.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 12405174128839370} - component: {fileID: 3955688229206041311} - component: {fileID: 1110170995649291229} + - component: {fileID: 1255249278626783645} m_Layer: 0 m_Name: CellSpawner m_TagString: Untagged @@ -44,7 +45,7 @@ MeshCollider: m_GameObject: {fileID: 6830579541325509221} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -82,6 +83,20 @@ MonoBehaviour: syncInterval: 0.1 prefab: {fileID: 1616436523348048, guid: 88afe7a6f7a2e7945b0460c0f3bf5882, type: 3} spawnTime: 15 +--- !u!136 &1255249278626783645 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6830579541325509221} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.67 + m_Height: 1.55 + m_Direction: 1 + m_Center: {x: 0, y: 0.51, z: 0} --- !u!1001 &7886777280229935224 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Procedural/Room.prefab b/Assets/Prefabs/Procedural/Room.prefab index fd3fbcc..a299f7f 100644 --- a/Assets/Prefabs/Procedural/Room.prefab +++ b/Assets/Prefabs/Procedural/Room.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 8759162998728815380} - component: {fileID: 7005080718198834357} - component: {fileID: 4822851902742051790} + - component: {fileID: 8203218961067133613} m_Layer: 0 m_Name: Room m_TagString: Untagged @@ -77,6 +78,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2560266d7fb936f4f93c7ce13d1a9ca4, type: 3} m_Name: m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 DoorU: {fileID: 8981463295867416060} DoorD: {fileID: 4630401247181087312} DoorL: {fileID: 6115607114144909299} @@ -150,6 +153,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Surface: {fileID: 7005080718198834357} +--- !u!114 &8203218961067133613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3642525324054568589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: daaa736aba9a2bf409c32f54eb4f076a, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + prefab: {fileID: 6830579541325509221, guid: 6a3d7d21ac1b5f14683645eb9e411130, type: 3} --- !u!1001 &399836379701063749 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Procedural/Room_7.prefab b/Assets/Prefabs/Procedural/Room_7.prefab new file mode 100644 index 0000000..dc67f11 --- /dev/null +++ b/Assets/Prefabs/Procedural/Room_7.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6603882003095418594 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3642525324054568589, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_Name + value: Room + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} diff --git a/Assets/Prefabs/Procedural/Room_7.prefab.meta b/Assets/Prefabs/Procedural/Room_7.prefab.meta new file mode 100644 index 0000000..14a9246 --- /dev/null +++ b/Assets/Prefabs/Procedural/Room_7.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 127ed3f8fb2f7db45a445238628067a8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/NewMenu.unity b/Assets/Scenes/NewMenu.unity index fe3e441..4d6b0ea 100644 --- a/Assets/Scenes/NewMenu.unity +++ b/Assets/Scenes/NewMenu.unity @@ -503,9 +503,10 @@ MonoBehaviour: nicknameInput: {fileID: 954163050} MaxPlayersInput: {fileID: 1829637640} MaxMonstersInput: {fileID: 1290001470} - LevelSizeGo: {fileID: 1780349282} + LevelSizeGo: {fileID: 285134965} LevelSize: {fileID: 1780349284} LevelSelect: {fileID: 1167925104} + EnergySpawnChanceInput: {fileID: 1903304983} menu: {fileID: 1810681709} playMenu: {fileID: 0} settingsMenu: {fileID: 1042902200} @@ -841,6 +842,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 263877446} m_CullTransparentMesh: 1 +--- !u!1 &285134965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 285134966} + m_Layer: 5 + m_Name: ProceduralSettings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &285134966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 285134965} + 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: + - {fileID: 1780349283} + - {fileID: 1903304980} + m_Father: {fileID: 1042902201} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &317099853 PrefabInstance: m_ObjectHideFlags: 0 @@ -1978,6 +2017,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 454822931} m_CullTransparentMesh: 1 +--- !u!1 &461328970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 461328971} + - component: {fileID: 461328973} + - component: {fileID: 461328972} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &461328971 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 461328970} + 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: 1375640445} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &461328972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 461328970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 72 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 16 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 5, y: 5, z: 5, w: 5} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &461328973 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 461328970} + m_CullTransparentMesh: 1 --- !u!1 &464373235 GameObject: m_ObjectHideFlags: 0 @@ -3516,7 +3690,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -5.3, y: 10} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} @@ -5243,7 +5417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1042902201 RectTransform: m_ObjectHideFlags: 0 @@ -5261,7 +5435,7 @@ RectTransform: - {fileID: 1290001467} - {fileID: 633304487} - {fileID: 443612026} - - {fileID: 1780349283} + - {fileID: 285134966} m_Father: {fileID: 144251394} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6926,6 +7100,193 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b63bec55b1a6dfc4596b6da70ef02d16, type: 3} +--- !u!1 &1375640444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1375640445} + - component: {fileID: 1375640446} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1375640445 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375640444} + 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: + - {fileID: 461328971} + m_Father: {fileID: 1903304980} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.4510498, y: -6.076416} + m_SizeDelta: {x: -2.0978, y: -17.7528} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1375640446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375640444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} +--- !u!1 &1376430075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1376430076} + - component: {fileID: 1376430078} + - component: {fileID: 1376430077} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1376430076 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376430075} + 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: 1903304980} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -5.700012, y: 15.9} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1376430077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376430075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Energy cell chance + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1376430078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376430075} + m_CullTransparentMesh: 1 --- !u!1 &1384222560 GameObject: m_ObjectHideFlags: 0 @@ -7173,7 +7534,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -5.6, y: 10} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} @@ -9037,7 +9398,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1780349283 RectTransform: m_ObjectHideFlags: 0 @@ -9052,8 +9413,8 @@ RectTransform: m_Children: - {fileID: 896430353} - {fileID: 1069717235} - m_Father: {fileID: 1042902201} - m_RootOrder: 5 + m_Father: {fileID: 285134966} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -9228,7 +9589,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1810681710 RectTransform: m_ObjectHideFlags: 0 @@ -9893,6 +10254,195 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1842325171} m_CullTransparentMesh: 1 +--- !u!1 &1903304979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1903304980} + - component: {fileID: 1903304982} + - component: {fileID: 1903304981} + - component: {fileID: 1903304983} + m_Layer: 5 + m_Name: EnergyCellChance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1903304980 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903304979} + 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: + - {fileID: 1376430076} + - {fileID: 1375640445} + m_Father: {fileID: 285134966} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 450, y: -150} + m_SizeDelta: {x: 150, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1903304981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903304979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.084905684, g: 0, b: 0, a: 0.78039217} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1903304982 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903304979} + m_CullTransparentMesh: 1 +--- !u!114 &1903304983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903304979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1903304981} + m_TextViewport: {fileID: 1375640445} + m_TextComponent: {fileID: 461328972} + m_Placeholder: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 18 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 144251390} + m_TargetAssemblyTypeName: NetworkManagerUI, Assembly-CSharp + m_MethodName: SetEnergySpawnChance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} --- !u!1 &1926627171 GameObject: m_ObjectHideFlags: 0 @@ -10003,7 +10553,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -10079,7 +10629,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -10175,6 +10725,8 @@ MonoBehaviour: - {fileID: 4827316437302997977, guid: 4b799b333a6cc924ba529988acc90304, type: 3} - {fileID: 9162277469725168404, guid: e75cf3219263b7443b63389d886deb06, type: 3} - {fileID: 6068852365827753352, guid: 4f41280d2a4747b49bde9d9ab3a86d37, type: 3} + - {fileID: 833161632213746375, guid: e8ebefe0d40887a4789f7f2f5b457ac1, type: 3} + - {fileID: 8550474832306036776, guid: ede9b2918d7a5ab4d84e9e4db64a593d, type: 3} players: [] alive: [] dead: [] diff --git a/Assets/Scenes/Procedural.lighting b/Assets/Scenes/Procedural.lighting index 03cbeb5..4b8c531 100644 --- a/Assets/Scenes/Procedural.lighting +++ b/Assets/Scenes/Procedural.lighting @@ -10,14 +10,14 @@ LightingSettings: serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 + m_EnableRealtimeLightmaps: 1 m_RealtimeEnvironmentLighting: 1 m_BounceScale: 1 m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 1 m_BakeBackend: 2 - m_LightmapMaxSize: 1024 + m_LightmapMaxSize: 4096 m_BakeResolution: 40 m_Padding: 2 m_LightmapCompression: 3 diff --git a/Assets/Scenes/Procedural.unity b/Assets/Scenes/Procedural.unity index 4a610bc..38ed9e0 100644 --- a/Assets/Scenes/Procedural.unity +++ b/Assets/Scenes/Procedural.unity @@ -21,12 +21,12 @@ RenderSettings: m_LinearFogStart: 0 m_LinearFogEnd: 300 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientEquatorColor: {r: 0.0009803922, g: 0, b: 0.009803922, a: 1} + m_AmbientGroundColor: {r: 0.007761811, g: 0.007761811, b: 0.005174541, a: 1} m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 3e56423e1fe71f94ea97f5bb2004a7e6, type: 2} + m_AmbientMode: 1 + m_SubtractiveShadowColor: {r: 0, g: 0.019607844, b: 0.078431375, a: 1} + m_SkyboxMaterial: {fileID: 2100000, guid: 82b660520bdecce4daf45d270ec93fe4, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.6120079, g: 0.6841961, b: 0.9486244, a: 1} + m_IndirectSpecularColor: {r: 0.01602986, g: 0.018923363, b: 0.021959236, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -162,7 +162,11 @@ MonoBehaviour: - {fileID: 3449461135633615202, guid: 4b799b333a6cc924ba529988acc90304, type: 3} - {fileID: 1298746200742488495, guid: e75cf3219263b7443b63389d886deb06, type: 3} - {fileID: 4114043807951994675, guid: 4f41280d2a4747b49bde9d9ab3a86d37, type: 3} + - {fileID: 7399163560736700540, guid: e8ebefe0d40887a4789f7f2f5b457ac1, type: 3} + - {fileID: 1984261797555247763, guid: ede9b2918d7a5ab4d84e9e4db64a593d, type: 3} startingRoom: {fileID: 1061603555} + cubePrefab: {fileID: 2352355441573259686, guid: 07dfe65296154e14dbaf7036089cb26e, type: 3} + flattenSpawnedRooms: [] enemyPrefab: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} enemyList: [] --- !u!4 &131571059 @@ -178,7 +182,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &131571060 MonoBehaviour: @@ -270,6 +274,138 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} +--- !u!1 &402857488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 402857489} + - component: {fileID: 402857491} + - component: {fileID: 402857490} + - component: {fileID: 402857492} + m_Layer: 0 + m_Name: Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &402857489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402857488} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3.223, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 725301203} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &402857490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402857488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} +--- !u!108 &402857491 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402857488} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 0.6415094, g: 0, b: 0, a: 1} + m_Intensity: 140.2 + m_Range: 15.7342 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 0 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &402857492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402857488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1560e0c42f6e77d429c1440b33c57ccc, type: 3} + m_Name: + m_EditorClassIdentifier: + maximumDim: 100 + maximumBoost: 100 + speed: 0.1 + strength: 25 --- !u!1 &621294286 GameObject: m_ObjectHideFlags: 0 @@ -336,8 +472,74 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &725301202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1115504609363592116, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: sceneId + value: 303159910 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalPosition.y + value: -0.34 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1115504609363592120, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + propertyPath: m_Name + value: CubeEater (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} +--- !u!4 &725301203 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + m_PrefabInstance: {fileID: 725301202} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1061603554 PrefabInstance: m_ObjectHideFlags: 0 @@ -363,7 +565,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} propertyPath: m_LocalPosition.x @@ -464,7 +666,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1485085219 stripped Transform: @@ -631,7 +833,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &1579539042 MonoBehaviour: diff --git a/Assets/Scenes/Procedural/LightingData.asset b/Assets/Scenes/Procedural/LightingData.asset index 0246c7e..ff78d11 100644 Binary files a/Assets/Scenes/Procedural/LightingData.asset and b/Assets/Scenes/Procedural/LightingData.asset differ diff --git a/Assets/Scenes/Procedural/Lightmap-0_comp_dir.png b/Assets/Scenes/Procedural/Lightmap-0_comp_dir.png deleted file mode 100644 index b288ee3..0000000 --- a/Assets/Scenes/Procedural/Lightmap-0_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:355d87e312018f9b811070d7b1745abc73b33e08fa120064c38b50faa92c9730 -size 184047 diff --git a/Assets/Scenes/Procedural/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/Procedural/Lightmap-0_comp_dir.png.meta deleted file mode 100644 index ffa6bed..0000000 --- a/Assets/Scenes/Procedural/Lightmap-0_comp_dir.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 03688a0cfdacc8343a8309d180eab25a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Procedural/Lightmap-0_comp_light.exr b/Assets/Scenes/Procedural/Lightmap-0_comp_light.exr deleted file mode 100644 index 2f5e297..0000000 --- a/Assets/Scenes/Procedural/Lightmap-0_comp_light.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52d1b39c956c956a3ac52cf2ebb922416aa626d38cd881153b00139a1c98eb1e -size 869689 diff --git a/Assets/Scenes/Procedural/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/Procedural/Lightmap-0_comp_light.exr.meta deleted file mode 100644 index c966774..0000000 --- a/Assets/Scenes/Procedural/Lightmap-0_comp_light.exr.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 5a90110c19bec1b45bed467b817e2756 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Procedural/Lightmap-1_comp_dir.png b/Assets/Scenes/Procedural/Lightmap-1_comp_dir.png deleted file mode 100644 index 081dfa0..0000000 --- a/Assets/Scenes/Procedural/Lightmap-1_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:902e2b780e34735b230df33c57c7b36e8b4202139c95a19dae24333b4a912142 -size 146209 diff --git a/Assets/Scenes/Procedural/Lightmap-1_comp_dir.png.meta b/Assets/Scenes/Procedural/Lightmap-1_comp_dir.png.meta deleted file mode 100644 index ae4b37b..0000000 --- a/Assets/Scenes/Procedural/Lightmap-1_comp_dir.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 293bd8bc7bf48424a9773149d079a2cc -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Procedural/Lightmap-1_comp_light.exr b/Assets/Scenes/Procedural/Lightmap-1_comp_light.exr deleted file mode 100644 index 2b573fe..0000000 --- a/Assets/Scenes/Procedural/Lightmap-1_comp_light.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eab5eeaad9fef13023b64d71ba9ddbf9de4bd43222f2263e4968b07cfd758d37 -size 658814 diff --git a/Assets/Scenes/Procedural/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/Procedural/Lightmap-1_comp_light.exr.meta deleted file mode 100644 index 33a5f2a..0000000 --- a/Assets/Scenes/Procedural/Lightmap-1_comp_light.exr.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 756e1bcdaf4a0384197d12927664b22b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Procedural/Lightmap-2_comp_dir.png b/Assets/Scenes/Procedural/Lightmap-2_comp_dir.png deleted file mode 100644 index 10b2628..0000000 --- a/Assets/Scenes/Procedural/Lightmap-2_comp_dir.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9cc5b95fefc79f8d2f52fed13696bc71122741d235871cce10c95b256191a98 -size 108807 diff --git a/Assets/Scenes/Procedural/Lightmap-2_comp_dir.png.meta b/Assets/Scenes/Procedural/Lightmap-2_comp_dir.png.meta deleted file mode 100644 index 6bccd88..0000000 --- a/Assets/Scenes/Procedural/Lightmap-2_comp_dir.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 24f4d71e05317d44f9013c5544bea660 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Procedural/Lightmap-2_comp_light.exr b/Assets/Scenes/Procedural/Lightmap-2_comp_light.exr deleted file mode 100644 index 5cb42e4..0000000 --- a/Assets/Scenes/Procedural/Lightmap-2_comp_light.exr +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05b288b40292ea158850754df2dee7a97d5d0e5de1c3686fd70a854d94192afb -size 525363 diff --git a/Assets/Scenes/Procedural/Lightmap-2_comp_light.exr.meta b/Assets/Scenes/Procedural/Lightmap-2_comp_light.exr.meta deleted file mode 100644 index e2b4f4f..0000000 --- a/Assets/Scenes/Procedural/Lightmap-2_comp_light.exr.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: e4d0d9c48f0b94e42968a5e6fe947e74 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 0 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 6 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Procedural/ReflectionProbe-0.exr b/Assets/Scenes/Procedural/ReflectionProbe-0.exr index 0232fa8..a8c5541 100644 --- a/Assets/Scenes/Procedural/ReflectionProbe-0.exr +++ b/Assets/Scenes/Procedural/ReflectionProbe-0.exr @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0279f18b2b6e386307300394338b4dbf89f03ffc30336b1fb01c888af433abd9 -size 41561 +oid sha256:4f8b721a9d5c167db16275e329091d1fbe58831e7b56976aac44894b750355f3 +size 95249 diff --git a/Assets/Scripts/Environment/Energy/CellSpawner.cs b/Assets/Scripts/Environment/Energy/CellSpawner.cs index 0c57f66..f469c46 100644 --- a/Assets/Scripts/Environment/Energy/CellSpawner.cs +++ b/Assets/Scripts/Environment/Energy/CellSpawner.cs @@ -8,7 +8,7 @@ public class CellSpawner : NetworkBehaviour { public GameObject prefab; public float spawnTime; - public int _maxConnections; + private int _maxConnections; private CustomNetworkManager _networkManager; private GameObject _instance; diff --git a/Assets/Scripts/Environment/Energy/EnergyCellManager.cs b/Assets/Scripts/Environment/Energy/EnergyCellManager.cs new file mode 100644 index 0000000..00190cc --- /dev/null +++ b/Assets/Scripts/Environment/Energy/EnergyCellManager.cs @@ -0,0 +1,35 @@ +using Mirror; +using Unity.Mathematics; +using UnityEngine; +using Random = UnityEngine.Random; +public class EnergyCellManager : NetworkBehaviour +{ + public GameObject prefab; + + private Vector3 _offset = new Vector3(3, -1, 3); + private int _levelSize; + private int _energySpawnChance; + void Start() + { + if (!isServer) return; + + _levelSize = PlayerPrefs.GetInt("LevelSize"); + _energySpawnChance = PlayerPrefs.GetInt("EnergySpawnChance"); + + int randomValue = Random.Range(0, _levelSize); + float threshold = _levelSize * (_energySpawnChance / 100f); + + if (randomValue < threshold) + { + SpawnEnergyCell(); + } + } + + void SpawnEnergyCell() + { + Vector3 randomPosition = new Vector3(Random.Range(-6, 6), 0f, Random.Range(-6, 6)); + GameObject go = Instantiate(prefab, transform.position + _offset + randomPosition, quaternion.identity); + NetworkServer.Spawn(go); + } +} + diff --git a/Assets/Scripts/Environment/Energy/EnergyCellManager.cs.meta b/Assets/Scripts/Environment/Energy/EnergyCellManager.cs.meta new file mode 100644 index 0000000..228f71d --- /dev/null +++ b/Assets/Scripts/Environment/Energy/EnergyCellManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: daaa736aba9a2bf409c32f54eb4f076a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Environment/Interactive/CubeEater.cs b/Assets/Scripts/Environment/Interactive/CubeEater.cs index 5218813..272e6af 100644 --- a/Assets/Scripts/Environment/Interactive/CubeEater.cs +++ b/Assets/Scripts/Environment/Interactive/CubeEater.cs @@ -30,11 +30,13 @@ public class CubeEater : NetworkBehaviour // SetWinner(player.gameObject); networkGameManager.SetWinner(player.gameObject); - + print("SASALKA????"); + StartCoroutine(DestoyDelay(collider.gameObject)); } else { + print("ELSE"); var player = collider.GetComponent()._player; collider.GetComponent().ResetPlayer(); diff --git a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs index 51516ac..dc2673b 100644 --- a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs +++ b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs @@ -15,6 +15,8 @@ namespace Level.BuildModules public Room[] roomPrefabs; public Room startingRoom; + public GameObject cubePrefab; + private Room[,] _spawnedRooms; public List flattenSpawnedRooms = new(); @@ -56,7 +58,11 @@ namespace Level.BuildModules print("<---Surface builded--->"); networkManager.OnPlayerSpawned += OnPlayerSpawned; - print("pizda"); + + if (isServer) + { + OnPlayerSpawned(); + } } private void OnPlayerSpawned() @@ -65,16 +71,35 @@ namespace Level.BuildModules if (networkManager.players.Count == networkManager.maxConnections) { - for (int i = 0; i < networkManager.maxMonsters; i++) - { - Vector3 pos = _enemySpawnPoses[Random.Range(0, _enemySpawnPoses.Count)]; - GameObject go = Instantiate(enemyPrefab, pos, Quaternion.identity); - - NetworkServer.Spawn(go); - enemyList.Add(go); - } + MonsterSpawn(); + + CubeSpawn(); } + } + + private void CubeSpawn() + { + Vector3 pos = _enemySpawnPoses[Random.Range(0, _enemySpawnPoses.Count)]; + GameObject go = Instantiate(cubePrefab, pos, Quaternion.identity); + go.GetComponent().Original = true; + + NetworkServer.Spawn(go); + enemyList.Add(go); + print("<---Cube spawned--->"); + } + + private void MonsterSpawn() + { + for (int i = 0; i < networkManager.maxMonsters; i++) + { + Vector3 pos = _enemySpawnPoses[Random.Range(0, _enemySpawnPoses.Count)]; + GameObject go = Instantiate(enemyPrefab, pos, Quaternion.identity); + + NetworkServer.Spawn(go); + enemyList.Add(go); + } + print("<---Monster spawned--->"); } @@ -87,9 +112,6 @@ namespace Level.BuildModules { if (_spawnedRooms[x, y] == null) continue; - int maxX = _spawnedRooms.GetLength(0) - 1; - int maxY = _spawnedRooms.GetLength(1) - 1; - AddVacantPlaceIfValid(x - 1, y, vacantPlaces); AddVacantPlaceIfValid(x, y - 1, vacantPlaces); AddVacantPlaceIfValid(x + 1, y, vacantPlaces); diff --git a/Assets/Scripts/Level/BuildModules/Room.cs b/Assets/Scripts/Level/BuildModules/Room.cs index b6d3503..62de65c 100644 --- a/Assets/Scripts/Level/BuildModules/Room.cs +++ b/Assets/Scripts/Level/BuildModules/Room.cs @@ -87,7 +87,9 @@ namespace Level.BuildModules { foreach (var door in _disabledDoors) { - _doors[(int)door].SetActive(false); + Destroy(_doors[(int)door]); + // _doors[(int)door].GetComponent<> + // _doors[(int)door].SetActive(false); } } } diff --git a/Assets/Scripts/Network/NetworkManagerUI.cs b/Assets/Scripts/Network/NetworkManagerUI.cs index d7428b9..a2292c4 100644 --- a/Assets/Scripts/Network/NetworkManagerUI.cs +++ b/Assets/Scripts/Network/NetworkManagerUI.cs @@ -18,6 +18,8 @@ public class NetworkManagerUI : MonoBehaviour public GameObject LevelSizeGo; public TMP_InputField LevelSize; public TMP_Dropdown LevelSelect; + + public TMP_InputField EnergySpawnChanceInput; public GameObject menu; public GameObject playMenu; @@ -41,6 +43,7 @@ public class NetworkManagerUI : MonoBehaviour MaxMonstersInput.text = PlayerPrefs.GetString("MaxMonsters"); LevelSize.text = PlayerPrefs.GetInt("LevelSize").ToString(); + EnergySpawnChanceInput.text = PlayerPrefs.GetInt("EnergySpawnChance").ToString(); LevelSelect.value = PlayerPrefs.GetInt("Level"); LevelSizeGo.SetActive(LevelSelect.value == 1); @@ -112,6 +115,12 @@ public class NetworkManagerUI : MonoBehaviour PlayerPrefs.SetInt("LevelSize", Int32.Parse(LevelSize.text)); } + public void SetEnergySpawnChance() + { + if (string.IsNullOrEmpty(EnergySpawnChanceInput.text)) return; + + PlayerPrefs.SetInt("EnergySpawnChance", Int32.Parse(EnergySpawnChanceInput.text)); + } public void changeStartMenuState() {