From 8e1a969a8c70b12bb094eb121923660dfb39391a Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Tue, 26 Sep 2017 16:27:21 -0500 Subject: [PATCH] Fixed getrandomlocation --- Project Undercover/Assets/Resources/NPC.prefab | 4 ++-- .../Assets/Resources/PhotonServerSettings.asset | 1 + Project Undercover/Assets/Scenes/scene.unity | 17 ++++++++++++++++- .../Assets/Scenes/scene/NavMesh.asset.meta | 2 +- .../Assets/Scripts/SimpleNPCBehavior.cs | 6 ++++-- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Project Undercover/Assets/Resources/NPC.prefab b/Project Undercover/Assets/Resources/NPC.prefab index 8fcfa2c..6c936f6 100644 --- a/Project Undercover/Assets/Resources/NPC.prefab +++ b/Project Undercover/Assets/Resources/NPC.prefab @@ -20,8 +20,8 @@ GameObject: m_Component: - component: {fileID: 4550573785341638} - component: {fileID: 114359923699139636} - - component: {fileID: 195715453755731944} - component: {fileID: 114024861962930332} + - component: {fileID: 195319200952995954} m_Layer: 0 m_Name: NPC m_TagString: NPC @@ -475,7 +475,7 @@ MonoBehaviour: instantiationId: -1 currentMasterID: -1 isRuntimeInstantiated: 0 ---- !u!195 &195715453755731944 +--- !u!195 &195319200952995954 NavMeshAgent: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} diff --git a/Project Undercover/Assets/Resources/PhotonServerSettings.asset b/Project Undercover/Assets/Resources/PhotonServerSettings.asset index 76eef30..f3a3f3b 100644 --- a/Project Undercover/Assets/Resources/PhotonServerSettings.asset +++ b/Project Undercover/Assets/Resources/PhotonServerSettings.asset @@ -58,4 +58,5 @@ MonoBehaviour: - ShowSpysWinScreen - ShowSpiesWinScreen - SetEnabledRPC + - SpawnNPC DisableAutoOpenWizard: 1 diff --git a/Project Undercover/Assets/Scenes/scene.unity b/Project Undercover/Assets/Scenes/scene.unity index 2c46b40..24102a9 100644 --- a/Project Undercover/Assets/Scenes/scene.unity +++ b/Project Undercover/Assets/Scenes/scene.unity @@ -2065,6 +2065,7 @@ GameObject: - component: {fileID: 1167603081} - component: {fileID: 1167603080} - component: {fileID: 1167603079} + - component: {fileID: 1167603083} m_Layer: 9 m_Name: Floor m_TagString: Untagged @@ -2112,7 +2113,7 @@ BoxCollider: m_GameObject: {fileID: 1167603078} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -2136,6 +2137,20 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &1167603083 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1167603078} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 1 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1180594178 GameObject: m_ObjectHideFlags: 0 diff --git a/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta b/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta index 22e7da2..5a8cf52 100644 --- a/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta +++ b/Project Undercover/Assets/Scenes/scene/NavMesh.asset.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b1f9d2b2f3968434586b7c398ede29d4 -timeCreated: 1506028392 +timeCreated: 1506460790 licenseType: Free NativeFormatImporter: mainObjectFileID: 23800000 diff --git a/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs b/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs index 28ca423..baab782 100644 --- a/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs +++ b/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs @@ -16,6 +16,7 @@ public class SimpleNPCBehavior : Photon.PunBehaviour void Start() { agent = GetComponent(); + //agent = gameObject.AddComponent(); if (PhotonNetwork.isMasterClient) { photonView.RPC("TeleportToTarget", PhotonTargets.All, GetRandomLocation()); photonView.RPC("SetColorRPC", PhotonTargets.All, new Vector3(Random.value, Random.value, Random.value)); @@ -46,10 +47,11 @@ public class SimpleNPCBehavior : Photon.PunBehaviour public static Vector3 GetRandomLocation() { - var randTarget = new Vector3(5.0f - (10.0f * Random.value), 1.0f, 5.0f - (10.0f * Random.value)); + var randTarget = new Vector3(5.0f - (10.0f * Random.value), 0.0f, 5.0f - (10.0f * Random.value)); NavMeshHit hit; if (NavMesh.SamplePosition(randTarget, out hit, 1.0f, NavMesh.AllAreas)) - return hit.position; + //return hit.position; + return new Vector3 (hit.position.x, 2.0f, hit.position.z); else return GetRandomLocation(); }