diff --git a/SSLR/Assets/Scenes/Game Scene.unity b/SSLR/Assets/Scenes/Game Scene.unity index 7f1679a..cd1a159 100644 --- a/SSLR/Assets/Scenes/Game Scene.unity +++ b/SSLR/Assets/Scenes/Game Scene.unity @@ -21149,7 +21149,8 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4783073925009556759, guid: a7e24a9d9f4418445984728761364801, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -40134,9 +40135,6 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} - insertIndex: -1 - addedObject: {fileID: 1236930476} - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} insertIndex: -1 addedObject: {fileID: 1236930479} @@ -40151,27 +40149,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} m_PrefabInstance: {fileID: 1236930473} m_PrefabAsset: {fileID: 0} ---- !u!65 &1236930476 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1236930475} - 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.010972569, y: 0.0071072597, z: 0.01033768} - m_Center: {x: 0.00004601502, y: 0.00281008, z: -0.00013004988} --- !u!114 &1236930479 MonoBehaviour: m_ObjectHideFlags: 0 @@ -59850,9 +59827,6 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} - insertIndex: -1 - addedObject: {fileID: 2070786417} - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} insertIndex: -1 addedObject: {fileID: 2070786420} @@ -59867,27 +59841,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} m_PrefabInstance: {fileID: 2070786414} m_PrefabAsset: {fileID: 0} ---- !u!65 &2070786417 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070786416} - 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.010972569, y: 0.0071072597, z: 0.01033768} - m_Center: {x: 0.00004601502, y: 0.00281008, z: -0.00013004988} --- !u!114 &2070786420 MonoBehaviour: m_ObjectHideFlags: 0 @@ -61670,7 +61623,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001} m_Center: {x: 0, y: 0, z: 0} @@ -62378,7 +62331,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001} m_Center: {x: 0, y: 0, z: 0} @@ -63362,7 +63315,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.01, z: 0.010000003} m_Center: {x: 0, y: 0, z: 0} @@ -63553,7 +63506,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001} m_Center: {x: 0, y: 0, z: 0} @@ -64329,7 +64282,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.01, z: 0.010000003} m_Center: {x: 0, y: 0, z: 0} @@ -64431,7 +64384,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.010000001, z: 0.010000001} m_Center: {x: 0, y: 0, z: 0} diff --git a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset index 15e9365..1abbe69 100644 Binary files a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset and b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset differ diff --git a/SSLR/Assets/Scripts/NPCMovementRework.cs b/SSLR/Assets/Scripts/NPCMovementRework.cs index afce2ad..05021cd 100644 --- a/SSLR/Assets/Scripts/NPCMovementRework.cs +++ b/SSLR/Assets/Scripts/NPCMovementRework.cs @@ -148,7 +148,7 @@ public class NpcMovementRework : MonoBehaviour while (true) { var dist = Vector3.Distance(sittingPosition, gameObject.transform.position); - if (dist < 0.05f) + if (dist < 0.5f) { agent.SetDestination(gameObject.transform.position); animator.SetBool(IsSitting, true);