diff --git a/Assets/Prefabs/Environment/Campfire.prefab b/Assets/Prefabs/Environment/Campfire.prefab index a1b18ef..1b1ed44 100644 --- a/Assets/Prefabs/Environment/Campfire.prefab +++ b/Assets/Prefabs/Environment/Campfire.prefab @@ -69,12 +69,12 @@ MonoBehaviour: DynamicLight: {fileID: 6245881137502637047} Flame: {fileID: 1683130550026608685} BurnEffectSource: {fileID: 964052589141395917} - GoodFuelAmount: 20 + GoodFuelAmount: 30 TooLowFuelColor: {r: 1, g: 0.791215, b: 0.6273585, a: 0} RandomVarianceDuration: 0.2 RandomVarianceMagnitude: 0.25 LogBurningCooldown: 1 - Fuel: 30 + Fuel: 60 --- !u!54 &7293540718676611162 Rigidbody: m_ObjectHideFlags: 0 @@ -161,7 +161,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4797807552203538256} m_LocalRotation: {x: -0.7010575, y: 0.092295825, z: -0.0922958, w: -0.7010574} - m_LocalPosition: {x: 0, y: 1.5, z: 0} + m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} @@ -179,8 +179,8 @@ Light: m_Type: 2 m_Shape: 0 m_Color: {r: 1, g: 0.84329563, b: 0.6556604, a: 1} - m_Intensity: 1.5 - m_Range: 15 + m_Intensity: 1 + m_Range: 40 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 @@ -218,7 +218,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_RenderingLayerMask: 1 - m_Lightmapping: 4 + m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 7, y: 7} m_BounceIntensity: 1 diff --git a/Assets/Prefabs/Environment/Log.prefab b/Assets/Prefabs/Environment/Log.prefab index 8c64ce6..8982c6e 100644 --- a/Assets/Prefabs/Environment/Log.prefab +++ b/Assets/Prefabs/Environment/Log.prefab @@ -31,6 +31,20 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &863242262232210809 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9084453306067018835} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 14 + m_Mesh: {fileID: 2534964839176971238, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, type: 3} --- !u!1001 &951274577046027610 PrefabInstance: m_ObjectHideFlags: 0 @@ -120,6 +134,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, type: 3} +--- !u!1 &9084453306067018835 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, + type: 3} + m_PrefabInstance: {fileID: 951274577046027610} + m_PrefabAsset: {fileID: 0} --- !u!4 &5208747214434309696 stripped Transform: m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 4ea0140474f39ac47bdd8b1bcc130ea2, diff --git a/Assets/Prefabs/Environment/Tent.prefab b/Assets/Prefabs/Environment/Tent.prefab index 616793e..5c4f8fa 100644 --- a/Assets/Prefabs/Environment/Tent.prefab +++ b/Assets/Prefabs/Environment/Tent.prefab @@ -1,5 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!64 &9187953970922441610 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2810726785596125069} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: -1 + m_Mesh: {fileID: -2989305052099074096, guid: b6af29ffe256fbe458269e5e3d7470b0, type: 3} --- !u!1 &5298320185909332155 GameObject: m_ObjectHideFlags: 0 @@ -115,6 +129,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b6af29ffe256fbe458269e5e3d7470b0, type: 3} +--- !u!1 &2810726785596125069 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: b6af29ffe256fbe458269e5e3d7470b0, + type: 3} + m_PrefabInstance: {fileID: 6061941893282838148} + m_PrefabAsset: {fileID: 0} --- !u!4 &1250572183033814430 stripped Transform: m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: b6af29ffe256fbe458269e5e3d7470b0, diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 00a2924..d3202e2 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.018643074, g: 0.016805695, b: 0.018643074, a: 1} + m_IndirectSpecularColor: {r: 0.012527039, g: 0.011292484, b: 0.012527039, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -223,6 +223,85 @@ Transform: type: 3} m_PrefabInstance: {fileID: 56772758} m_PrefabAsset: {fileID: 0} +--- !u!1 &71220340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 71220341} + - component: {fileID: 71220343} + - component: {fileID: 71220342} + m_Layer: 0 + m_Name: Shadow fixeroo (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &71220341 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71220340} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.0357, y: 0.045, z: 1.3214} + m_LocalScale: {x: 0.045466647, y: 0.045466647, z: 0.045466647} + m_Children: [] + m_Father: {fileID: 1533351108} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &71220342 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71220340} + m_Enabled: 1 + m_CastShadows: 3 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &71220343 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71220340} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &71403635 PrefabInstance: m_ObjectHideFlags: 0 @@ -481,6 +560,98 @@ Transform: type: 3} m_PrefabInstance: {fileID: 234379562} m_PrefabAsset: {fileID: 0} +--- !u!1 &237467733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 237467734} + - component: {fileID: 237467735} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &237467734 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 237467733} + m_LocalRotation: {x: 0.1581012, y: -0.21822573, z: 0.2703361, w: 0.9242835} + m_LocalPosition: {x: 0, y: 2.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1660514110} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 24.220001, y: -20.402, z: 28.184002} +--- !u!108 &237467735 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 237467733} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 0.8915094, g: 0.95430803, b: 1, a: 1} + m_Intensity: 0.15 + m_Range: 10 + 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: 1 + 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_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1001 &241070006 PrefabInstance: m_ObjectHideFlags: 0 @@ -1118,6 +1289,11 @@ PrefabInstance: propertyPath: m_Name value: Log objectReference: {fileID: 0} + - target: {fileID: 110889063446132937, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} propertyPath: m_LocalPosition.x @@ -1173,6 +1349,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9084453306067018835, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} --- !u!1001 &771789323 @@ -1305,7 +1486,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1660514110} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!154 &833188480 TerrainCollider: @@ -2283,13 +2464,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1660514110} m_Modifications: + - target: {fileID: 2810726785596125069, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 5298320185909332155, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} propertyPath: m_Name value: Tent objectReference: {fileID: 0} + - target: {fileID: 5298320185909332155, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} propertyPath: m_LocalPosition.x @@ -2328,7 +2519,7 @@ PrefabInstance: - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} propertyPath: m_RootOrder - value: 2 + value: 8 objectReference: {fileID: 0} - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} @@ -2348,7 +2539,7 @@ PrefabInstance: - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} propertyPath: m_LocalScale.x - value: 1.6194947 + value: 1.6194948 objectReference: {fileID: 0} - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} @@ -2358,7 +2549,7 @@ PrefabInstance: - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} propertyPath: m_LocalScale.z - value: 1.6194947 + value: 1.6194948 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} @@ -2629,6 +2820,11 @@ PrefabInstance: propertyPath: m_Name value: Log objectReference: {fileID: 0} + - target: {fileID: 110889063446132937, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} propertyPath: m_LocalPosition.x @@ -2684,8 +2880,92 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9084453306067018835, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} +--- !u!1 &1445458447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1445458448} + - component: {fileID: 1445458450} + - component: {fileID: 1445458449} + m_Layer: 0 + m_Name: Shadow fixeroo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1445458448 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445458447} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.039, y: 0.045, z: 1.325} + m_LocalScale: {x: 0.045466647, y: 0.045466647, z: 0.045466647} + m_Children: [] + m_Father: {fileID: 1533351108} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1445458449 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445458447} + m_Enabled: 1 + m_CastShadows: 3 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1445458450 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1445458447} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1484899786 PrefabInstance: m_ObjectHideFlags: 0 @@ -2786,6 +3066,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1484899786} m_PrefabAsset: {fileID: 0} +--- !u!4 &1533351108 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + m_PrefabInstance: {fileID: 1293177754} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1543128267 PrefabInstance: m_ObjectHideFlags: 0 @@ -2905,11 +3191,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1660514110} m_Modifications: + - target: {fileID: 452618427450517986, guid: 8ee6eecf5317b4841817712d24763e37, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 986826787110512831, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: GameState value: objectReference: {fileID: 834592896} + - target: {fileID: 1408567892783054407, guid: 8ee6eecf5317b4841817712d24763e37, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 1791762180592942439, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_Name @@ -2925,6 +3221,16 @@ PrefabInstance: propertyPath: VelocityModule.radial.scalar value: 0.7 objectReference: {fileID: 0} + - target: {fileID: 3761259892351120705, guid: 8ee6eecf5317b4841817712d24763e37, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 4797807552203538256, guid: 8ee6eecf5317b4841817712d24763e37, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_LocalPosition.x @@ -2982,6 +3288,42 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} +--- !u!1 &1585922906 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6125707628839966531, guid: 558201eae20fa5540a826edb23937665, + type: 3} + m_PrefabInstance: {fileID: 6125707629521091122} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1585922908 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6125707628839966535, guid: 558201eae20fa5540a826edb23937665, + type: 3} + m_PrefabInstance: {fileID: 6125707629521091122} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585922906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1585922911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585922906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c520d478f3d2445429bd7ac9c92b03a3, type: 3} + m_Name: + m_EditorClassIdentifier: + postProcessLayer: {fileID: 1585922908} + lightMeter: 0 + histogram: 0 + waveform: 0 + vectorscope: 0 + debugOverlay: 0 --- !u!4 &1639218800 stripped Transform: m_CorrespondingSourceObject: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, @@ -3016,15 +3358,17 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2038862784} + - {fileID: 237467734} - {fileID: 1195794718} - {fileID: 833188479} - {fileID: 1872559113} - {fileID: 1559223405} - {fileID: 116564792} - {fileID: 1639218800} + - {fileID: 1533351108} - {fileID: 1694329891} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1694329890 GameObject: @@ -3081,7 +3425,7 @@ Transform: - {fileID: 234379563} - {fileID: 1704854706} m_Father: {fileID: 1660514110} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1704854705 PrefabInstance: @@ -3272,6 +3616,11 @@ PrefabInstance: propertyPath: m_Name value: Log objectReference: {fileID: 0} + - target: {fileID: 110889063446132937, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} propertyPath: m_LocalPosition.x @@ -3327,6 +3676,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9084453306067018835, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} --- !u!4 &1872559113 stripped @@ -3530,7 +3884,7 @@ RectTransform: - {fileID: 1156509021} - {fileID: 429180126} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3863,7 +4217,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &531861614376686525 PrefabInstance: @@ -4055,6 +4409,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1660514110} m_Modifications: + - target: {fileID: 6125707628839966535, guid: 558201eae20fa5540a826edb23937665, + type: 3} + propertyPath: debugLayer.lightMeter.showCurves + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6125707630481988370, guid: 558201eae20fa5540a826edb23937665, type: 3} propertyPath: GameState diff --git a/Assets/Scenes/MainScene/LightingData.asset b/Assets/Scenes/MainScene/LightingData.asset index dc60b0d..1ac08be 100644 Binary files a/Assets/Scenes/MainScene/LightingData.asset and b/Assets/Scenes/MainScene/LightingData.asset differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png index eacd3ff..99fddc0 100644 Binary files a/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png and b/Assets/Scenes/MainScene/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr index ea859a1..05b9b32 100644 Binary files a/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr and b/Assets/Scenes/MainScene/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png new file mode 100644 index 0000000..41d04e8 Binary files /dev/null and b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png differ diff --git a/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png.meta b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png.meta new file mode 100644 index 0000000..bf4d43f --- /dev/null +++ b/Assets/Scenes/MainScene/Lightmap-0_comp_shadowmask.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: cbe9964f930fcb64983ae1cf44fd4bce +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 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Win + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 2 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene/ReflectionProbe-0.exr b/Assets/Scenes/MainScene/ReflectionProbe-0.exr index d8d592d..70df441 100644 Binary files a/Assets/Scenes/MainScene/ReflectionProbe-0.exr and b/Assets/Scenes/MainScene/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset b/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset index e2db3cc..d79e47d 100644 --- a/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset +++ b/Assets/Scenes/MainScene_Profiles/Global Post-process Volume Profile.asset @@ -180,8 +180,8 @@ MonoBehaviour: overrideState: 0 value: 0 postExposure: - overrideState: 0 - value: 0 + overrideState: 1 + value: 0.5 contrast: overrideState: 0 value: 0 @@ -213,14 +213,14 @@ MonoBehaviour: overrideState: 0 value: 100 lift: - overrideState: 0 - value: {x: 1, y: 1, z: 1, w: 0} + overrideState: 1 + value: {x: 1, y: 1, z: 1, w: 0.000000080226975} gamma: - overrideState: 0 - value: {x: 1, y: 1, z: 1, w: 0} + overrideState: 1 + value: {x: 1, y: 1, z: 1, w: -8.647041e-10} gain: - overrideState: 0 - value: {x: 1, y: 1, z: 1, w: 0} + overrideState: 1 + value: {x: 1, y: 1, z: 1, w: 0.12711862} masterCurve: overrideState: 0 value: diff --git a/Assets/Scripts/Campfire.cs b/Assets/Scripts/Campfire.cs index 2ca4eef..68baf3c 100644 --- a/Assets/Scripts/Campfire.cs +++ b/Assets/Scripts/Campfire.cs @@ -49,7 +49,7 @@ public class Campfire : MonoBehaviour { RandomVariance = Mathf.Lerp(RandomVariance, NextRandomVariance, (Time.time - LastRandomVarianceChange) / RandomVarianceDuration); Fuel = Mathf.Max(0, Fuel - Time.deltaTime); - DynamicLight.range = Mathf.Log(Mathf.Max(0.01f, Fuel + 1f), 10) / 2f * FullRange + RandomVariance; + DynamicLight.range = Fuel / GoodFuelAmount / 2f * FullRange + RandomVariance; DynamicLight.color = Color.Lerp(DynamicLight.color, Fuel < GoodFuelAmount ? TooLowFuelColor : EnoughFuelColor, 10f * Time.deltaTime); Flame.Aliveness = Mathf.Log(Mathf.Max(0.01f, Fuel - 0.7f), 10) / 2f; diff --git a/Assets/Skyboxes/Nightsky/Nightsky.mat b/Assets/Skyboxes/Nightsky/Nightsky.mat index 214bbb2..16f329d 100644 --- a/Assets/Skyboxes/Nightsky/Nightsky.mat +++ b/Assets/Skyboxes/Nightsky/Nightsky.mat @@ -84,7 +84,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 0.3 + - _Exposure: 0.5 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 diff --git a/Assets/Terrains/Dirt Layer.terrainlayer b/Assets/Terrains/Dirt Layer.terrainlayer index b84e6f6..d767676 100644 --- a/Assets/Terrains/Dirt Layer.terrainlayer +++ b/Assets/Terrains/Dirt Layer.terrainlayer @@ -14,7 +14,7 @@ TerrainLayer: m_TileOffset: {x: 0, y: 0} m_Specular: {r: 0, g: 0, b: 0, a: 0} m_Metallic: 0 - m_Smoothness: 0 + m_Smoothness: 0.29 m_NormalScale: 1 m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/Terrains/Grass Layer.terrainlayer b/Assets/Terrains/Grass Layer.terrainlayer index 0d30170..7ba3579 100644 --- a/Assets/Terrains/Grass Layer.terrainlayer +++ b/Assets/Terrains/Grass Layer.terrainlayer @@ -14,7 +14,7 @@ TerrainLayer: m_TileOffset: {x: 0, y: 0} m_Specular: {r: 0, g: 0, b: 0, a: 0} m_Metallic: 0 - m_Smoothness: 0 + m_Smoothness: 0.209 m_NormalScale: 1 m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/Textures/Dirt.png b/Assets/Textures/Dirt.png index 3ede07f..0341092 100644 Binary files a/Assets/Textures/Dirt.png and b/Assets/Textures/Dirt.png differ