From 828a0b50ddbc1275cce75e4281d885337a3985fc Mon Sep 17 00:00:00 2001 From: Wilson Leong Date: Sat, 26 Apr 2014 14:47:56 -0600 Subject: [PATCH 1/2] Patrons have destination list --- Assets/Scenes/Main.unity | 141 +++----------------------------- Assets/Scripts/Driver.cs | 14 ++++ Assets/Scripts/Driver.cs.meta | 8 ++ Assets/Scripts/NavPoint.cs | 10 +++ Assets/Scripts/NavPoint.cs.meta | 8 ++ Assets/Scripts/Patron.cs | 19 ++++- 6 files changed, 66 insertions(+), 134 deletions(-) create mode 100644 Assets/Scripts/Driver.cs create mode 100644 Assets/Scripts/Driver.cs.meta create mode 100644 Assets/Scripts/NavPoint.cs create mode 100644 Assets/Scripts/NavPoint.cs.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a4820d9..586b534 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -217,7 +217,7 @@ BoxCollider: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 134611195} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: 012328ad8a154434cba351198ab57633, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -240,7 +240,7 @@ Transform: m_LocalPosition: {x: -5.53722095, y: 10.147995, z: 7.53864098} m_LocalScale: {x: 2.19080043, y: 3.67920685, z: 2.19080043} m_Children: [] - m_Father: {fileID: 704683992} + m_Father: {fileID: 0} --- !u!54 &134611201 Rigidbody: m_ObjectHideFlags: 0 @@ -267,6 +267,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b933d79988a624405b43ff0fb8c3d527, type: 3} m_Name: m_EditorClassIdentifier: + destinations: [] + currentDest: {fileID: 0} --- !u!195 &134611203 NavMeshAgent: m_ObjectHideFlags: 0 @@ -365,7 +367,7 @@ GameObject: m_Component: - 4: {fileID: 523078142} m_Layer: 0 - m_Name: nodes + m_Name: Nav Points m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -394,11 +396,9 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 582022782} - - 33: {fileID: 582022786} - 135: {fileID: 582022785} - - 23: {fileID: 582022784} m_Layer: 0 - m_Name: node0 + m_Name: nav0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -415,27 +415,6 @@ Transform: m_LocalScale: {x: 1.93007231, y: 1.93007231, z: 1.93007231} m_Children: [] m_Father: {fileID: 523078142} ---- !u!23 &582022784 -Renderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 582022781} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} - m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_SortingLayerID: 0 --- !u!135 &582022785 SphereCollider: m_ObjectHideFlags: 0 @@ -448,13 +427,6 @@ SphereCollider: serializedVersion: 2 m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &582022786 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 582022781} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &680206382 GameObject: m_ObjectHideFlags: 0 @@ -569,7 +541,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &704683992 Transform: m_ObjectHideFlags: 0 @@ -589,7 +561,6 @@ Transform: - {fileID: 1951656536} - {fileID: 2017533897} - {fileID: 1236459784} - - {fileID: 134611200} m_Father: {fileID: 0} --- !u!1 &710538756 GameObject: @@ -930,11 +901,9 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 815705939} - - 33: {fileID: 815705943} - 135: {fileID: 815705942} - - 23: {fileID: 815705941} m_Layer: 0 - m_Name: node3 + m_Name: nav3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -948,30 +917,9 @@ Transform: m_GameObject: {fileID: 815705938} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 9.70057106, y: 4.82923508, z: 10.7952461} - m_LocalScale: {x: 3.55101466, y: 3.55101466, z: 3.55101466} + m_LocalScale: {x: 1.93007195, y: 1.93007195, z: 1.93007195} m_Children: [] m_Father: {fileID: 523078142} ---- !u!23 &815705941 -Renderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 815705938} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} - m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_SortingLayerID: 0 --- !u!135 &815705942 SphereCollider: m_ObjectHideFlags: 0 @@ -984,13 +932,6 @@ SphereCollider: serializedVersion: 2 m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &815705943 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 815705938} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &964066619 GameObject: m_ObjectHideFlags: 0 @@ -999,37 +940,14 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 964066624} - - 33: {fileID: 964066623} - 135: {fileID: 964066622} - - 23: {fileID: 964066621} m_Layer: 0 - m_Name: node2 + m_Name: nav2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!23 &964066621 -Renderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 964066619} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} - m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_SortingLayerID: 0 --- !u!135 &964066622 SphereCollider: m_ObjectHideFlags: 0 @@ -1042,13 +960,6 @@ SphereCollider: serializedVersion: 2 m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &964066623 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 964066619} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &964066624 Transform: m_ObjectHideFlags: 0 @@ -1172,11 +1083,9 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 973833184} - - 33: {fileID: 973833188} - 135: {fileID: 973833187} - - 23: {fileID: 973833186} m_Layer: 0 - m_Name: node1 + m_Name: nav1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1193,27 +1102,6 @@ Transform: m_LocalScale: {x: 1.93007195, y: 1.93007195, z: 1.93007195} m_Children: [] m_Father: {fileID: 523078142} ---- !u!23 &973833186 -Renderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 973833183} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_LightmapIndex: 255 - m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} - m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_LightProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_SortingLayerID: 0 --- !u!135 &973833187 SphereCollider: m_ObjectHideFlags: 0 @@ -1226,13 +1114,6 @@ SphereCollider: serializedVersion: 2 m_Radius: .5 m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &973833188 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 973833183} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1043241741 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Driver.cs b/Assets/Scripts/Driver.cs new file mode 100644 index 0000000..e0bf5a5 --- /dev/null +++ b/Assets/Scripts/Driver.cs @@ -0,0 +1,14 @@ +using UnityEngine; +using System.Collections; + +public class Driver : MonoBehaviour { + + Vector3 dest; + + void Awake() { + Vector3 pos = GameObject.Find("node3").transform.position; + NavMeshAgent nva = GetComponent(); + nva.SetDestination(pos); + nva.updateRotation = false; + } +} diff --git a/Assets/Scripts/Driver.cs.meta b/Assets/Scripts/Driver.cs.meta new file mode 100644 index 0000000..4bd744b --- /dev/null +++ b/Assets/Scripts/Driver.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa1e6a2eca2f44c56a92f8128e0a7d43 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Scripts/NavPoint.cs b/Assets/Scripts/NavPoint.cs new file mode 100644 index 0000000..98316b1 --- /dev/null +++ b/Assets/Scripts/NavPoint.cs @@ -0,0 +1,10 @@ +using UnityEngine; +using System.Collections; + +public class NavPoint : MonoBehaviour { + void OnTriggerEnter(Collider other) { + Patron p = other.gameObject.GetComponent(); + if(p != null) + p.NextDest(); + } +} diff --git a/Assets/Scripts/NavPoint.cs.meta b/Assets/Scripts/NavPoint.cs.meta new file mode 100644 index 0000000..a581f50 --- /dev/null +++ b/Assets/Scripts/NavPoint.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 79de31dde1348491f8c7da34e162f0e7 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/Assets/Scripts/Patron.cs b/Assets/Scripts/Patron.cs index 7feb490..554abc2 100644 --- a/Assets/Scripts/Patron.cs +++ b/Assets/Scripts/Patron.cs @@ -3,13 +3,24 @@ using System.Collections; public class Patron : MonoBehaviour { - Vector3 dest; + public GameObject[] destinations; + public int currentDestIndex = 0; + + private NavMeshAgent nva; void Awake() { - Vector3 pos = GameObject.Find("node3").transform.position; - NavMeshAgent nva = GetComponent(); - nva.SetDestination(pos); + nva = GetComponent(); nva.updateRotation = false; + nva.SetDestination(destinations[0].transform.position); + } + + public void NextDest() { + if(currentDestIndex + 1 < destinations.Length) + ++currentDestIndex; + else + currentDestIndex = 0; + + nva.SetDestination(destinations[currentDestIndex].transform.position); } void OnTriggerEnter(Collider other) { From 6d6d715c6e6ea21953d0703dc0e08205accf6692 Mon Sep 17 00:00:00 2001 From: Wilson Leong Date: Sat, 26 Apr 2014 14:52:07 -0600 Subject: [PATCH 2/2] Nav points merged back in --- Assets/Scenes/Main.unity | 54 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 586b534..89b8e16 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -267,8 +267,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b933d79988a624405b43ff0fb8c3d527, type: 3} m_Name: m_EditorClassIdentifier: - destinations: [] - currentDest: {fileID: 0} + destinations: + - {fileID: 582022781} + - {fileID: 973833183} + currentDestIndex: 0 --- !u!195 &134611203 NavMeshAgent: m_ObjectHideFlags: 0 @@ -397,6 +399,7 @@ GameObject: m_Component: - 4: {fileID: 582022782} - 135: {fileID: 582022785} + - 114: {fileID: 582022783} m_Layer: 0 m_Name: nav0 m_TagString: Untagged @@ -415,6 +418,17 @@ Transform: m_LocalScale: {x: 1.93007231, y: 1.93007231, z: 1.93007231} m_Children: [] m_Father: {fileID: 523078142} +--- !u!114 &582022783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 582022781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79de31dde1348491f8c7da34e162f0e7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!135 &582022785 SphereCollider: m_ObjectHideFlags: 0 @@ -902,6 +916,7 @@ GameObject: m_Component: - 4: {fileID: 815705939} - 135: {fileID: 815705942} + - 114: {fileID: 815705940} m_Layer: 0 m_Name: nav3 m_TagString: Untagged @@ -920,6 +935,17 @@ Transform: m_LocalScale: {x: 1.93007195, y: 1.93007195, z: 1.93007195} m_Children: [] m_Father: {fileID: 523078142} +--- !u!114 &815705940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 815705938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79de31dde1348491f8c7da34e162f0e7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!135 &815705942 SphereCollider: m_ObjectHideFlags: 0 @@ -941,6 +967,7 @@ GameObject: m_Component: - 4: {fileID: 964066624} - 135: {fileID: 964066622} + - 114: {fileID: 964066620} m_Layer: 0 m_Name: nav2 m_TagString: Untagged @@ -948,6 +975,17 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &964066620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 964066619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79de31dde1348491f8c7da34e162f0e7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!135 &964066622 SphereCollider: m_ObjectHideFlags: 0 @@ -1084,6 +1122,7 @@ GameObject: m_Component: - 4: {fileID: 973833184} - 135: {fileID: 973833187} + - 114: {fileID: 973833185} m_Layer: 0 m_Name: nav1 m_TagString: Untagged @@ -1102,6 +1141,17 @@ Transform: m_LocalScale: {x: 1.93007195, y: 1.93007195, z: 1.93007195} m_Children: [] m_Father: {fileID: 523078142} +--- !u!114 &973833185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 973833183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79de31dde1348491f8c7da34e162f0e7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!135 &973833187 SphereCollider: m_ObjectHideFlags: 0