From 6f30ba06c2a0ad16ccb572677495f68d2ef79a14 Mon Sep 17 00:00:00 2001 From: Sewmina Date: Tue, 18 Mar 2025 20:37:04 +0530 Subject: [PATCH] wheel collider fix --- .vscode/settings.json | 2 +- Assets/Scenes/SampleScene.unity | 230 +++++++-------------- Assets/Scripts/CarController.cs | 11 +- Assets/Settings/Renderer2D.asset | 16 +- Assets/Wheel.physicsMaterial2D | 11 + Assets/Wheel.physicsMaterial2D.meta | 8 + Assets/textures/Car.png.meta | 41 +++- Assets/textures/Tire.png.meta | 41 +++- Assets/textures/button_restart.png.meta | 41 +++- Assets/textures/driver-body.png.meta | 41 +++- Assets/textures/driver-head.png.meta | 41 +++- Assets/textures/fuel-canister.png.meta | 41 +++- Assets/textures/gameover btn.png.meta | 41 +++- Assets/textures/terrain-ground.png.meta | 41 +++- Assets/textures/terrain-surface.png.meta | 41 +++- Packages/manifest.json | 1 + Packages/packages-lock.json | 148 ++++++------- ProjectSettings/EditorBuildSettings.asset | 1 - ProjectSettings/GraphicsSettings.asset | 7 +- ProjectSettings/ProjectSettings.asset | 146 +++++++++---- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/SceneTemplateSettings.json | 5 + ProjectSettings/ShaderGraphSettings.asset | 2 - ProjectSettings/URPProjectSettings.asset | 2 +- 24 files changed, 576 insertions(+), 387 deletions(-) create mode 100644 Assets/Wheel.physicsMaterial2D create mode 100644 Assets/Wheel.physicsMaterial2D.meta diff --git a/.vscode/settings.json b/.vscode/settings.json index 00c12f7..97d7014 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -56,5 +56,5 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "Hill Climb Racing.sln" + "dotnet.defaultSolution": "hillclimb2d.sln" } \ No newline at end of file diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ba37f1a..7819515 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 10 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,12 +38,13 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 - m_BakeOnSceneLoad: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,6 +67,9 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -386,7 +390,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 251975963} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -410,9 +413,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &251975967 SpriteRenderer: @@ -431,9 +434,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -612,12 +612,12 @@ MonoBehaviour: m_RequiresColorTexture: 0 m_Version: 2 m_TaaSettings: - m_Quality: 3 - m_FrameInfluence: 0.1 - m_JitterScale: 1 - m_MipBias: 0 - m_VarianceClampScale: 0.9 - m_ContrastAdaptiveSharpening: 0 + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 --- !u!20 &519420031 Camera: m_ObjectHideFlags: 0 @@ -726,14 +726,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} m_Name: m_EditorClassIdentifier: - m_ComponentVersion: 2 + m_ComponentVersion: 1 m_LightType: 4 m_BlendStyleIndex: 0 m_FalloffIntensity: 0.5 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_LightVolumeIntensity: 1 - m_LightVolumeEnabled: 0 + m_LightVolumeIntensityEnabled: 0 m_ApplyToSortingLayers: 00000000 m_LightCookieSprite: {fileID: 0} m_DeprecatedPointLightCookieSprite: {fileID: 0} @@ -743,10 +743,8 @@ MonoBehaviour: m_NormalMapDistance: 3 m_NormalMapQuality: 2 m_UseNormalMap: 0 - m_ShadowsEnabled: 0 + m_ShadowIntensityEnabled: 0 m_ShadowIntensity: 0.75 - m_ShadowSoftness: 0 - m_ShadowSoftnessFalloffIntensity: 0.5 m_ShadowVolumeIntensityEnabled: 0 m_ShadowVolumeIntensity: 0.75 m_LocalBounds: @@ -821,7 +819,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 741241556} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -845,9 +842,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &741241559 SpriteRenderer: @@ -866,9 +863,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -968,9 +962,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1061,7 +1052,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 852906829} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -1085,9 +1075,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &852906833 SpriteRenderer: @@ -1106,9 +1096,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1199,7 +1186,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921893866} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -1223,9 +1209,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &921893870 SpriteRenderer: @@ -1244,9 +1230,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1412,7 +1395,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936140575} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -1436,9 +1418,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &936140579 SpriteRenderer: @@ -1457,9 +1439,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1550,7 +1529,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 954007224} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -1574,9 +1552,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &954007228 SpriteRenderer: @@ -1595,9 +1573,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1796,7 +1771,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1111642476} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -1820,9 +1794,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1111642479 SpriteRenderer: @@ -1841,9 +1815,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1949,7 +1920,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1133858599} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -1973,9 +1943,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1133858603 SpriteRenderer: @@ -1994,9 +1964,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2240,10 +2207,6 @@ MonoBehaviour: m_EnableTangents: 0 m_GeometryCached: 0 m_UTess2D: 1 - m_UpdateShadow: 0 - m_ShadowDetail: 16 - m_ShadowOffset: 0.5 - m_BoundsScale: 2 m_Creator: {fileID: 0} m_Modifiers: [] m_ColliderSegment: @@ -2495,7 +2458,6 @@ MonoBehaviour: - {x: 44.18629, y: -6.8078976} - {x: 24.899296, y: -6.4960074} - {x: -0.95765746, y: -6.0760894} - m_ShadowSegment: [] --- !u!1971053207 &1168726623 SpriteShapeRenderer: m_ObjectHideFlags: 0 @@ -2513,9 +2475,6 @@ SpriteShapeRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2581,7 +2540,6 @@ EdgeCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1168726621} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -2605,8 +2563,7 @@ EdgeCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} m_EdgeRadius: 0 m_Points: @@ -2902,7 +2859,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1208089385} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -2926,9 +2882,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1208089388 SpriteRenderer: @@ -2947,9 +2903,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3059,10 +3012,11 @@ MonoBehaviour: speed: 100 CarTorque: 50 image: {fileID: 935804545} + curSpeed: 0 gameoverpanel: {fileID: 410079986} --- !u!50 &1239444216 Rigidbody2D: - serializedVersion: 5 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3073,8 +3027,8 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 + m_LinearDrag: 0 + m_AngularDrag: 0.05 m_GravityScale: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -3142,7 +3096,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1256340850} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -3166,9 +3119,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1256340854 SpriteRenderer: @@ -3187,9 +3140,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3265,7 +3215,6 @@ BoxCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1264140608} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -3289,8 +3238,7 @@ BoxCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -3301,6 +3249,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 + serializedVersion: 2 m_Size: {x: 19.2, y: 19.2} m_EdgeRadius: 0 --- !u!212 &1264140611 @@ -3320,9 +3269,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3625,7 +3571,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345423472} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -3649,9 +3594,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1345423475 SpriteRenderer: @@ -3670,9 +3615,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3778,7 +3720,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1628735211} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -3802,9 +3743,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1628735215 SpriteRenderer: @@ -3823,9 +3764,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3989,9 +3927,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4070,7 +4005,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1820226056} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -4094,9 +4028,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.32 --- !u!212 &1820226059 SpriteRenderer: @@ -4115,9 +4049,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4155,7 +4086,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!50 &1820226060 Rigidbody2D: - serializedVersion: 5 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4165,11 +4096,11 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 + m_Mass: 0.5 + m_LinearDrag: 0 + m_AngularDrag: 0.05 m_GravityScale: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 890bdf39db3049540a6930e5c46a2bcd, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -4199,7 +4130,7 @@ WheelJoint2D: m_ConnectedAnchor: {x: -2.061, y: -0.17300001} m_Suspension: m_DampingRatio: 0.9 - m_Frequency: 10 + m_Frequency: 100 m_Angle: 0 m_UseMotor: 0 m_Motor: @@ -4364,7 +4295,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830830737} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -4388,9 +4318,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1830830741 SpriteRenderer: @@ -4409,9 +4339,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4502,7 +4429,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1917449426} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -4526,9 +4452,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &1917449430 SpriteRenderer: @@ -4547,9 +4473,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4701,7 +4624,6 @@ PolygonCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2013674329} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -4725,8 +4647,7 @@ PolygonCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} @@ -4798,9 +4719,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4879,7 +4797,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2074062488} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -4903,9 +4820,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.32 --- !u!212 &2074062491 SpriteRenderer: @@ -4924,9 +4841,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4964,7 +4878,7 @@ SpriteRenderer: m_SpriteSortPoint: 0 --- !u!50 &2074062492 Rigidbody2D: - serializedVersion: 5 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4974,11 +4888,11 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 + m_Mass: 0.5 + m_LinearDrag: 0 + m_AngularDrag: 0.05 m_GravityScale: 1 - m_Material: {fileID: 0} + m_Material: {fileID: 6200000, guid: 890bdf39db3049540a6930e5c46a2bcd, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -5008,7 +4922,7 @@ WheelJoint2D: m_ConnectedAnchor: {x: -3.6579998, y: -0.15199998} m_Suspension: m_DampingRatio: 0.9 - m_Frequency: 10 + m_Frequency: 100 m_Angle: 0 m_UseMotor: 0 m_Motor: @@ -5069,7 +4983,6 @@ CircleCollider2D: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2101573082} m_Enabled: 1 - serializedVersion: 3 m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: @@ -5093,9 +5006,9 @@ CircleCollider2D: m_Bits: 4294967295 m_IsTrigger: 1 m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 + m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} + serializedVersion: 2 m_Radius: 0.62 --- !u!212 &2101573086 SpriteRenderer: @@ -5114,9 +5027,6 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Scripts/CarController.cs b/Assets/Scripts/CarController.cs index 113cf1d..3264fd9 100644 --- a/Assets/Scripts/CarController.cs +++ b/Assets/Scripts/CarController.cs @@ -15,6 +15,8 @@ public class CarController : MonoBehaviour public float CarTorque = 10; public UnityEngine.UI.Image image; + public float curSpeed; + // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() @@ -27,14 +29,19 @@ public class CarController : MonoBehaviour { movement = Input.GetAxis("Horizontal"); image.fillAmount = fuel; + + curSpeed = Mathf.Abs(FrontTire.angularVelocity); } public GameObject gameoverpanel; private void FixedUpdate() { if(fuel>0) { - BackTire . AddTorque(-movement* speed * Time.fixedDeltaTime); - FrontTire . AddTorque(-movement* speed * Time.fixedDeltaTime); + if(curSpeed < 1000){ + BackTire . AddTorque(-movement* speed * Time.fixedDeltaTime); + FrontTire . AddTorque(-movement* speed * Time.fixedDeltaTime); + } + carRigidbody.AddTorque(-movement * CarTorque * Time.fixedDeltaTime); }else { diff --git a/Assets/Settings/Renderer2D.asset b/Assets/Settings/Renderer2D.asset index aca5e70..7d96dbb 100644 --- a/Assets/Settings/Renderer2D.asset +++ b/Assets/Settings/Renderer2D.asset @@ -15,14 +15,6 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} - probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3} - probeVolumeResources: - probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3} - probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3} - probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3} - probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3} - probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3} - probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 @@ -49,15 +41,17 @@ MonoBehaviour: m_CameraSortingLayerDownsamplingMethod: 0 m_MaxLightRenderTextureCount: 16 m_MaxShadowRenderTextureCount: 1 - m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3} + m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} + m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3} + m_PointLightShader: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3} + m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3} m_CoreBlitShader: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} - m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} + m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} - m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3} m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} m_PostProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} diff --git a/Assets/Wheel.physicsMaterial2D b/Assets/Wheel.physicsMaterial2D new file mode 100644 index 0000000..78c85e0 --- /dev/null +++ b/Assets/Wheel.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wheel + friction: 3 + bounciness: 0 diff --git a/Assets/Wheel.physicsMaterial2D.meta b/Assets/Wheel.physicsMaterial2D.meta new file mode 100644 index 0000000..4243a64 --- /dev/null +++ b/Assets/Wheel.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 890bdf39db3049540a6930e5c46a2bcd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/textures/Car.png.meta b/Assets/textures/Car.png.meta index 333034f..5b40000 100644 --- a/Assets/textures/Car.png.meta +++ b/Assets/textures/Car.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: -7921649188387484213 second: Car_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + Car_0: -7921649188387484213 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/Tire.png.meta b/Assets/textures/Tire.png.meta index 53d3d55..6023c74 100644 --- a/Assets/textures/Tire.png.meta +++ b/Assets/textures/Tire.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 7840321886762619669 second: Tire_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + Tire_0: 7840321886762619669 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/button_restart.png.meta b/Assets/textures/button_restart.png.meta index b675d00..74f9eb9 100644 --- a/Assets/textures/button_restart.png.meta +++ b/Assets/textures/button_restart.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 913278236245225271 second: button_restart_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + button_restart_0: 913278236245225271 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/driver-body.png.meta b/Assets/textures/driver-body.png.meta index b18662f..9b8c7eb 100644 --- a/Assets/textures/driver-body.png.meta +++ b/Assets/textures/driver-body.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: -8860973419932064741 second: driver-body_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + driver-body_0: -8860973419932064741 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/driver-head.png.meta b/Assets/textures/driver-head.png.meta index 312884a..da9372d 100644 --- a/Assets/textures/driver-head.png.meta +++ b/Assets/textures/driver-head.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 5613529948781774630 second: driver-head_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + driver-head_0: 5613529948781774630 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/fuel-canister.png.meta b/Assets/textures/fuel-canister.png.meta index 1c7b059..5a8cc24 100644 --- a/Assets/textures/fuel-canister.png.meta +++ b/Assets/textures/fuel-canister.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 303566864525062164 second: fuel-canister_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + fuel-canister_0: 303566864525062164 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/gameover btn.png.meta b/Assets/textures/gameover btn.png.meta index 426ad3b..7aca00c 100644 --- a/Assets/textures/gameover btn.png.meta +++ b/Assets/textures/gameover btn.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: -6460670228367096926 second: gameover btn_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + gameover btn_0: -6460670228367096926 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/terrain-ground.png.meta b/Assets/textures/terrain-ground.png.meta index 4360ac1..6ff13e0 100644 --- a/Assets/textures/terrain-ground.png.meta +++ b/Assets/textures/terrain-ground.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: -7267657299797195149 second: terrain-ground_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + terrain-ground_0: -7267657299797195149 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/textures/terrain-surface.png.meta b/Assets/textures/terrain-surface.png.meta index 44322f7..bf08db7 100644 --- a/Assets/textures/terrain-surface.png.meta +++ b/Assets/textures/terrain-surface.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 3657438619248086131 second: terrain-surface_0 externalObjects: {} - serializedVersion: 13 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -70,7 +70,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,7 +83,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +96,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 + - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,6 +109,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -123,7 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} - customData: outline: [] physicsShape: [] tessellationDetail: -1 @@ -135,7 +160,6 @@ TextureImporter: edges: [] weights: [] outline: [] - customData: physicsShape: [] bones: [] spriteID: @@ -145,9 +169,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} + nameFileIdTable: + terrain-surface_0: 3657438619248086131 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Packages/manifest.json b/Packages/manifest.json index 84112a1..0228133 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,6 +9,7 @@ "com.unity.render-pipelines.universal": "17.0.3", "com.unity.test-framework": "1.4.5", "com.unity.timeline": "1.8.7", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.5", "com.unity.modules.accessibility": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 6680274..c1c5afb 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,20 +1,20 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "10.1.4", + "version": "9.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.7", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.collections": "1.2.4", + "com.unity.collections": "1.1.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.1.7", + "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": { @@ -26,11 +26,11 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "9.0.7", + "version": "8.0.1", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.4", + "com.unity.burst": "1.7.3", "com.unity.2d.sprite": "1.0.0", "com.unity.mathematics": "1.1.0", "com.unity.modules.animation": "1.0.0", @@ -46,12 +46,13 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "9.0.3", + "version": "8.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.4", - "com.unity.2d.sprite": "1.0.0" + "com.unity.2d.common": "8.0.1", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.animation": "9.0.1" }, "url": "https://packages.unity.com" }, @@ -62,11 +63,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "10.0.7", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.7", + "com.unity.2d.common": "8.0.1", "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, @@ -82,10 +83,11 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "4.1.0", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { + "com.unity.ugui": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.modules.tilemap": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" @@ -93,12 +95,11 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", - "depth": 2, + "version": "1.8.7", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" }, @@ -110,19 +111,17 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.1", + "version": "1.2.4", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.test-framework": "1.4.5", - "com.unity.nuget.mono-cecil": "1.11.4", - "com.unity.test-framework.performance": "3.0.3" + "com.unity.burst": "1.6.6", + "com.unity.test-framework": "1.1.31" }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "2.0.5", + "version": "2.0.3", "depth": 1, "source": "registry", "dependencies": {}, @@ -133,14 +132,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "10.1.4", + "com.unity.2d.animation": "9.0.3", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "9.0.3", + "com.unity.2d.psdimporter": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "10.0.7", + "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "4.1.0", - "com.unity.2d.aseprite": "1.1.7" + "com.unity.2d.tilemap.extras": "3.1.1", + "com.unity.2d.aseprite": "1.0.0" } }, "com.unity.ide.rider": { @@ -171,8 +170,8 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.3.2", - "depth": 2, + "version": "1.2.6", + "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -185,26 +184,15 @@ "com.unity.modules.uielements": "1.0.0" } }, - "com.unity.nuget.mono-cecil": { - "version": "1.11.4", - "depth": 3, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.render-pipelines.core": { - "version": "17.0.3", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.burst": "1.8.14", - "com.unity.mathematics": "1.3.2", - "com.unity.ugui": "2.0.0", - "com.unity.collections": "2.4.3", + "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.rendering.light-transport": "1.0.1" + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.render-pipelines.universal": { @@ -212,27 +200,10 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", - "com.unity.shadergraph": "17.0.3", - "com.unity.render-pipelines.universal-config": "17.0.3" - } - }, - "com.unity.render-pipelines.universal-config": { - "version": "17.0.3", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.render-pipelines.core": "17.0.3" - } - }, - "com.unity.rendering.light-transport": { - "version": "1.0.1", - "depth": 2, - "source": "builtin", - "dependencies": { - "com.unity.collections": "2.2.0", - "com.unity.mathematics": "1.2.4", - "com.unity.modules.terrain": "1.0.0" + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.8.4", + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8" } }, "com.unity.searcher": { @@ -243,14 +214,30 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.3", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.3", + "com.unity.render-pipelines.core": "14.0.8", "com.unity.searcher": "4.9.2" } }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.4.5", "depth": 0, @@ -262,16 +249,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.test-framework.performance": { - "version": "3.0.3", - "depth": 3, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.1.31", - "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { "version": "1.8.7", "depth": 0, @@ -284,6 +261,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.10", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "2.0.0", "depth": 0, @@ -356,12 +343,6 @@ "com.unity.modules.animation": "1.0.0" } }, - "com.unity.modules.hierarchycore": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -450,8 +431,7 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d712d2d..835c33f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -10,4 +10,3 @@ EditorBuildSettings: guid: 8c9cfa26abfee488c85f1582747f6a02 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} - m_UseUCBPForAssetBundles: 0 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index c1d387d..be851a4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 16 + serializedVersion: 15 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -57,11 +57,12 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_RenderPipelineGlobalSettingsMap: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 93b439a37f63240aca3dd4e01d978a9f, type: 2} m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 93b439a37f63240aca3dd4e01d978a9f, type: 2} m_LightProbeOutsideHullStrategy: 0 m_CameraRelativeLightCulling: 0 m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b59fa21..8c18c39 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 28 + serializedVersion: 26 productGUID: 11e4dac208c328c4b96c1b00556d72e4 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,8 +48,6 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 - unsupportedMSAAFallback: 0 - m_SpriteBatchMaxVertexCount: 65535 m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 @@ -71,18 +69,16 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 androidBlitType: 0 - androidResizeableActivity: 1 + androidResizableWindow: 0 androidDefaultWindowWidth: 1920 androidDefaultWindowHeight: 1080 androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 - androidAutoRotationBehavior: 1 - androidPredictiveBackSupport: 0 - androidApplicationEntry: 2 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 0 + captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 @@ -90,7 +86,6 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 - dedicatedServerOptimizations: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -98,7 +93,6 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - meshDeformation: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -130,16 +124,15 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - visionOSBundleVersion: 1.0 - tvOSBundleVersion: 1.0 bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 @@ -152,7 +145,6 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 - allowHDRDisplaySupport: 0 useHDRDisplay: 0 hdrBitDepth: 0 m_ColorGamuts: 00000000 @@ -161,7 +153,6 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.4 - androidMinAspectRatio: 1 applicationIdentifier: Standalone: com.DefaultCompany.2D-URP buildNumber: @@ -181,16 +172,14 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - androidSplitApplicationBinary: 0 + APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSSimulatorArchitecture: 0 iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 - tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 13.0 VisionOSSdkVersion: 0 @@ -219,6 +208,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -226,6 +216,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -235,7 +226,6 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 - metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: @@ -262,12 +252,12 @@ PlayerSettings: useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 - AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -280,14 +270,105 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - AndroidReportGooglePlayAppDependencies: 1 - androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] @@ -305,6 +386,7 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] @@ -312,7 +394,6 @@ PlayerSettings: playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 - editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -328,7 +409,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchEnableFileSystemTrace: 0 + switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -458,14 +539,13 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchDisableHTCSPlayerConnection: 0 + switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 - switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -568,12 +648,7 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 - webGLWebAssemblyTable: 0 - webGLWebAssemblyBigInt: 0 - webGLCloseOnQuit: 0 - webWasm2023: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -581,7 +656,6 @@ PlayerSettings: Android: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} - il2cppStacktraceInformation: {} managedStrippingLevel: Android: 1 EmbeddedLinux: 1 @@ -606,7 +680,6 @@ PlayerSettings: gcIncremental: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} - editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Hill Climb Racing @@ -630,7 +703,6 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 - syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -680,11 +752,9 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 0 - hmiCpuConfiguration: hmiLogStartupTiming: 0 - qnxGraphicConfPath: + hmiCpuConfiguration: apiCompatibilityLevel: 6 - captureStartupLogs: {} activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: 58c1f87f-b0bf-4c67-9108-3a3009f5a7b7 @@ -698,5 +768,3 @@ PlayerSettings: platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 - androidVulkanDenyFilterList: [] - androidVulkanAllowFilterList: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d1c9097..78a7788 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.32f1 -m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c) +m_EditorVersion: 2022.3.7f1 +m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json index ede5887..1edced2 100644 --- a/ProjectSettings/SceneTemplateSettings.json +++ b/ProjectSettings/SceneTemplateSettings.json @@ -56,6 +56,11 @@ "type": "UnityEditor.MonoScript", "defaultInstantiationMode": 1 }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial", diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 10b82f0..a11ed58 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -12,7 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: - shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 - customHeatmapValues: {fileID: 0} diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 08faf03..cd7fd8c 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 7