From a2a756e6d3b6640fde88fd763d9ddd3110ed90bd Mon Sep 17 00:00:00 2001 From: Vova <3emaster@gmail.com> Date: Tue, 28 May 2024 09:42:02 +0300 Subject: [PATCH] Fixed indoor scene --- Assets/Prefabs/Indoor/House.prefab | 64 ------------------ Assets/Scenes/Indoor.unity | 32 +++++++++ Assets/Scenes/JobAgency.unity | 4 +- .../JobAgency/NavMesh-NavMesh Surface.asset | Bin 7184 -> 0 bytes .../NavMesh-NavMesh Surface.asset.meta | 8 --- Assets/Scripts/Characters/Player.cs | 8 +-- .../Scripts/Controllers/IndoorController.cs | 2 +- 7 files changed, 36 insertions(+), 82 deletions(-) delete mode 100644 Assets/Scenes/JobAgency/NavMesh-NavMesh Surface.asset delete mode 100644 Assets/Scenes/JobAgency/NavMesh-NavMesh Surface.asset.meta diff --git a/Assets/Prefabs/Indoor/House.prefab b/Assets/Prefabs/Indoor/House.prefab index 1fd96939..040f95fc 100644 --- a/Assets/Prefabs/Indoor/House.prefab +++ b/Assets/Prefabs/Indoor/House.prefab @@ -617,69 +617,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &2893261721717734074 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2049321954311866650} - - component: {fileID: 3666780865748288649} - m_Layer: 3 - m_Name: Navigation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2049321954311866650 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2893261721717734074} - serializedVersion: 2 - 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: 1434832187885695643} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3666780865748288649 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2893261721717734074} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AgentTypeID: 0 - m_CollectObjects: 3 - m_Size: {x: 10, y: 10, z: 10} - m_Center: {x: 0, y: 2, z: 0} - m_LayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_UseGeometry: 0 - m_DefaultArea: 0 - m_GenerateLinks: 0 - m_IgnoreNavMeshAgent: 1 - m_IgnoreNavMeshObstacle: 1 - m_OverrideTileSize: 0 - m_TileSize: 256 - m_OverrideVoxelSize: 0 - m_VoxelSize: 0.1 - m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: 03459dcde19b5a54e815e307356234e8, type: 2} - m_BuildHeightMesh: 0 --- !u!1 &3087505573828710561 GameObject: m_ObjectHideFlags: 0 @@ -1669,7 +1606,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2049321954311866650} - {fileID: 6199626506931386910} - {fileID: 8888767863032200945} - {fileID: 7761237621210299497} diff --git a/Assets/Scenes/Indoor.unity b/Assets/Scenes/Indoor.unity index b8b320c5..8cd70704 100644 --- a/Assets/Scenes/Indoor.unity +++ b/Assets/Scenes/Indoor.unity @@ -129,6 +129,7 @@ GameObject: m_Component: - component: {fileID: 650146556} - component: {fileID: 650146555} + - component: {fileID: 650146557} m_Layer: 0 m_Name: Controller m_TagString: Untagged @@ -163,6 +164,37 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &650146557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650146554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AgentTypeID: 0 + m_CollectObjects: 0 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 2, z: 0} + m_LayerMask: + serializedVersion: 2 + m_Bits: 8 + m_UseGeometry: 0 + m_DefaultArea: 0 + m_GenerateLinks: 0 + m_IgnoreNavMeshAgent: 1 + m_IgnoreNavMeshObstacle: 1 + m_OverrideTileSize: 0 + m_TileSize: 256 + m_OverrideVoxelSize: 0 + m_VoxelSize: 0.1 + m_MinRegionArea: 2 + m_NavMeshData: {fileID: 0} + m_BuildHeightMesh: 0 --- !u!850595691 &1709286000 LightingSettings: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/JobAgency.unity b/Assets/Scenes/JobAgency.unity index 84e96839..76d460d9 100644 --- a/Assets/Scenes/JobAgency.unity +++ b/Assets/Scenes/JobAgency.unity @@ -893,7 +893,7 @@ MonoBehaviour: m_OverrideVoxelSize: 0 m_VoxelSize: 0.1 m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: fb4c26949a10ca4418d40f5b186f1a77, type: 2} + m_NavMeshData: {fileID: 0} m_BuildHeightMesh: 0 --- !u!4 &2018736431 Transform: @@ -904,7 +904,7 @@ Transform: m_GameObject: {fileID: 2018736429} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.7014427, y: 10.649784, z: -0.07274848} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/JobAgency/NavMesh-NavMesh Surface.asset b/Assets/Scenes/JobAgency/NavMesh-NavMesh Surface.asset deleted file mode 100644 index 1def3cf34a8dcae3126f22668d964bc9c20d0209..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7184 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 Q@6X^p?OE~Gkr&DS2lCg?L;wH) diff --git a/Assets/Scenes/JobAgency/NavMesh-NavMesh Surface.asset.meta b/Assets/Scenes/JobAgency/NavMesh-NavMesh Surface.asset.meta deleted file mode 100644 index ffaa6e3b..00000000 --- a/Assets/Scenes/JobAgency/NavMesh-NavMesh Surface.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fb4c26949a10ca4418d40f5b186f1a77 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 23800000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Characters/Player.cs b/Assets/Scripts/Characters/Player.cs index e8a5e067..3aa53fae 100644 --- a/Assets/Scripts/Characters/Player.cs +++ b/Assets/Scripts/Characters/Player.cs @@ -58,13 +58,7 @@ public class Player : BaseCharacter public void SetPosition(Transform desiredPosition) { - if (!_navAgent.isOnNavMesh) - { - transform.position = desiredPosition.position; - _navAgent.enabled = false; - _navAgent.enabled = true; - } - var t=_navAgent.Warp(desiredPosition.position); + _navAgent.Warp(desiredPosition.position); _navAgent.updatePosition = false; Rotate(desiredPosition.forward * -1); } diff --git a/Assets/Scripts/Controllers/IndoorController.cs b/Assets/Scripts/Controllers/IndoorController.cs index d01840e1..1474c1f8 100644 --- a/Assets/Scripts/Controllers/IndoorController.cs +++ b/Assets/Scripts/Controllers/IndoorController.cs @@ -11,7 +11,7 @@ public class IndoorController : MonoBehaviour // If the NavMeshSurface is not assigned in the Inspector, try to find it - var navMeshSurface = transform.GetComponentInChildren(); + var navMeshSurface = GetComponent(); // Build the NavMesh if (navMeshSurface != null)