diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 4fc150e..cc92df8 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -8438,14 +8438,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 75796153} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 0 m_Color: {r: 1, g: 0.9946615, b: 0.8254717, a: 1} m_Intensity: 1 m_Range: 30 m_SpotAngle: 70 m_InnerSpotAngle: 1 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 1 m_Resolution: -1 @@ -20639,14 +20639,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 190349998} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.7 m_Range: 80 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -22057,14 +22057,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 202452458} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.7 m_Range: 100 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -25712,14 +25712,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 232458814} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 60 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -26613,14 +26613,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 238935305} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.7 m_Range: 50 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -30733,14 +30733,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 274867499} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 80 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -44919,14 +44919,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 393229417} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 80 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -55236,14 +55236,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479326425} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 1 m_Range: 60 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -57616,7 +57616,6 @@ Terrain: m_AllowAutoConnect: 1 m_EnableHeightmapRayTracing: 1 m_EnableTreesAndDetailsRayTracing: 0 - m_EnableHeightmapLODFrustumCulling: 1 m_TreeMotionVectorModeOverride: 3 --- !u!4 &500605641 Transform: @@ -61347,14 +61346,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 526050772} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 0 m_Color: {r: 0.6156863, g: 0.6901961, b: 0.78039217, a: 1} m_Intensity: 0.7 m_Range: 1000 m_SpotAngle: 60 m_InnerSpotAngle: 12 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 2 m_Resolution: -1 @@ -111459,6 +111458,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -111480,9 +111481,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &993688091 MeshFilter: @@ -124578,14 +124581,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113175257} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 2 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.7 m_Range: 70 m_SpotAngle: 77 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -160490,6 +160493,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -160511,9 +160516,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1456076440 MeshFilter: @@ -166305,6 +166312,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -166326,9 +166335,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1514552604 MeshFilter: @@ -169970,7 +169981,7 @@ Transform: m_GameObject: {fileID: 1549220080} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.31, z: 0} + m_LocalPosition: {x: 0, y: 0.103, z: 0.43} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -170004,7 +170015,7 @@ ArticulationBody: m_Enabled: 1 serializedVersion: 6 m_Mass: 0.1 - m_ParentAnchorPosition: {x: 0, y: 0.30999997, z: 0} + m_ParentAnchorPosition: {x: 0, y: 0.103, z: 0.4299988} m_ParentAnchorRotation: {x: 0, y: 0, z: 0, w: 1} m_AnchorPosition: {x: 0, y: 0, z: 0} m_AnchorRotation: {x: 0, y: 0, z: 0, w: 1} @@ -175231,6 +175242,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -175252,9 +175265,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1594045262 MeshFilter: @@ -180545,14 +180560,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1643870768} m_Enabled: 1 - serializedVersion: 11 + serializedVersion: 12 m_Type: 0 m_Color: {r: 1, g: 0.9946615, b: 0.8254717, a: 1} m_Intensity: 1 m_Range: 30 m_SpotAngle: 70 m_InnerSpotAngle: 1 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 1 m_Resolution: -1 @@ -186456,6 +186471,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -186477,9 +186494,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1697588534 MeshFilter: @@ -220723,6 +220742,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -220744,9 +220765,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2011357769 MeshFilter: @@ -225697,7 +225720,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: laser_sensor_link: {fileID: 1549220080} - robot_base_link: {fileID: 915175386} + robot_base_link: {fileID: 1549220081} point_cloud_topic: /point_cloud pose_topic: /laser_scan_pose _frequency: 10 @@ -225705,7 +225728,7 @@ MonoBehaviour: RangeMetersMin: 0 RangeMetersMax: 100 fov_horizontal: 360 - fov_vertical: 45 + fov_vertical: 90 angularResolution_vertical: 1 angularResolution_horizontal: 1 showPointCloud: 0 @@ -226566,6 +226589,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -226587,9 +226612,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2069775186 MeshFilter: diff --git a/Packages/manifest.json b/Packages/manifest.json index 3775851..ff151b8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,7 +5,7 @@ "com.unity.feature.development": "1.0.2", "com.unity.inputsystem": "1.19.0", "com.unity.mathematics": "1.3.3", - "com.unity.multiplayer.center": "1.0.0", + "com.unity.multiplayer.center": "1.0.1", "com.unity.robotics.ros-tcp-connector": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.ros-tcp-connector", "com.unity.robotics.urdf-importer": "https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.5.2", "com.unity.robotics.visualizations": "https://github.com/Unity-Technologies/ROS-TCP-Connector.git?path=/com.unity.robotics.visualizations", @@ -13,6 +13,7 @@ "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.11", "com.unity.modules.accessibility": "1.0.0", + "com.unity.modules.adaptiveperformance": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -39,6 +40,7 @@ "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vectorgraphics": "1.0.0", "com.unity.modules.vehicles": "1.0.0", "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 985b4db..8e0c05e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -78,7 +78,7 @@ "url": "https://packages.unity.com" }, "com.unity.multiplayer.center": { - "version": "1.0.0", + "version": "1.0.1", "depth": 0, "source": "builtin", "dependencies": { @@ -116,7 +116,7 @@ "hash": "c27f00c6cf750d2d0564349b3039d19aa3925e7c" }, "com.unity.settings-manager": { - "version": "2.1.0", + "version": "2.1.1", "depth": 2, "source": "registry", "dependencies": {}, @@ -179,6 +179,14 @@ "source": "builtin", "dependencies": {} }, + "com.unity.modules.adaptiveperformance": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.subsystems": "1.0.0" + } + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -321,7 +329,8 @@ "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.hierarchycore": "1.0.0", + "com.unity.modules.physics": "1.0.0" } }, "com.unity.modules.umbra": { @@ -385,6 +394,16 @@ "com.unity.modules.imageconversion": "1.0.0" } }, + "com.unity.modules.vectorgraphics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, "com.unity.modules.vehicles": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 9d29725..c9e01d3 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.77f1 -m_EditorVersionWithRevision: 6000.0.77f1 (88f89d0d8b31) +m_EditorVersion: 6000.3.9f1 +m_EditorVersionWithRevision: 6000.3.9f1 (7a9955a4f2fa)