diff --git a/SSLR/Assets/NpcModels/Prefabs/female2.prefab b/SSLR/Assets/NpcModels/Prefabs/female2.prefab index 6a7ff28..41a70a6 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female2.prefab @@ -1368,7 +1368,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &6550354841523958635 diff --git a/SSLR/Assets/NpcModels/Prefabs/female3.prefab b/SSLR/Assets/NpcModels/Prefabs/female3.prefab index 8a6b120..131bfa8 100644 --- a/SSLR/Assets/NpcModels/Prefabs/female3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/female3.prefab @@ -1369,7 +1369,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &3235455458723478503 diff --git a/SSLR/Assets/NpcModels/Prefabs/male1.prefab b/SSLR/Assets/NpcModels/Prefabs/male1.prefab index 947c337..1576927 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male1.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male1.prefab @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &1404532670578165301 diff --git a/SSLR/Assets/NpcModels/Prefabs/male2.prefab b/SSLR/Assets/NpcModels/Prefabs/male2.prefab index 232f369..7a5b089 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male2.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male2.prefab @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &7289129299178912299 diff --git a/SSLR/Assets/NpcModels/Prefabs/male3.prefab b/SSLR/Assets/NpcModels/Prefabs/male3.prefab index 5748e80..717a6e1 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male3.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male3.prefab @@ -1370,7 +1370,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &7310366438356425248 diff --git a/SSLR/Assets/NpcModels/Prefabs/male4.prefab b/SSLR/Assets/NpcModels/Prefabs/male4.prefab index 7bdb265..47f9ffa 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male4.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male4.prefab @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &5062195734015408324 diff --git a/SSLR/Assets/NpcModels/Prefabs/male5.prefab b/SSLR/Assets/NpcModels/Prefabs/male5.prefab index be445f5..1059140 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male5.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male5.prefab @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &1028939866706718389 diff --git a/SSLR/Assets/NpcModels/Prefabs/male6.prefab b/SSLR/Assets/NpcModels/Prefabs/male6.prefab index 06a5bc9..9418053 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male6.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male6.prefab @@ -1374,7 +1374,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &7364405088423112622 diff --git a/SSLR/Assets/NpcModels/Prefabs/male7.prefab b/SSLR/Assets/NpcModels/Prefabs/male7.prefab index 3661d2e..0b41a4f 100644 --- a/SSLR/Assets/NpcModels/Prefabs/male7.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/male7.prefab @@ -1369,7 +1369,7 @@ NavMeshAgent: m_AutoBraking: 1 m_AutoRepath: 1 m_Height: 1.5 - m_BaseOffset: 0.2 + m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 1 --- !u!114 &839382620823816501 diff --git a/SSLR/Assets/NpcModels/Prefabs/police.prefab b/SSLR/Assets/NpcModels/Prefabs/police.prefab index 485456b..50a7f53 100644 --- a/SSLR/Assets/NpcModels/Prefabs/police.prefab +++ b/SSLR/Assets/NpcModels/Prefabs/police.prefab @@ -162,6 +162,29 @@ MonoBehaviour: m_EditorClassIdentifier: agent: {fileID: 0} animator: {fileID: 0} + npcWelcomeText: {fileID: 0} + initialStatementText: {fileID: 0} + npcAnswerOneText: {fileID: 0} + npcAnswerTwoText: {fileID: 0} + npcAnswerThreeText: {fileID: 0} + npcClarifiedResponse: {fileID: 0} + npcSpeechBubble: {fileID: 0} + npcAnswerPanel: {fileID: 0} + npcData: + initialStatement: + question1: + question2: + question3: + answer1: + answer2: + answer3: + response1: + response2: + response3: + points: 0 + hasPaper: 0 + correctDepartment: + correctService: --- !u!195 &146904424308101253 NavMeshAgent: m_ObjectHideFlags: 0 diff --git a/SSLR/Assets/Scenes/Game Scene.unity b/SSLR/Assets/Scenes/Game Scene.unity index 326a8e3..7f1679a 100644 --- a/SSLR/Assets/Scenes/Game Scene.unity +++ b/SSLR/Assets/Scenes/Game Scene.unity @@ -320,11 +320,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 341383715448738126, guid: a6e5ff8612389eb43a19a4dd735fa6e0, type: 3} m_PrefabInstance: {fileID: 14299041} m_PrefabAsset: {fileID: 0} ---- !u!1 &15195236 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4834912315332365229, guid: f367d404b9812e241a03556c2eea72d3, type: 3} - m_PrefabInstance: {fileID: 4568907534340813911} - m_PrefabAsset: {fileID: 0} --- !u!1 &17285054 GameObject: m_ObjectHideFlags: 0 @@ -21157,7 +21152,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6526554413028541087, guid: a7e24a9d9f4418445984728761364801, type: 3} + insertIndex: -1 + addedObject: {fileID: 715642145} m_SourcePrefab: {fileID: 100100000, guid: a7e24a9d9f4418445984728761364801, type: 3} --- !u!4 &465594967 stripped Transform: @@ -25800,7 +25798,7 @@ MonoBehaviour: m_EditorClassIdentifier: doorLeft: {fileID: 1278685246} doorRight: {fileID: 1300852326} - doorCloseDelay: 0.75 + doorCloseDelay: 2 --- !u!65 &663564554 BoxCollider: m_ObjectHideFlags: 0 @@ -26954,6 +26952,25 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6526554413028541087, guid: a7e24a9d9f4418445984728761364801, type: 3} m_PrefabInstance: {fileID: 465594966} m_PrefabAsset: {fileID: 0} +--- !u!114 &715642145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715642141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OverrideArea: 1 + m_Area: 0 + m_OverrideGenerateLinks: 0 + m_GenerateLinks: 0 + m_IgnoreFromBuild: 1 + m_ApplyToChildren: 1 + m_AffectedAgents: ffffffff --- !u!1 &719227768 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2117743000578713311, guid: cbfe2927ae09f2943997a0b36afe5a7a, type: 3} @@ -36901,13 +36918,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AgentTypeID: 0 - m_CollectObjects: 3 + 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: 4294967295 - m_UseGeometry: 0 + m_UseGeometry: 1 m_DefaultArea: 0 m_GenerateLinks: 1 m_IgnoreNavMeshAgent: 1 @@ -40120,6 +40137,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} insertIndex: -1 addedObject: {fileID: 1236930476} + - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1236930479} m_SourcePrefab: {fileID: 100100000, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} --- !u!4 &1236930474 stripped Transform: @@ -40152,6 +40172,25 @@ BoxCollider: 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1236930475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OverrideArea: 1 + m_Area: 0 + m_OverrideGenerateLinks: 0 + m_GenerateLinks: 0 + m_IgnoreFromBuild: 1 + m_ApplyToChildren: 1 + m_AffectedAgents: ffffffff --- !u!1001 &1241480508 PrefabInstance: m_ObjectHideFlags: 0 @@ -59694,25 +59733,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2067947708244902774, guid: f367d404b9812e241a03556c2eea72d3, type: 3} m_PrefabInstance: {fileID: 4568907534340813911} m_PrefabAsset: {fileID: 0} ---- !u!114 &2064473023 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 15195236} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_OverrideArea: 1 - m_Area: 0 - m_OverrideGenerateLinks: 0 - m_GenerateLinks: 0 - m_IgnoreFromBuild: 0 - m_ApplyToChildren: 1 - m_AffectedAgents: ffffffff --- !u!1001 &2066361279 PrefabInstance: m_ObjectHideFlags: 0 @@ -59792,7 +59812,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4371614424288136695, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} propertyPath: m_LocalPosition.y - value: -1.2653561 + value: -1.218 objectReference: {fileID: 0} - target: {fileID: 4371614424288136695, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} propertyPath: m_LocalPosition.z @@ -59833,6 +59853,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} insertIndex: -1 addedObject: {fileID: 2070786417} + - targetCorrespondingSourceObject: {fileID: 4026438539017934669, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} + insertIndex: -1 + addedObject: {fileID: 2070786420} m_SourcePrefab: {fileID: 100100000, guid: c73e53e753e2b1041a7ac864f5ed636f, type: 3} --- !u!4 &2070786415 stripped Transform: @@ -59865,6 +59888,25 @@ BoxCollider: 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070786416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OverrideArea: 1 + m_Area: 0 + m_OverrideGenerateLinks: 0 + m_GenerateLinks: 0 + m_IgnoreFromBuild: 1 + m_ApplyToChildren: 1 + m_AffectedAgents: ffffffff --- !u!1001 &2080071155 PrefabInstance: m_ObjectHideFlags: 0 @@ -61418,6 +61460,7 @@ GameObject: - component: {fileID: 4201107131021904049} - component: {fileID: 2137419700865023099} - component: {fileID: 8205514225116651244} + - component: {fileID: 8205514225116651245} m_Layer: 0 m_Name: door_office m_TagString: Untagged @@ -62190,6 +62233,7 @@ GameObject: - component: {fileID: 1962376569466209362} - component: {fileID: 4386282141093572760} - component: {fileID: 5812247214751257103} + - component: {fileID: 5812247214751257104} m_Layer: 0 m_Name: door_office (1) m_TagString: Untagged @@ -62948,7 +62992,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2067947708244902774, guid: f367d404b9812e241a03556c2eea72d3, type: 3} propertyPath: m_LocalPosition.y - value: -1.2353573 + value: -1.21 objectReference: {fileID: 0} - target: {fileID: 2067947708244902774, guid: f367d404b9812e241a03556c2eea72d3, type: 3} propertyPath: m_LocalPosition.z @@ -62989,10 +63033,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4834912315332365229, guid: f367d404b9812e241a03556c2eea72d3, type: 3} - insertIndex: -1 - addedObject: {fileID: 2064473023} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f367d404b9812e241a03556c2eea72d3, type: 3} --- !u!1001 &4659621534868253087 PrefabInstance: @@ -63325,6 +63366,25 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.01, z: 0.010000003} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5812247214751257104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2873235187685790029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OverrideArea: 0 + m_Area: 0 + m_OverrideGenerateLinks: 0 + m_GenerateLinks: 0 + m_IgnoreFromBuild: 1 + m_ApplyToChildren: 1 + m_AffectedAgents: ffffffff --- !u!23 &5961622914435069751 MeshRenderer: m_ObjectHideFlags: 0 @@ -64273,6 +64333,25 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.010000003, y: 0.01, z: 0.010000003} m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8205514225116651245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480019926754827694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e3fdca004f2d45fe8abbed571a8abd5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_OverrideArea: 0 + m_Area: 0 + m_OverrideGenerateLinks: 0 + m_GenerateLinks: 0 + m_IgnoreFromBuild: 1 + m_ApplyToChildren: 1 + m_AffectedAgents: ffffffff --- !u!1001 &8426520984228427088 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset index 194941a..15e9365 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 858ac46..afce2ad 100644 --- a/SSLR/Assets/Scripts/NPCMovementRework.cs +++ b/SSLR/Assets/Scripts/NPCMovementRework.cs @@ -74,6 +74,7 @@ public class NpcMovementRework : MonoBehaviour npcSpeechBubble.SetActive(false); npcAnswerPanel.SetActive(false); StartCoroutine(SitDown()); + } /// @@ -138,12 +139,12 @@ public class NpcMovementRework : MonoBehaviour seat = NpcManager.instance.Seats[i]; yield return new WaitForSeconds(2f); } - + seat.Available = false; var sittingPosition = seat.SeatObject.transform.position; - sittingPosition.y = 0; + agent.SetDestination(sittingPosition); - + Debug.Log("Sitting down"); while (true) { var dist = Vector3.Distance(sittingPosition, gameObject.transform.position); diff --git a/SSLR/ProjectSettings/NavMeshAreas.asset b/SSLR/ProjectSettings/NavMeshAreas.asset index 71ed390..c000ce4 100644 --- a/SSLR/ProjectSettings/NavMeshAreas.asset +++ b/SSLR/ProjectSettings/NavMeshAreas.asset @@ -76,7 +76,7 @@ NavMeshProjectSettings: agentRadius: 0.2 agentHeight: 1.5 agentSlope: 45 - agentClimb: 2 + agentClimb: 0.5 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 minRegionArea: 2