From 1002e27db4576ae7a9081d1e23c6e16af81f222a Mon Sep 17 00:00:00 2001 From: Valdimir Date: Mon, 20 Feb 2023 23:08:24 +0200 Subject: [PATCH] Code refactor --- Assets/Prefabs/Wall.prefab | 354 ---- Assets/Prefabs/Wall.prefab.meta | 7 - Assets/Scenes/TestRoom.unity | 1425 +++++------------ Assets/Scenes/TestRoom/NavMesh.asset | Bin 7228 -> 7864 bytes Assets/Scripts/EventArgs.cs | 12 + Assets/Scripts/EventArgs.cs.meta | 11 + Assets/Scripts/MouseInputManager.cs | 50 + ...tion.cs.meta => MouseInputManager.cs.meta} | 0 Assets/Scripts/MouseSelection.cs | 59 - Assets/Scripts/PlayerManager.cs | 58 +- Assets/Scripts/SelectedVisual.cs | 6 +- Assets/Scripts/WaypointVisual.cs | 25 + Assets/Scripts/WaypointVisual.cs.meta | 11 + ProjectSettings/TagManager.asset | 6 +- 14 files changed, 577 insertions(+), 1447 deletions(-) delete mode 100644 Assets/Prefabs/Wall.prefab delete mode 100644 Assets/Prefabs/Wall.prefab.meta create mode 100644 Assets/Scripts/EventArgs.cs create mode 100644 Assets/Scripts/EventArgs.cs.meta create mode 100644 Assets/Scripts/MouseInputManager.cs rename Assets/Scripts/{MouseSelection.cs.meta => MouseInputManager.cs.meta} (100%) delete mode 100644 Assets/Scripts/MouseSelection.cs create mode 100644 Assets/Scripts/WaypointVisual.cs create mode 100644 Assets/Scripts/WaypointVisual.cs.meta diff --git a/Assets/Prefabs/Wall.prefab b/Assets/Prefabs/Wall.prefab deleted file mode 100644 index 57c210a6..00000000 --- a/Assets/Prefabs/Wall.prefab +++ /dev/null @@ -1,354 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8399722317111019355 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3119355583710269351} - - component: {fileID: 3256707217429579543} - - component: {fileID: 6524694759401631761} - - component: {fileID: 5034232006488667909} - - component: {fileID: 7486695069966556586} - - component: {fileID: 6272804010592829304} - m_Layer: 0 - m_Name: Wall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3119355583710269351 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8399722317111019355} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3256707217429579543 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8399722317111019355} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MeshFormatVersion: 2 - m_Faces: - - m_Indexes: 000000000100000002000000010000000300000002000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 040000000500000006000000050000000700000006000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 08000000090000000a000000090000000b0000000a000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 0c0000000d0000000e0000000d0000000f0000000e000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 100000001100000012000000110000001300000012000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 140000001500000016000000150000001700000016000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - m_SharedVertices: - - m_Vertices: 000000000d00000016000000 - - m_Vertices: 010000000400000017000000 - - m_Vertices: 020000000f00000010000000 - - m_Vertices: 030000000600000011000000 - - m_Vertices: 050000000800000015000000 - - m_Vertices: 070000000a00000013000000 - - m_Vertices: 090000000c00000014000000 - - m_Vertices: 0b0000000e00000012000000 - m_SharedTextures: [] - m_Positions: - - {x: -0.000000059604645, y: 0.049504757, z: 1} - - {x: 0.099999964, y: 0.049504757, z: 1} - - {x: -0.000000059604645, y: 2.5495048, z: 1} - - {x: 0.099999964, y: 2.5495048, z: 1} - - {x: 0.099999964, y: 0.049504757, z: 1} - - {x: 0.099999964, y: 0.049504757, z: 0} - - {x: 0.099999964, y: 2.5495048, z: 1} - - {x: 0.099999964, y: 2.5495048, z: 0} - - {x: 0.099999964, y: 0.049504757, z: 0} - - {x: -0.000000059604645, y: 0.049504757, z: 0} - - {x: 0.099999964, y: 2.5495048, z: 0} - - {x: -0.000000059604645, y: 2.5495048, z: 0} - - {x: -0.000000059604645, y: 0.049504757, z: 0} - - {x: -0.000000059604645, y: 0.049504757, z: 1} - - {x: -0.000000059604645, y: 2.5495048, z: 0} - - {x: -0.000000059604645, y: 2.5495048, z: 1} - - {x: -0.000000059604645, y: 2.5495048, z: 1} - - {x: 0.099999964, y: 2.5495048, z: 1} - - {x: -0.000000059604645, y: 2.5495048, z: 0} - - {x: 0.099999964, y: 2.5495048, z: 0} - - {x: -0.000000059604645, y: 0.049504757, z: 0} - - {x: 0.099999964, y: 0.049504757, z: 0} - - {x: -0.000000059604645, y: 0.049504757, z: 1} - - {x: 0.099999964, y: 0.049504757, z: 1} - m_Textures0: - - {x: 0.000000059604645, y: 0.049504757} - - {x: -0.099999964, y: 0.049504757} - - {x: 0.000000059604645, y: 2.5495048} - - {x: -0.099999964, y: 2.5495048} - - {x: 1, y: 0.049504757} - - {x: 0, y: 0.049504757} - - {x: 1, y: 2.5495048} - - {x: 0, y: 2.5495048} - - {x: 0.099999964, y: 0.049504757} - - {x: -0.000000059604645, y: 0.049504757} - - {x: 0.099999964, y: 2.5495048} - - {x: -0.000000059604645, y: 2.5495048} - - {x: 0, y: 0.049504757} - - {x: -1, y: 0.049504757} - - {x: 0, y: 2.5495048} - - {x: -1, y: 2.5495048} - - {x: -0.000000059604645, y: 1} - - {x: 0.099999964, y: 1} - - {x: -0.000000059604645, y: 0} - - {x: 0.099999964, y: 0} - - {x: 0.000000059604645, y: 0} - - {x: -0.099999964, y: 0} - - {x: 0.000000059604645, y: 1} - - {x: -0.099999964, y: 1} - m_Textures2: [] - m_Textures3: [] - m_Tangents: - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 0, y: 0, z: 1, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 0, y: 0, z: -1, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - - {x: -1, y: 0, z: 0, w: -1} - m_Colors: [] - m_UnwrapParameters: - m_HardAngle: 88 - m_PackMargin: 20 - m_AngleError: 8 - m_AreaError: 15 - m_PreserveMeshAssetOnDestroy: 0 - assetGuid: - m_Mesh: {fileID: 0} - m_VersionIndex: 2064 - m_IsSelectable: 1 - m_SelectedFaces: - m_SelectedEdges: [] - m_SelectedVertices: ---- !u!114 &6524694759401631761 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8399722317111019355} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Shape: - rid: 5572245130708779022 - m_Size: {x: 0.100000024, y: 2.5, z: 1} - m_Rotation: {x: 0, y: 0, z: 0, w: 1} - m_PivotLocation: 1 - m_PivotPosition: {x: 0, y: 0, z: 0} - m_UnmodifiedMeshVersion: 2064 - m_ShapeBox: - m_Center: {x: 0.049999952, y: 1.2995048, z: 0.5} - m_Extent: {x: 0.050000012, y: 1.25, z: 0.5} - references: - version: 2 - RefIds: - - rid: 5572245130708779022 - type: {class: Cube, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder} ---- !u!23 &5034232006488667909 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8399722317111019355} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, 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: 2 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &7486695069966556586 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8399722317111019355} - m_Mesh: {fileID: 0} ---- !u!64 &6272804010592829304 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8399722317111019355} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} diff --git a/Assets/Prefabs/Wall.prefab.meta b/Assets/Prefabs/Wall.prefab.meta deleted file mode 100644 index 8999dcc8..00000000 --- a/Assets/Prefabs/Wall.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1c605345aec331b4a97ead2a4d92e573 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/TestRoom.unity b/Assets/Scenes/TestRoom.unity index 1e11cfdd..bb433dee 100644 --- a/Assets/Scenes/TestRoom.unity +++ b/Assets/Scenes/TestRoom.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.4496541, g: 0.4997235, b: 0.57564855, a: 1} + m_IndirectSpecularColor: {r: 0.44965446, g: 0.4997244, b: 0.5756495, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -164,9 +164,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 21.641119, y: 627.59247} + m_AnchoredPosition: {x: -39.961277, y: 591.0552} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5112714, y: 1.0971993} + m_Pivot: {x: 0.47918683, y: 1.1045628} --- !u!114 &3676872 MonoBehaviour: m_ObjectHideFlags: 0 @@ -520,7 +520,7 @@ GameObject: m_Component: - component: {fileID: 101167831} - component: {fileID: 101167830} - m_Layer: 0 + m_Layer: 7 m_Name: Path m_TagString: Untagged m_Icon: {fileID: 0} @@ -746,7 +746,6 @@ Transform: m_Children: - {fileID: 869775877} - {fileID: 1367711699} - - {fileID: 1460429304} - {fileID: 2074665157} m_Father: {fileID: 0} m_RootOrder: 5 @@ -1237,7 +1236,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh63576 + m_Name: pb_Mesh89016 serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 @@ -2400,10 +2399,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c802a0d9d32b0c04b841113e87b83e4b, type: 3} m_Name: m_EditorClassIdentifier: + _walkableLayer: + serializedVersion: 2 + m_Bits: 128 _navAgent: {fileID: 871823190} _animator: {fileID: 1476341268} _camera: {fileID: 963194227} - _targetDest: {fileID: 1359374190} allowMovement: 1 --- !u!4 &871823189 Transform: @@ -2419,7 +2420,7 @@ Transform: m_Children: - {fileID: 1476341267} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!195 &871823190 NavMeshAgent: @@ -4086,6 +4087,7 @@ Transform: - {fileID: 2047049769} - {fileID: 1550470211} - {fileID: 476025399} + - {fileID: 1689632238} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4679,6 +4681,53 @@ Transform: m_Father: {fileID: 101167831} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1183172156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1183172157} + - component: {fileID: 1183172158} + m_Layer: 0 + m_Name: WayPointSign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1183172157 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1183172156} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1359374191} + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1183172158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1183172156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae5ecbfd9a3637247b4cd539f9a57316, type: 3} + m_Name: + m_EditorClassIdentifier: + _particleSystem: {fileID: 1359374190} + _wayPoint: {fileID: 1183172157} --- !u!1 &1208778160 GameObject: m_ObjectHideFlags: 0 @@ -5337,7 +5386,7 @@ GameObject: - component: {fileID: 1359374190} - component: {fileID: 1359374189} m_Layer: 0 - m_Name: WalkPoint + m_Name: Particles m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10203,14 +10252,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1359374188} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 1.856, y: 0.049, z: 1.86} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_Father: {fileID: 1183172157} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1367711693 GameObject: m_ObjectHideFlags: 0 @@ -10225,7 +10274,7 @@ GameObject: - component: {fileID: 1367711696} - component: {fileID: 1367711695} - component: {fileID: 1367711694} - m_Layer: 0 + m_Layer: 7 m_Name: Floor m_TagString: Untagged m_Icon: {fileID: 0} @@ -10565,6 +10614,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1402372336} + - component: {fileID: 1402372337} m_Layer: 6 m_Name: Fridge m_TagString: Untagged @@ -10580,15 +10630,36 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1402372335} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 8.06} + m_LocalPosition: {x: 0, y: 0, z: 8.789} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1951493909} - {fileID: 697239597} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!65 &1402372337 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1402372335} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.94, y: 1.96, z: 1.09} + m_Center: {x: 0.09, y: 1.02, z: 0} --- !u!1 &1429085338 GameObject: m_ObjectHideFlags: 0 @@ -10710,805 +10781,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1429085338} m_CullTransparentMesh: 1 ---- !u!1 &1460429298 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1460429304} - - component: {fileID: 1460429303} - - component: {fileID: 1460429302} - - component: {fileID: 1460429301} - - component: {fileID: 1460429300} - - component: {fileID: 1460429299} - m_Layer: 0 - m_Name: Walls - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!64 &1460429299 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460429298} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 1838430168} ---- !u!33 &1460429300 -MeshFilter: - m_ObjectHideFlags: 10 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460429298} - m_Mesh: {fileID: 1838430168} ---- !u!23 &1460429301 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460429298} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, 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: 2 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1460429302 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460429298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Shape: - rid: 5572245130708779061 - m_Size: {x: 0.1, y: 0, z: 1} - m_Rotation: {x: 0, y: 0, z: 0, w: 1} - m_PivotLocation: 1 - m_PivotPosition: {x: 0, y: 0, z: 0} - m_UnmodifiedMeshVersion: 1184 - m_ShapeBox: - m_Center: {x: -0.025332928, y: 0.0001, z: 0.22955143} - m_Extent: {x: 0.5, y: 0, z: 0.5} - references: - version: 2 - RefIds: - - rid: 5572245130708779061 - type: {class: Plane, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder} - data: - m_HeightSegments: 0 - m_WidthSegments: 0 ---- !u!114 &1460429303 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460429298} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MeshFormatVersion: 2 - m_Faces: - - m_Indexes: 000000000100000002000000010000000300000002000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 060000000500000004000000060000000700000005000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 0a00000009000000080000000a0000000b00000009000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 0e0000000d0000000c0000000e0000000f0000000d000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 120000001100000010000000120000001300000011000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 160000001500000014000000160000001700000015000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 1a00000019000000180000001a0000001b00000019000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 1e0000001d0000001c0000001e0000001f0000001d000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 220000002100000020000000220000002300000021000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 260000002500000024000000260000002700000025000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 2a00000029000000280000002a0000002b00000029000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 2e0000002d0000002c0000002e0000002f0000002d000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 320000003100000030000000320000003300000031000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 360000003500000034000000360000003700000035000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 3a00000039000000380000003a0000003b00000039000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - - m_Indexes: 3e0000003d0000003c0000003e0000003f0000003d000000 - m_SmoothingGroup: 0 - m_Uv: - m_UseWorldSpace: 0 - m_FlipU: 0 - m_FlipV: 0 - m_SwapUV: 0 - m_Fill: 1 - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Rotation: 0 - m_Anchor: 9 - m_Material: {fileID: 0} - m_SubmeshIndex: 0 - m_ManualUV: 0 - elementGroup: -1 - m_TextureGroup: -1 - m_SharedVertices: - - m_Vertices: 0000000004000000 - - m_Vertices: 010000000500000008000000 - - m_Vertices: 02000000 - - m_Vertices: 03000000090000000d000000 - - m_Vertices: 06000000 - - m_Vertices: 07000000 - - m_Vertices: 0a000000 - - m_Vertices: 0b0000000c000000 - - m_Vertices: 0e00000010000000 - - m_Vertices: 0f00000011000000 - - m_Vertices: 1200000014000000 - - m_Vertices: 1300000015000000 - - m_Vertices: 1600000018000000 - - m_Vertices: 17000000190000001d000000 - - m_Vertices: 1a000000 - - m_Vertices: 1b0000001c000000 - - m_Vertices: 1e00000020000000 - - m_Vertices: 1f00000021000000 - - m_Vertices: 2200000024000000 - - m_Vertices: 2300000025000000 - - m_Vertices: 2600000028000000 - - m_Vertices: 27000000290000002d000000 - - m_Vertices: 2a000000 - - m_Vertices: 2b0000002c000000 - - m_Vertices: 2e00000030000000 - - m_Vertices: 2f00000031000000 - - m_Vertices: 3200000034000000 - - m_Vertices: 3300000035000000 - - m_Vertices: 3600000038000000 - - m_Vertices: 3700000039000000 - - m_Vertices: 3a0000003c000000 - - m_Vertices: 3b0000003d000000 - - m_Vertices: 3e000000 - - m_Vertices: 3f000000 - m_SharedTextures: [] - m_Positions: - - {x: -0.075332925, y: 0.0001, z: -0.27044857} - - {x: -0.07533312, y: 0.0001, z: 9.725733} - - {x: 0.024667073, y: 0.0001, z: -0.27044857} - - {x: 0.024667263, y: 0.0001, z: 9.725733} - - {x: -0.075332925, y: 0.0001, z: -0.27044857} - - {x: -0.07533312, y: 0.0001, z: 9.725733} - - {x: -0.075332925, y: 0.0001, z: -0.27044857} - - {x: -0.075332925, y: 0.0001, z: 0.72955143} - - {x: -0.07533312, y: 0.0001, z: 9.725733} - - {x: 0.024667263, y: 0.0001, z: 9.725733} - - {x: -0.07533312, y: 0.0001, z: 9.833511} - - {x: 0.024667263, y: 0.0001, z: 9.833511} - - {x: 0.024667263, y: 0.0001, z: 9.833511} - - {x: 0.024667263, y: 0.0001, z: 9.725733} - - {x: 0.4069152, y: 0.0001, z: 9.833511} - - {x: 0.4069152, y: 0.0001, z: 9.725733} - - {x: 0.4069152, y: 0.0001, z: 9.833511} - - {x: 0.4069152, y: 0.0001, z: 9.725733} - - {x: 2.2051752, y: 0.0001, z: 9.833511} - - {x: 2.2051752, y: 0.0001, z: 9.725733} - - {x: 2.2051752, y: 0.0001, z: 9.833511} - - {x: 2.2051752, y: 0.0001, z: 9.725733} - - {x: 10.022136, y: 0.0001, z: 9.833511} - - {x: 10.022136, y: 0.0001, z: 9.725733} - - {x: 10.022136, y: 0.0001, z: 9.833511} - - {x: 10.022136, y: 0.0001, z: 9.725733} - - {x: 10.133206, y: 0.0001, z: 9.833511} - - {x: 10.133206, y: 0.0001, z: 9.725733} - - {x: 10.133206, y: 0.0001, z: 9.725733} - - {x: 10.022136, y: 0.0001, z: 9.725733} - - {x: 10.133206, y: 0.0001, z: 5.8019834} - - {x: 10.022136, y: 0.0001, z: 5.8019834} - - {x: 10.133206, y: 0.0001, z: 5.8019834} - - {x: 10.022136, y: 0.0001, z: 5.8019834} - - {x: 10.133206, y: 0.0001, z: -0.24195433} - - {x: 10.022136, y: 0.0001, z: -0.24195433} - - {x: 10.133206, y: 0.0001, z: -0.24195433} - - {x: 10.022136, y: 0.0001, z: -0.24195433} - - {x: 10.133206, y: 0.0001, z: -0.26323056} - - {x: 10.022136, y: 0.0001, z: -0.26323056} - - {x: 10.133206, y: 0.0001, z: -0.26323056} - - {x: 10.022136, y: 0.0001, z: -0.26323056} - - {x: 10.133206, y: 0.0001, z: -0.39526486} - - {x: 10.022136, y: 0.0001, z: -0.39526486} - - {x: 10.022136, y: 0.0001, z: -0.39526486} - - {x: 10.022136, y: 0.0001, z: -0.26323056} - - {x: 6.2840195, y: 0.0001, z: -0.39526486} - - {x: 6.2840195, y: 0.0001, z: -0.26323056} - - {x: 6.2840195, y: 0.0001, z: -0.39526486} - - {x: 6.2840195, y: 0.0001, z: -0.26323056} - - {x: 5.462885, y: 0.0001, z: -0.39526486} - - {x: 5.462885, y: 0.0001, z: -0.26323056} - - {x: 5.462885, y: 0.0001, z: -0.39526486} - - {x: 5.462885, y: 0.0001, z: -0.26323056} - - {x: 4.415686, y: 0.0001, z: -0.39526486} - - {x: 4.415686, y: 0.0001, z: -0.26323056} - - {x: 4.415686, y: 0.0001, z: -0.39526486} - - {x: 4.415686, y: 0.0001, z: -0.26323056} - - {x: 1.49592, y: 0.0001, z: -0.39526486} - - {x: 1.49592, y: 0.0001, z: -0.26323056} - - {x: 1.49592, y: 0.0001, z: -0.39526486} - - {x: 1.49592, y: 0.0001, z: -0.26323056} - - {x: -0.07834244, y: 0.0001, z: -0.39526486} - - {x: -0.07834244, y: 0.0001, z: -0.26323056} - m_Textures0: - - {x: -0.075332925, y: -0.27044857} - - {x: -0.07533312, y: 9.725733} - - {x: 0.024667073, y: -0.27044857} - - {x: 0.024667263, y: 9.725733} - - {x: -0.075332925, y: -0.27044857} - - {x: -0.07533312, y: 9.725733} - - {x: -0.075332925, y: -0.27044857} - - {x: -0.075332925, y: 0.72955143} - - {x: -0.07533312, y: 9.725733} - - {x: 0.024667263, y: 9.725733} - - {x: -0.07533312, y: 9.833511} - - {x: 0.024667263, y: 9.833511} - - {x: 0.024667263, y: 9.833511} - - {x: 0.024667263, y: 9.725733} - - {x: 0.4069152, y: 9.833511} - - {x: 0.4069152, y: 9.725733} - - {x: 0.4069152, y: 9.833511} - - {x: 0.4069152, y: 9.725733} - - {x: 2.2051752, y: 9.833511} - - {x: 2.2051752, y: 9.725733} - - {x: 2.2051752, y: 9.833511} - - {x: 2.2051752, y: 9.725733} - - {x: 10.022136, y: 9.833511} - - {x: 10.022136, y: 9.725733} - - {x: 10.022136, y: 9.833511} - - {x: 10.022136, y: 9.725733} - - {x: 10.133206, y: 9.833511} - - {x: 10.133206, y: 9.725733} - - {x: 10.133206, y: 9.725733} - - {x: 10.022136, y: 9.725733} - - {x: 10.133206, y: 5.8019834} - - {x: 10.022136, y: 5.8019834} - - {x: 10.133206, y: 5.8019834} - - {x: 10.022136, y: 5.8019834} - - {x: 10.133206, y: -0.24195433} - - {x: 10.022136, y: -0.24195433} - - {x: 10.133206, y: -0.24195433} - - {x: 10.022136, y: -0.24195433} - - {x: 10.133206, y: -0.26323056} - - {x: 10.022136, y: -0.26323056} - - {x: 10.133206, y: -0.26323056} - - {x: 10.022136, y: -0.26323056} - - {x: 10.133206, y: -0.39526486} - - {x: 10.022136, y: -0.39526486} - - {x: 10.022136, y: -0.39526486} - - {x: 10.022136, y: -0.26323056} - - {x: 6.2840195, y: -0.39526486} - - {x: 6.2840195, y: -0.26323056} - - {x: 6.2840195, y: -0.39526486} - - {x: 6.2840195, y: -0.26323056} - - {x: 5.462885, y: -0.39526486} - - {x: 5.462885, y: -0.26323056} - - {x: 5.462885, y: -0.39526486} - - {x: 5.462885, y: -0.26323056} - - {x: 4.415686, y: -0.39526486} - - {x: 4.415686, y: -0.26323056} - - {x: 4.415686, y: -0.39526486} - - {x: 4.415686, y: -0.26323056} - - {x: 1.49592, y: -0.39526486} - - {x: 1.49592, y: -0.26323056} - - {x: 1.49592, y: -0.39526486} - - {x: 1.49592, y: -0.26323056} - - {x: -0.07834244, y: -0.39526486} - - {x: -0.07834244, y: -0.26323056} - m_Textures2: - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - m_Textures3: - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - - {x: 0, y: 0, z: 0, w: 0} - m_Tangents: - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: -0, y: 1, z: 0, w: 1} - - {x: -0, y: 1, z: 0, w: 1} - - {x: -0, y: 1, z: 0, w: 1} - - {x: -0, y: 1, z: 0, w: 1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - - {x: 1, y: 0, z: 0, w: -1} - m_Colors: [] - m_UnwrapParameters: - m_HardAngle: 88 - m_PackMargin: 20 - m_AngleError: 8 - m_AreaError: 15 - m_PreserveMeshAssetOnDestroy: 0 - assetGuid: - m_Mesh: {fileID: 1838430168} - m_VersionIndex: 4221 - m_IsSelectable: 1 - m_SelectedFaces: - m_SelectedEdges: [] - m_SelectedVertices: ---- !u!4 &1460429304 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1460429298} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -5.035, y: -0.5130001, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 274182514} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1476341266 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 32790d47acc86814982f18993097a759, type: 3} @@ -11989,7 +11261,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh63362 + m_Name: pb_Mesh88780 serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 @@ -12344,7 +11616,7 @@ GameObject: - component: {fileID: 1689632238} - component: {fileID: 1689632237} m_Layer: 0 - m_Name: MouseSelector + m_Name: MouseInputManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -12365,6 +11637,10 @@ MonoBehaviour: _selectableLayerMask: serializedVersion: 2 m_Bits: 64 + _walkableLayerMask: + serializedVersion: 2 + m_Bits: 128 + _camera: {fileID: 963194227} --- !u!4 &1689632238 Transform: m_ObjectHideFlags: 0 @@ -12377,8 +11653,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_Father: {fileID: 971260931} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!850595691 &1709286000 LightingSettings: @@ -12767,171 +12043,6 @@ Transform: m_Father: {fileID: 101167831} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &1838430168 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh63396 - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 96 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 35 - localAABB: - m_Center: {x: 5.027432, y: 0.0001, z: 4.7191234} - m_Extent: {x: 5.1057744, y: 0, z: 5.114388} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020001000300020004000500040004000600050007000300010007000800030009000300080009000a0003000b000a0009000b000c000a000d000c000b000d000e000c000f000e000d000f0010000e0011000e001000110012000e0013001200110013001400120015001400130015001600140017001600150017001800160019001600180019001a0016001b001a0019001b001c001a001d001c001b001d001e001c001f001e001d001f0020001e00210020001f00210022002000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 35 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 48 - format: 0 - dimension: 4 - - stream: 0 - offset: 64 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 2800 - _typelessdata: 26489abd17b7d1383c788abe000000000000803f000000000000803f0000000000000000000080bf26489abd3c788abe000000000000000000000000000000000000000000000000000000000000000040489abd17b7d1389a9c1b41000000000000803f000000000000803f0000000000000000000080bf40489abd9a9c1b4100000000000000000000000000000000000000000000000000000000000000009a12ca3c17b7d1383c788abe000000000000803f000000000000803f0000000000000000000080bf9a12ca3c3c788abe00000000000000000000000000000000000000000000000000000000000000000013ca3c17b7d1389a9c1b41000000000000803f000000000000803f0000000000000000000080bf0013ca3c9a9c1b41000000000000000000000000000000000000000000000000000000000000000026489abd17b7d1383c788abe000000000000000000000000000000800000803f000000000000803f26489abd3c788abe000000000000000000000000000000000000000000000000000000000000000040489abd17b7d1389a9c1b41000000000000000000000000000000800000803f000000000000803f40489abd9a9c1b41000000000000000000000000000000000000000000000000000000000000000026489abd17b7d138e2c33a3f000000000000000000000000000000800000803f000000000000803f26489abde2c33a3f000000000000000000000000000000000000000000000000000000000000000040489abd17b7d13810561d41000000000000803f000000000000803f0000000000000000000080bf40489abd10561d4100000000000000000000000000000000000000000000000000000000000000000013ca3c17b7d13810561d41000000000000803f000000000000803f0000000000000000000080bf0013ca3c10561d4100000000000000000000000000000000000000000000000000000000000000003057d03e17b7d13810561d41000000000000803f000000000000803f0000000000000000000080bf3057d03e10561d4100000000000000000000000000000000000000000000000000000000000000003057d03e17b7d1389a9c1b41000000000000803f000000000000803f0000000000000000000080bf3057d03e9a9c1b41000000000000000000000000000000000000000000000000000000000000000097210d4017b7d13810561d41000000000000803f000000000000803f0000000000000000000080bf97210d4010561d41000000000000000000000000000000000000000000000000000000000000000097210d4017b7d1389a9c1b41000000000000803f000000000000803f0000000000000000000080bf97210d409a9c1b410000000000000000000000000000000000000000000000000000000000000000ab5a204117b7d13810561d41000000000000803f000000000000803f0000000000000000000080bfab5a204110561d410000000000000000000000000000000000000000000000000000000000000000ab5a204117b7d1389a9c1b41000000000000803f000000000000803f0000000000000000000080bfab5a20419a9c1b4100000000000000000000000000000000000000000000000000000000000000009d21224117b7d13810561d41000000000000803f000000000000803f0000000000000000000080bf9d21224110561d4100000000000000000000000000000000000000000000000000000000000000009d21224117b7d1389a9c1b41000000000000803f000000000000803f0000000000000000000080bf9d2122419a9c1b4100000000000000000000000000000000000000000000000000000000000000009d21224117b7d138d9a9b940000000000000803f000000000000803f0000000000000000000080bf9d212241d9a9b9400000000000000000000000000000000000000000000000000000000000000000ab5a204117b7d138d9a9b940000000000000803f000000000000803f0000000000000000000080bfab5a2041d9a9b94000000000000000000000000000000000000000000000000000000000000000009d21224117b7d138e0c277be000000000000803f000000000000803f0000000000000000000080bf9d212241e0c277be0000000000000000000000000000000000000000000000000000000000000000ab5a204117b7d138e0c277be000000000000803f000000000000803f0000000000000000000080bfab5a2041e0c277be00000000000000000000000000000000000000000000000000000000000000009d21224117b7d13828c686be000000000000803f000000000000803f0000000000000000000080bf9d21224128c686be0000000000000000000000000000000000000000000000000000000000000000ab5a204117b7d13828c686be000000000000803f000000000000803f0000000000000000000080bfab5a204128c686be00000000000000000000000000000000000000000000000000000000000000009d21224117b7d1382860cabe000000000000803f000000000000803f0000000000000000000080bf9d2122412860cabe0000000000000000000000000000000000000000000000000000000000000000ab5a204117b7d1382860cabe000000000000803f000000000000803f0000000000000000000080bfab5a20412860cabe0000000000000000000000000000000000000000000000000000000000000000b016c94017b7d1382860cabe000000000000803f000000000000803f0000000000000000000080bfb016c9402860cabe0000000000000000000000000000000000000000000000000000000000000000b016c94017b7d13828c686be000000000000803f000000000000803f0000000000000000000080bfb016c94028c686be0000000000000000000000000000000000000000000000000000000000000000f4cfae4017b7d1382860cabe000000000000803f000000000000803f0000000000000000000080bff4cfae402860cabe0000000000000000000000000000000000000000000000000000000000000000f4cfae4017b7d13828c686be000000000000803f000000000000803f0000000000000000000080bff4cfae4028c686be00000000000000000000000000000000000000000000000000000000000000004d4d8d4017b7d1382860cabe000000000000803f000000000000803f0000000000000000000080bf4d4d8d402860cabe00000000000000000000000000000000000000000000000000000000000000004d4d8d4017b7d13828c686be000000000000803f000000000000803f0000000000000000000080bf4d4d8d4028c686be00000000000000000000000000000000000000000000000000000000000000004e7abf3f17b7d1382860cabe000000000000803f000000000000803f0000000000000000000080bf4e7abf3f2860cabe00000000000000000000000000000000000000000000000000000000000000004e7abf3f17b7d13828c686be000000000000803f000000000000803f0000000000000000000080bf4e7abf3f28c686be00000000000000000000000000000000000000000000000000000000000000000072a0bd17b7d1382860cabe000000000000803f000000000000803f0000000000000000000080bf0072a0bd2860cabe00000000000000000000000000000000000000000000000000000000000000000072a0bd17b7d13828c686be000000000000803f000000000000803f0000000000000000000080bf0072a0bd28c686be0000000000000000000000000000000000000000000000000000000000000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 5.027432, y: 0.0001, z: 4.7191234} - m_Extent: {x: 5.1057744, y: 0, z: 5.114388} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1856998489 GameObject: m_ObjectHideFlags: 0 @@ -13274,69 +12385,189 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 89230748661207779, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 89230748661207779, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 258688186108507887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 258688186108507887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 258688186108507887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 490327908599317277, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 490327908599317277, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 490327908599317277, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 721189090810596389, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 721189090810596389, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 721189090810596389, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 1073981064842182943, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 1073981064842182943, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1073981064842182943, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 1327287540930258838, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 1327287540930258838, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1327287540930258838, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 1756597517149559716, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 1756597517149559716, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1756597517149559716, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 1967997499412994781, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 1967997499412994781, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1967997499412994781, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 2073930477501986949, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2073930477501986949, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2073930477501986949, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 2178007643501695888, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2178007643501695888, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2178007643501695888, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 2193743408285456710, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2193743408285456710, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2193743408285456710, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 2450840229917342595, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2450840229917342595, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2450840229917342595, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 2742448817807987534, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2742448817807987534, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2742448817807987534, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 2934656224513259530, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 2934656224513259530, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2934656224513259530, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 3224912872851930775, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3224912872851930775, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3224912872851930775, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_RootOrder value: -1 objectReference: {fileID: 0} - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_LocalScale.x - value: 0.79 + value: 0.7900002 objectReference: {fileID: 0} - target: {fileID: 3320441614581083275, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_LocalScale.y @@ -13386,118 +12617,334 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3640577521678332844, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3640577521678332844, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 3745543722370508642, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3745543722370508642, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3745543722370508642, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 3848330353900505536, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3848330353900505536, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3848330353900505536, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 4270458382938451909, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 4270458382938451909, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4270458382938451909, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 5281440928392613452, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5281440928392613452, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5281440928392613452, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 5295632918667706843, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5295632918667706843, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5295632918667706843, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 5341955133804256074, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5341955133804256074, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5341955133804256074, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 5546461896257945204, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5546461896257945204, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5546461896257945204, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 5743441568381836945, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5743441568381836945, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5743441568381836945, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 5761629645478741081, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 5761629645478741081, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5761629645478741081, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 6049992317567785248, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6049992317567785248, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6049992317567785248, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 6174620754445256656, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6174620754445256656, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6174620754445256656, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 6542011035591151471, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6542011035591151471, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6542011035591151471, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 6577801139579829542, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6577801139579829542, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6577801139579829542, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 6689570259145339448, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6689570259145339448, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689570259145339448, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 6705101972515955208, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6705101972515955208, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6705101972515955208, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 6945522698875533853, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 6945522698875533853, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6945522698875533853, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 7116317129268428653, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7116317129268428653, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7116317129268428653, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 7303564233138112143, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7303564233138112143, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7303564233138112143, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 7334539273898789907, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7334539273898789907, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7334539273898789907, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 7630520031127733399, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7630520031127733399, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7630520031127733399, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 8108280843827582508, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8108280843827582508, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8108280843827582508, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 8466069046134305813, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8466069046134305813, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8466069046134305813, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 8527229569682851311, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8527229569682851311, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8527229569682851311, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Name value: Fridge_visual objectReference: {fileID: 0} - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_TagString value: Selectable objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8683862293970279672, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 40 + objectReference: {fileID: 0} - target: {fileID: 9078991195225517887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 9078991195225517887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9078991195225517887, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} - target: {fileID: 9163871765420732743, guid: b9f258a086096d24aa7861fa20deed65, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 9163871765420732743, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9163871765420732743, guid: b9f258a086096d24aa7861fa20deed65, type: 3} + propertyPath: m_StaticEditorFlags + value: 32 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -13920,11 +13367,11 @@ GameObject: - component: {fileID: 2074665153} - component: {fileID: 2074665152} m_Layer: 0 - m_Name: Walls (1) + m_Name: Walls m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 8 m_IsActive: 1 --- !u!64 &2074665152 MeshCollider: diff --git a/Assets/Scenes/TestRoom/NavMesh.asset b/Assets/Scenes/TestRoom/NavMesh.asset index fedd5275c46a4a3cb66bec4c2399a67b220e80ce..6e8698e9f79fe00b7f7a795da611ddf89f3fe26b 100644 GIT binary patch delta 1434 zcmb_cziSjx5T5;!O;nJGdYkhk#KJ?;Vuk9|ni~DbvUWM+r zp!gbIE)K(E#oWStcEcgMlia>OPei|suu3jJfmvbu=GjWe2WK9BStZIR@b4{uim?(c zC0psBIHw-j`Hspe<$p~*f?Ni8fSdYXI*w$TsS1yUs#uI2c^BP;mNH*#MA$#8mv;7Dm%3?r(FV*tiys`J}p#ZlwvA$I(DQQ#yGR z~t<<_0dS0dHriN2rFZWEMseX-(z zIulwOqoO#9Si0-2hDW728lZ#W;crLL4RSR9x6%0d^a>*G(SIHdpUHxYp`)qWI`U~8 wqoGrhG0PitG)LIpD4um5wSInoU)~${p1*h!KfXVTx9^U7C*O>U&e?N+0D?8#SpWb4 delta 714 zcmZ{iy-UMj5XLVtw53H!L7G@XsDpzbF0q)wLIN&=Uz3xAQ@gl3Hj}e(psQdPM=7F1 zsrduqQ0VB;P5dkLo_w^i+85s3bMM`o`|%{Nt$}-EtJdCAqi3k+8jp-!o){G_nR<6j zL}&i-zAo`QT_Q=5t)&sUn(iIvAv9h_ZWtZD;k>6@c!)#|ztg@AADc%lqSK}vJkRTX z6b-W;XqmDsFJ6kTs{sZ4VOp%M=@m@Y$e}Wogm&W>CAtBMxQG(98Rfl~r$j9ya~$^O zbwZZ(q?FY>rCiqno|q;``LbSCVn%gLJgnEci;yzoFdhp?@6oCc<0OsE>a2Vt$l()f^N)RTNgmSw??*-*_8}4__T^Y(`@oUem)FUi r%wlB9%s!-rU}j$t2SnSTlwVR~*FLCiT@5gN@^$TDI2t7KoxT18cCeN+ diff --git a/Assets/Scripts/EventArgs.cs b/Assets/Scripts/EventArgs.cs new file mode 100644 index 00000000..5cffbf01 --- /dev/null +++ b/Assets/Scripts/EventArgs.cs @@ -0,0 +1,12 @@ +using System; +using UnityEngine; + +public class OnSelectedObjectChangedEventArgs : EventArgs +{ + public Transform SelectedObject; +} + +public class OnMovementTargetSelectedEventArgs:EventArgs +{ + public Vector3 PointToMove; +} \ No newline at end of file diff --git a/Assets/Scripts/EventArgs.cs.meta b/Assets/Scripts/EventArgs.cs.meta new file mode 100644 index 00000000..ea7217a6 --- /dev/null +++ b/Assets/Scripts/EventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4add4f03070ea3f46a3e4aea1fc71585 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MouseInputManager.cs b/Assets/Scripts/MouseInputManager.cs new file mode 100644 index 00000000..7cfb5ab0 --- /dev/null +++ b/Assets/Scripts/MouseInputManager.cs @@ -0,0 +1,50 @@ +using System; +using UnityEngine; +using UnityEngine.EventSystems; + +public class MouseInputManager : MonoBehaviour +{ + [SerializeField] + private LayerMask _selectableLayerMask; + [SerializeField] + private LayerMask _walkableLayerMask; + [SerializeField] + private Camera _camera; + + private RaycastHit _raycastHit; + + public event EventHandler OnSelectedObjectChanged; + public event EventHandler OnMovementTargetSelected; + + public static MouseInputManager Instance { get; private set; } + + private void Awake() + { + if (Instance != null) + { + Debug.Log("There's more than one player instance"); + } + Instance = this; + } + + void Update() + { + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); + if (!EventSystem.current.IsPointerOverGameObject() && Physics.Raycast(ray, out _raycastHit, 100f, _selectableLayerMask)) + { + OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = _raycastHit.transform }); + } + else + { + OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null }); + } + if (Input.GetMouseButton(0)) + { + if (Physics.Raycast(_camera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit, 100f, _walkableLayerMask)) + { + var pointToMove = hit.point; + OnMovementTargetSelected?.Invoke(this, new OnMovementTargetSelectedEventArgs() { PointToMove = pointToMove }); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/MouseSelection.cs.meta b/Assets/Scripts/MouseInputManager.cs.meta similarity index 100% rename from Assets/Scripts/MouseSelection.cs.meta rename to Assets/Scripts/MouseInputManager.cs.meta diff --git a/Assets/Scripts/MouseSelection.cs b/Assets/Scripts/MouseSelection.cs deleted file mode 100644 index 5c8f6a8d..00000000 --- a/Assets/Scripts/MouseSelection.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.EventSystems; - -public class MouseSelection : MonoBehaviour -{ - [SerializeField] - private LayerMask _selectableLayerMask; - private Transform _selection; - private RaycastHit _raycastHit; - public event EventHandler OnSelectedObjectChanged; - public class OnSelectedObjectChangedEventArgs : EventArgs - { - public Transform SelectedObject; - } - - public static MouseSelection Instance { get; private set; } - - private void Awake() - { - if (Instance != null) - { - Debug.Log("There's more than one player instance"); - } - Instance = this; - } - void Update() - { - var ray = Camera.main.ScreenPointToRay(Input.mousePosition); - if (!EventSystem.current.IsPointerOverGameObject() && Physics.Raycast(ray, out _raycastHit, 100f, _selectableLayerMask)) - { - OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = _raycastHit.transform }); - // _hightlight = _raycastHit.transform; - // if (_hightlight.CompareTag("Selectable") && _hightlight != _selection) - // { - // if (_hightlight.gameObject.GetComponent() != null) - // { - // _hightlight.gameObject.GetComponent().enabled = true; - // } - // else - // { - // var outline = _hightlight.gameObject.AddComponent(); - // outline.enabled = true; - // _hightlight.gameObject.GetComponent().OutlineColor = Color.yellow; - // _hightlight.gameObject.GetComponent().OutlineWidth = 7f; - // } - // } - // else - // { - // _hightlight = null; - // } - - } - else - { - OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null }); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index d2d3bbf1..2d058532 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -3,20 +3,20 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.AI; using static GameManager; +using static UnityEditor.PlayerSettings; public class PlayerManager : MonoBehaviour { private enum States { Idle, Walking, Sleeping }; - + [SerializeField] + public LayerMask _walkableLayer; [SerializeField] public NavMeshAgent _navAgent; [SerializeField] public Animator _animator; [SerializeField] private Camera _camera; - [SerializeField] - public ParticleSystem _targetDest; public bool allowMovement = true; private States _state; @@ -24,43 +24,37 @@ public class PlayerManager : MonoBehaviour public Dictionary PlayerStats; public IWorkPlace WorkPlace { get; set; } + private Vector3 _pointToMove; + private bool _movePointReceived=false; - private void OnEnable() + private void Start() { TimeManager.OnMinuteChanged += UpdatePlayerState; - } - - private void OnDisable() - { - TimeManager.OnMinuteChanged -= UpdatePlayerState; - } - // Start is called before the first frame update - - void Start() - { allowMovement = true; _navAgent.updatePosition = false; PlayerStats = GameManager.Instance.PlayerStats; + MouseInputManager.Instance.OnMovementTargetSelected += Mouse_OnMovementTargetSelected; } - // Update is called once per frame - void Update() - { - if (allowMovement) - { - if (Input.GetMouseButton(0)) - { - _targetDest.Stop(); - if (Physics.Raycast(_camera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit, 100)) - { - var pos = hit.point; - pos.y += 0.2f; - _targetDest.transform.position = pos; - _navAgent.SetDestination(pos); - _targetDest.Play(); - } - } - } + private void Mouse_OnMovementTargetSelected(object sender, OnMovementTargetSelectedEventArgs e) + { + _pointToMove= e.PointToMove; + _movePointReceived = true; + } + + private void OnDestroy() + { + TimeManager.OnMinuteChanged -= UpdatePlayerState; + MouseInputManager.Instance.OnMovementTargetSelected -= Mouse_OnMovementTargetSelected; + } + + private void Update() + { + if (allowMovement && _movePointReceived) + { + _movePointReceived = false; + _navAgent.SetDestination(_pointToMove); + } var worldDeltaPosition = _navAgent.nextPosition - transform.position; _groundDeltaPosition.x = Vector3.Dot(transform.right, worldDeltaPosition); diff --git a/Assets/Scripts/SelectedVisual.cs b/Assets/Scripts/SelectedVisual.cs index 34c4b8ea..dc7f787e 100644 --- a/Assets/Scripts/SelectedVisual.cs +++ b/Assets/Scripts/SelectedVisual.cs @@ -8,15 +8,15 @@ public class SelectedVisual : MonoBehaviour private void Start() { - MouseSelection.Instance.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged; + MouseInputManager.Instance.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged; } private void OnDestroy() { - MouseSelection.Instance.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged; + MouseInputManager.Instance.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged; } - private void Mouse_OnSelectedObjectChanged(object sender, MouseSelection.OnSelectedObjectChangedEventArgs e) + private void Mouse_OnSelectedObjectChanged(object sender, OnSelectedObjectChangedEventArgs e) { if (e.SelectedObject == _selectedObject) { diff --git a/Assets/Scripts/WaypointVisual.cs b/Assets/Scripts/WaypointVisual.cs new file mode 100644 index 00000000..38e040c8 --- /dev/null +++ b/Assets/Scripts/WaypointVisual.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +public class WaypointVisual : MonoBehaviour +{ + [SerializeField] + private ParticleSystem _particleSystem; + [SerializeField] + private Transform _wayPoint; + + private void Start() + { + MouseInputManager.Instance.OnMovementTargetSelected += Mouse_OnMovementTargetSelected; + } + + private void Mouse_OnMovementTargetSelected(object sender, OnMovementTargetSelectedEventArgs e) + { + _wayPoint.position = e.PointToMove; + _particleSystem.Play(); + } + + private void OnDestroy() + { + MouseInputManager.Instance.OnMovementTargetSelected -= Mouse_OnMovementTargetSelected; + } +} diff --git a/Assets/Scripts/WaypointVisual.cs.meta b/Assets/Scripts/WaypointVisual.cs.meta new file mode 100644 index 00000000..40cc080d --- /dev/null +++ b/Assets/Scripts/WaypointVisual.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ae5ecbfd9a3637247b4cd539f9a57316 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index b02e53d0..03dbd296 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,11 +9,11 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - MouseColiderLayer + - - Water - UI - - Furniture - - + - SelectableObjects + - Ground - - -