diff options
| -rw-r--r-- | .idea/.idea.Project SimLife/.idea/indexLayout.xml | 1 | ||||
| -rw-r--r-- | Assets/Scenes/Simulation/SimulationScene.unity | 387 | ||||
| -rw-r--r-- | Assets/Scenes/Simulation/SimulationScene/NavMesh.asset | bin | 45552 -> 7540 bytes | |||
| -rw-r--r-- | Packages/manifest.json | 3 |
4 files changed, 136 insertions, 255 deletions
diff --git a/.idea/.idea.Project SimLife/.idea/indexLayout.xml b/.idea/.idea.Project SimLife/.idea/indexLayout.xml index c35daae..b8a4bdd 100644 --- a/.idea/.idea.Project SimLife/.idea/indexLayout.xml +++ b/.idea/.idea.Project SimLife/.idea/indexLayout.xml @@ -12,7 +12,6 @@ <Path>Library/PackageCache/com.unity.ide.vscode@1.0.7</Path> <Path>Library/PackageCache/com.unity.multiplayer-hlapi@1.0.2</Path> <Path>Library/PackageCache/com.unity.purchasing@2.0.6</Path> - <Path>Library/PackageCache/com.unity.terrain-tools@2.0.2-preview</Path> <Path>Library/PackageCache/com.unity.test-framework@1.1.3</Path> <Path>Library/PackageCache/com.unity.textmeshpro@2.0.1</Path> <Path>Library/PackageCache/com.unity.timeline@1.2.2</Path> diff --git a/Assets/Scenes/Simulation/SimulationScene.unity b/Assets/Scenes/Simulation/SimulationScene.unity index 6f2d8dc..34b07d0 100644 --- a/Assets/Scenes/Simulation/SimulationScene.unity +++ b/Assets/Scenes/Simulation/SimulationScene.unity @@ -96,6 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -230,12 +231,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1097722060} m_PrefabAsset: {fileID: 0} ---- !u!224 &100855064 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - m_PrefabInstance: {fileID: 2099133823} - m_PrefabAsset: {fileID: 0} --- !u!1 &105439954 GameObject: m_ObjectHideFlags: 0 @@ -291,8 +286,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: Hunger m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fa623acb39bd0fa47807173407e82458, type: 2} @@ -449,8 +442,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: Live Mode m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fa623acb39bd0fa47807173407e82458, type: 2} @@ -577,8 +568,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170076733} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -643,6 +635,100 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &235540187 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 235540188} + - component: {fileID: 235540191} + - component: {fileID: 235540190} + - component: {fileID: 235540189} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 8 + m_IsActive: 1 +--- !u!4 &235540188 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235540187} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -763.7, y: -294.5, z: 421.1} + m_LocalScale: {x: 3.5670948, y: 1, z: 4.353871} + m_Children: [] + m_Father: {fileID: 1297664489} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &235540189 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235540187} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &235540190 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235540187} + m_Enabled: 1 + m_CastShadows: 1 + 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: 2100000, guid: 36c291af7aaa425408c96b3a7fd36745, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 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 &235540191 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235540187} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &293571351 GameObject: m_ObjectHideFlags: 0 @@ -698,8 +784,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -806,8 +890,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, Unity.ugui, Version=1.0.0.0, Culture=neutral, - PublicKeyToken=null --- !u!1001 &418420990 PrefabInstance: m_ObjectHideFlags: 0 @@ -1002,57 +1084,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!224 &418420991 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - m_PrefabInstance: {fileID: 418420990} - m_PrefabAsset: {fileID: 0} ---- !u!1 &430691589 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 430691590} - - component: {fileID: 430691591} - m_Layer: 0 - m_Name: Ground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &430691590 +--- !u!4 &418420991 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430691589} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -750.44525, y: -294.66302, z: 402.75} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1912464012} - m_Father: {fileID: 1297664489} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &430691591 -MonoBehaviour: - m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_PrefabInstance: {fileID: 418420990} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 430691589} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ca34a6148db2d54493f84f379293f33, type: 3} - m_Name: - m_EditorClassIdentifier: - GroupID: 0 --- !u!1 &459256038 GameObject: m_ObjectHideFlags: 0 @@ -1091,7 +1127,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -195.2} + m_AnchoredPosition: {x: 140, y: -195.2002} m_SizeDelta: {x: 219.2, y: 71.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &459256040 @@ -1134,8 +1170,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &459256042 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1179,8 +1213,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, Unity.ugui, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &459256043 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1199,8 +1231,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1390,8 +1420,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1521747007} - - {fileID: 100855064} + - {fileID: 806441974} + - {fileID: 2099133824} - {fileID: 418420991} - {fileID: 1912335701} - {fileID: 696920783} @@ -1421,8 +1451,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1475,7 +1503,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 491.1, y: -106.5} + m_AnchoredPosition: {x: 491.0996, y: -106.5} m_SizeDelta: {x: 882.1, y: 108.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &617386312 @@ -1496,8 +1524,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: 'Unicity - Experimental 3 Please note that game is under active development, @@ -1659,8 +1685,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1853,10 +1877,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!224 &696920783 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} +--- !u!4 &696920783 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 696920782} m_PrefabAsset: {fileID: 0} --- !u!1001 &806441973 @@ -2043,6 +2066,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} +--- !u!4 &806441974 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 806441973} + m_PrefabAsset: {fileID: 0} --- !u!1 &820064512 GameObject: m_ObjectHideFlags: 0 @@ -2098,8 +2126,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: Bladder m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: fa623acb39bd0fa47807173407e82458, type: 2} @@ -2256,8 +2282,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2437,10 +2461,9 @@ PrefabInstance: type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!224 &950227355 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} +--- !u!4 &950227355 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 950227354} m_PrefabAsset: {fileID: 0} --- !u!1 &1012510672 @@ -2478,7 +2501,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -6.17511, y: -224.70001} + m_AnchoredPosition: {x: -6.1748047, y: -224.7002} m_SizeDelta: {x: -12.35, y: -449.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1012510674 @@ -2499,8 +2522,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2937,10 +2958,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!224 &1187805769 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} +--- !u!4 &1187805769 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 1187805768} m_PrefabAsset: {fileID: 0} --- !u!1 &1297664488 @@ -2971,8 +2991,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1353580679} - - {fileID: 430691590} - {fileID: 1456343334} + - {fileID: 235540188} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3028,6 +3048,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3068,11 +3089,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1456343330} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -770.42, y: -292.672, z: 414.03} + m_LocalPosition: {x: -770.42, y: -292.76, z: 414.03} m_LocalScale: {x: 3.6077, y: 3.5311, z: 3.8071} m_Children: [] m_Father: {fileID: 1297664489} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1485259022 GameObject: @@ -3140,12 +3161,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!224 &1521747007 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - m_PrefabInstance: {fileID: 806441973} - m_PrefabAsset: {fileID: 0} --- !u!1 &1541253347 GameObject: m_ObjectHideFlags: 0 @@ -3201,8 +3216,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -3500,10 +3513,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!224 &1687973897 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} +--- !u!4 &1687973897 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 1687973896} m_PrefabAsset: {fileID: 0} --- !u!114 &1687973899 stripped @@ -3642,8 +3654,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, Unity.ugui, Version=1.0.0.0, Culture=neutral, - PublicKeyToken=null --- !u!1001 &1912335700 PrefabInstance: m_ObjectHideFlags: 0 @@ -3833,141 +3843,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!224 &1912335701 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - m_PrefabInstance: {fileID: 1912335700} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1912464011 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1912464012} - - component: {fileID: 1912464015} - - component: {fileID: 1912464014} - - component: {fileID: 1912464013} - - component: {fileID: 1912464016} - m_Layer: 0 - m_Name: Terrain_0_0_5f88b4f2-8806-485f-98ba-4706e0bd9db5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967294 - m_IsActive: 1 ---- !u!4 &1912464012 +--- !u!4 &1912335701 stripped Transform: - m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1912464011} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -280.41, y: 0.2, z: -318.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 430691590} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1912464013 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1912464011} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 36c291af7aaa425408c96b3a7fd36745, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 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!154 &1912464014 -TerrainCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1912464011} - m_Material: {fileID: 0} - m_Enabled: 1 - m_TerrainData: {fileID: 15600000, guid: 0b4c8ec6deec056cdb3b33b4412a90f8, type: 2} - m_EnableTreeColliders: 1 ---- !u!218 &1912464015 -Terrain: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1912464011} - m_Enabled: 1 - serializedVersion: 5 - m_TerrainData: {fileID: 15600000, guid: 0b4c8ec6deec056cdb3b33b4412a90f8, type: 2} - m_TreeDistance: 5000 - m_TreeBillboardDistance: 50 - m_TreeCrossFadeLength: 5 - m_TreeMaximumFullLODCount: 50 - m_DetailObjectDistance: 80 - m_DetailObjectDensity: 1 - m_HeightmapPixelError: 5 - m_SplatMapDistance: 1024 - m_HeightmapMaximumLOD: 0 - m_ShadowCastingMode: 2 - m_DrawHeightmap: 1 - m_DrawInstanced: 1 - m_DrawTreesAndFoliage: 1 - m_ReflectionProbeUsage: 1 - m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0} - m_BakeLightProbesForTrees: 1 - m_PreserveTreePrototypeLayers: 0 - m_DeringLightProbesForTrees: 1 - m_ScaleInLightmap: 1 - m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} - m_GroupingID: 0 - m_AllowAutoConnect: 1 ---- !u!64 &1912464016 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_PrefabInstance: {fileID: 1912335700} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1912464011} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1981482350 GameObject: m_ObjectHideFlags: 0 @@ -4023,8 +3903,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -4222,6 +4100,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} +--- !u!4 &2099133824 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 2099133823} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4565202065387174607 PrefabInstance: m_ObjectHideFlags: 0 @@ -4232,17 +4115,17 @@ PrefabInstance: - target: {fileID: 4565202064592222792, guid: cebbfcca86dbe324e8f832a0f0d98d48, type: 3} propertyPath: m_LocalPosition.x - value: -750.49524 + value: -767.84 objectReference: {fileID: 0} - target: {fileID: 4565202064592222792, guid: cebbfcca86dbe324e8f832a0f0d98d48, type: 3} propertyPath: m_LocalPosition.y - value: -293.456 + value: -293.58 objectReference: {fileID: 0} - target: {fileID: 4565202064592222792, guid: cebbfcca86dbe324e8f832a0f0d98d48, type: 3} propertyPath: m_LocalPosition.z - value: 398.125 + value: 406.13 objectReference: {fileID: 0} - target: {fileID: 4565202064592222792, guid: cebbfcca86dbe324e8f832a0f0d98d48, type: 3} diff --git a/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset b/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset Binary files differindex 4d8a823..1148295 100644 --- a/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset +++ b/Assets/Scenes/Simulation/SimulationScene/NavMesh.asset diff --git a/Packages/manifest.json b/Packages/manifest.json index 08a09c6..389083f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -12,12 +12,11 @@ "com.unity.multiplayer-hlapi": "1.0.2", "com.unity.package-manager-ui": "2.2.0", "com.unity.purchasing": "2.0.6", - "com.unity.terrain-tools": "2.0.2-preview", "com.unity.test-framework": "1.1.3", "com.unity.textmeshpro": "2.0.1", "com.unity.timeline": "1.2.2", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.0.2", + "com.unity.xr.legacyinputhelpers": "2.0.6", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", |
