diff --git a/Assets/Environment/SciFi Warehouse Kit/Art/Materials/Barrel Mat.mat b/Assets/Environment/SciFi Warehouse Kit/Art/Materials/Barrel Mat.mat index 7ca92a0..2cbc1c1 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Art/Materials/Barrel Mat.mat +++ b/Assets/Environment/SciFi Warehouse Kit/Art/Materials/Barrel Mat.mat @@ -107,13 +107,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _Metallic: 0.879 + - _Metallic: 0.045 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Props/Crates Barrels Pallets/Barrel.prefab b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Props/Crates Barrels Pallets/Barrel.prefab index a349387..be29774 100644 --- a/Assets/Environment/SciFi Warehouse Kit/Prefabs/Props/Crates Barrels Pallets/Barrel.prefab +++ b/Assets/Environment/SciFi Warehouse Kit/Prefabs/Props/Crates Barrels Pallets/Barrel.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 2172049943489465098} - component: {fileID: 5141884343314972354} m_Layer: 0 - m_Name: SciFiBarrel + m_Name: Barrel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29,6 +29,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: 0} m_RootOrder: 0 @@ -52,9 +53,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: @@ -66,6 +70,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 @@ -78,6 +83,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &5141884343314972354 MeshCollider: m_ObjectHideFlags: 0 @@ -87,8 +93,8 @@ MeshCollider: m_GameObject: {fileID: 439239393980121046} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 3 + m_Enabled: 0 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 7b44d744f6c37d441952d043e70b584c, type: 3} diff --git a/Assets/Prefabs/Environment/CubeForEat.prefab b/Assets/Prefabs/Environment/CubeForEat.prefab index 229f29d..2b06e02 100644 --- a/Assets/Prefabs/Environment/CubeForEat.prefab +++ b/Assets/Prefabs/Environment/CubeForEat.prefab @@ -24,12 +24,12 @@ Transform: 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_LocalPosition: {x: 0.42, 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_RootOrder: 1 m_LocalEulerAnglesHint: {x: 86.723, y: -89.865, z: 90.135} --- !u!1 &2352355441573259686 GameObject: @@ -67,9 +67,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7963603851784520173} - {fileID: 79024357367539290} - {fileID: 6875673965032713355} + - {fileID: 7765373758118958023} + - {fileID: 5188025785663007309} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -104,7 +105,7 @@ MonoBehaviour: sceneId: 0 serverOnly: 0 visible: 0 - m_AssetId: fb20dc5a22e38934dbd64e9158977eec + m_AssetId: 07dfe65296154e14dbaf7036089cb26e hasSpawned: 0 --- !u!114 &5548888651989132254 MonoBehaviour: @@ -190,8 +191,8 @@ BoxCollider: 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} + m_Size: {x: 0.85, y: 1.24, z: 0.85} + m_Center: {x: 0, y: 0, z: -0.01} --- !u!208 &2882785016289707988 NavMeshObstacle: m_ObjectHideFlags: 0 @@ -199,10 +200,10 @@ NavMeshObstacle: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2352355441573259686} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Shape: 1 - m_Extents: {x: 0.35, y: 0.35, z: 0.35} + m_Extents: {x: 0.5, y: 0.5, z: 0.5} m_MoveThreshold: 0.1 m_Carve: 1 m_CarveOnlyStationary: 0 @@ -223,6 +224,38 @@ MonoBehaviour: syncMode: 0 syncInterval: 0 _player: {fileID: 0} +--- !u!1 &4465071986495178026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5188025785663007309} + m_Layer: 0 + m_Name: Particles + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5188025785663007309 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4465071986495178026} + 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: 1064003080629850120} + m_Father: {fileID: 8040387065364850832} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4771268620797002463 GameObject: m_ObjectHideFlags: 0 @@ -247,183 +280,154 @@ Transform: 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_LocalPosition: {x: -0.407, 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_RootOrder: 0 m_LocalEulerAnglesHint: {x: 266.723, y: -89.86499, z: 240.492} ---- !u!1001 &7570233214266107398 +--- !u!1001 &2395054717344918908 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5188025785663007309} + m_Modifications: + - target: {fileID: 3456768597155298673, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_Name + value: FireFlies + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalScale.x + value: 0.036567 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalScale.y + value: 0.036567 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalScale.z + value: 0.036567 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3456768597155298678, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} +--- !u!4 &1064003080629850120 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3456768597155298676, guid: 0b28d04bc9a122543ae0f12a59c00b20, type: 3} + m_PrefabInstance: {fileID: 2395054717344918908} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6595242878405844482 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 8040387065364850832} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 439239393980121046, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} + propertyPath: m_Name + value: Barrel + objectReference: {fileID: 0} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} + propertyPath: m_LocalPosition.x 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} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalPosition.y - value: -0.35 + value: -0.6 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalPosition.z - value: 0.35 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} + - target: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, 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 + - target: {fileID: 5141884343314972354, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} + propertyPath: m_Enabled 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 + m_SourcePrefab: {fileID: 100100000, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} +--- !u!4 &7765373758118958023 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 82a9f2efef13c844d966581831bb87f6, type: 3} - m_PrefabInstance: {fileID: 7570233214266107398} + m_CorrespondingSourceObject: {fileID: 3477663187008753093, guid: 1e3974e3db8c48c41b2604d2478e7e9e, type: 3} + m_PrefabInstance: {fileID: 6595242878405844482} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Menu/Global Volume Profile.asset b/Assets/Scenes/Menu/Global Volume Profile.asset index 6ee3f71..42ca357 100644 --- a/Assets/Scenes/Menu/Global Volume Profile.asset +++ b/Assets/Scenes/Menu/Global Volume Profile.asset @@ -15,7 +15,7 @@ MonoBehaviour: components: - {fileID: 869408817000159395} - {fileID: 6510418827869364606} - - {fileID: 5818941619636482515} + - {fileID: 8953454453146646998} --- !u!114 &869408817000159395 MonoBehaviour: m_ObjectHideFlags: 3 @@ -31,15 +31,15 @@ MonoBehaviour: active: 1 threshold: m_OverrideState: 1 - m_Value: 0.04 + m_Value: 0.1 intensity: m_OverrideState: 1 - m_Value: 12 + m_Value: 0.32 scatter: m_OverrideState: 1 - m_Value: 0.167 + m_Value: 0.103 clamp: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 65257.3 tint: m_OverrideState: 1 @@ -56,52 +56,6 @@ MonoBehaviour: dirtIntensity: m_OverrideState: 0 m_Value: 12337.69 ---- !u!114 &5818941619636482515 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} - m_Name: DepthOfField - m_EditorClassIdentifier: - active: 1 - mode: - m_OverrideState: 1 - m_Value: 2 - gaussianStart: - m_OverrideState: 1 - m_Value: 1.69 - gaussianEnd: - m_OverrideState: 0 - m_Value: 145.3 - gaussianMaxRadius: - m_OverrideState: 0 - m_Value: 0.971 - highQualitySampling: - m_OverrideState: 0 - m_Value: 0 - focusDistance: - m_OverrideState: 1 - m_Value: 1.4 - aperture: - m_OverrideState: 1 - m_Value: 4.7 - focalLength: - m_OverrideState: 1 - m_Value: 59 - bladeCount: - m_OverrideState: 1 - m_Value: 5 - bladeCurvature: - m_OverrideState: 1 - m_Value: 0.597 - bladeRotation: - m_OverrideState: 1 - m_Value: 43 --- !u!114 &6510418827869364606 MonoBehaviour: m_ObjectHideFlags: 3 @@ -117,4 +71,32 @@ MonoBehaviour: active: 1 intensity: m_OverrideState: 1 - m_Value: 0.874 + m_Value: 0.337 +--- !u!114 &8953454453146646998 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5e1dc532bcb41949b58bc4f2abfbb7e, type: 3} + m_Name: LensDistortion + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0 + xMultiplier: + m_OverrideState: 1 + m_Value: 1 + yMultiplier: + m_OverrideState: 1 + m_Value: 1 + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + scale: + m_OverrideState: 0 + m_Value: 1.26 diff --git a/Assets/Scenes/NewMenu.unity b/Assets/Scenes/NewMenu.unity index 4d6b0ea..d8179c1 100644 --- a/Assets/Scenes/NewMenu.unity +++ b/Assets/Scenes/NewMenu.unity @@ -7210,7 +7210,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Energy cell chance + m_text: Energy cell chance % m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scenes/Procedural.unity b/Assets/Scenes/Procedural.unity index 38ed9e0..2f2927f 100644 --- a/Assets/Scenes/Procedural.unity +++ b/Assets/Scenes/Procedural.unity @@ -23,10 +23,10 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, 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: 1 + m_AmbientIntensity: 0.76 + m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0, g: 0.019607844, b: 0.078431375, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 82b660520bdecce4daf45d270ec93fe4, type: 2} + m_SkyboxMaterial: {fileID: 2100000, guid: 97637a2a763b7f24b8da4e139e4144ca, 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.01602986, g: 0.018923363, b: 0.021959236, a: 1} + m_IndirectSpecularColor: {r: 0.000055046083, g: 0.00014094963, b: 0.0042733354, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -855,3 +855,191 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} +--- !u!1 &1598083277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1598083281} + - component: {fileID: 1598083280} + - component: {fileID: 1598083279} + - component: {fileID: 1598083278} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1598083278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598083277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &1598083279 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598083277} + m_Enabled: 1 +--- !u!20 &1598083280 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598083277} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1598083281 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598083277} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.4765139, y: 1.8768713, z: 4.5481687} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1697794837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1697794838} + - component: {fileID: 1697794839} + - component: {fileID: 1697794840} + m_Layer: 0 + m_Name: PostProcess + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1697794838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1697794837} + 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: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1697794839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1697794837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IsGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: 0af4d617ef049524c9a08aa853f5bb80, type: 2} +--- !u!95 &1697794840 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1697794837} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 69c2023c4fc5b184db5c1a0f813c634d, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Scenes/Procedural/LightingData.asset b/Assets/Scenes/Procedural/LightingData.asset index ff78d11..19edd3a 100644 Binary files a/Assets/Scenes/Procedural/LightingData.asset and b/Assets/Scenes/Procedural/LightingData.asset differ diff --git a/Assets/Scenes/Procedural/PostProcess Profile.asset b/Assets/Scenes/Procedural/PostProcess Profile.asset new file mode 100644 index 0000000..f8c9fc8 --- /dev/null +++ b/Assets/Scenes/Procedural/PostProcess Profile.asset @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7278043217561377602 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + threshold: + m_OverrideState: 1 + m_Value: 0.18 + intensity: + m_OverrideState: 1 + m_Value: 0.2 + scatter: + m_OverrideState: 1 + m_Value: 0.016 + clamp: + m_OverrideState: 1 + m_Value: 65257.3 + tint: + m_OverrideState: 1 + m_Value: {r: 0.9811321, g: 0.6525454, b: 0.6588514, a: 1} + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + skipIterations: + m_OverrideState: 0 + m_Value: 16 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dirtIntensity: + m_OverrideState: 0 + m_Value: 12337.69 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: PostProcess Profile + m_EditorClassIdentifier: + components: + - {fileID: -7278043217561377602} diff --git a/Assets/Scenes/Procedural/PostProcess Profile.asset.meta b/Assets/Scenes/Procedural/PostProcess Profile.asset.meta new file mode 100644 index 0000000..40062a3 --- /dev/null +++ b/Assets/Scenes/Procedural/PostProcess Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f57f1e308f782254ca58e1a893c7c916 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Procedural/ReflectionProbe-0.exr b/Assets/Scenes/Procedural/ReflectionProbe-0.exr index a8c5541..b5267c4 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:4f8b721a9d5c167db16275e329091d1fbe58831e7b56976aac44894b750355f3 -size 95249 +oid sha256:c9dce17a784c183b7ef1212b20ee1d5165134cd98e173c3ff16f4f1eed59574f +size 47812 diff --git a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs index dc2673b..00d9bcf 100644 --- a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs +++ b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs @@ -67,6 +67,7 @@ namespace Level.BuildModules private void OnPlayerSpawned() { + print("OnPlayerSpawned"); if (enemyList.Count == networkManager.maxMonsters) return; if (networkManager.players.Count == networkManager.maxConnections)