diff --git a/Project Undercover/Assets/Scenes/scene.unity b/Project Undercover/Assets/Scenes/scene.unity index 2b8e8dc..2c46b40 100644 --- a/Project Undercover/Assets/Scenes/scene.unity +++ b/Project Undercover/Assets/Scenes/scene.unity @@ -1168,62 +1168,6 @@ Transform: m_PrefabParentObject: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} m_PrefabInternal: {fileID: 55707631} ---- !u!1001 &503663093 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: -2.7139997 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 21 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (9) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 --- !u!1 &522116869 GameObject: m_ObjectHideFlags: 0 @@ -1566,118 +1510,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 646484924} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &661955551 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: 1.465 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: -0.799 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (8) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 13 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 ---- !u!1001 &664560028 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0.813 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (1) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 7 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 --- !u!1 &743938565 GameObject: m_ObjectHideFlags: 0 @@ -1974,58 +1806,6 @@ NavMeshAgent: m_BaseOffset: 0.5 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 2 ---- !u!1001 &992194212 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 --- !u!4 &1112250644 stripped Transform: m_PrefabParentObject: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, @@ -2517,62 +2297,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1243434758} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1276253893 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: -1.533 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: -0.799 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 17 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (5) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 12 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1284539760 GameObject: m_ObjectHideFlags: 0 @@ -2655,118 +2379,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1284539760} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1300289752 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: -1.533 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 ---- !u!1001 &1325022915 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: -1.533 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0.813 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (4) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 8 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1339720422 GameObject: m_ObjectHideFlags: 0 @@ -3726,118 +3338,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1692556951} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1781942945 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: -2.7139997 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: -0.799 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 23 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (11) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 ---- !u!1001 &1800970182 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: -0.799 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (2) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 --- !u!1 &1807653393 GameObject: m_ObjectHideFlags: 0 @@ -4107,118 +3607,6 @@ Transform: m_Father: {fileID: 115526832} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2020385500 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: 1.4650002 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 14 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 ---- !u!1001 &2036326248 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: -2.714 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0.813 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (10) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 --- !u!1 &2036898600 GameObject: m_ObjectHideFlags: 0 @@ -4662,59 +4050,3 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2116889710} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &2144306898 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.x - value: 1.4650002 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalPosition.z - value: 0.813 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4550573785341638, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_RootOrder - value: 19 - objectReference: {fileID: 0} - - target: {fileID: 1057615597006810, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - propertyPath: m_Name - value: NPC (7) - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: viewIdField - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 114359923699139636, guid: b25e969032ebb1f4089308db11ee93b1, - type: 2} - propertyPath: instantiationId - value: 15 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b25e969032ebb1f4089308db11ee93b1, type: 2} - m_IsPrefabParent: 0 diff --git a/Project Undercover/Assets/Scripts/GameManager.cs b/Project Undercover/Assets/Scripts/GameManager.cs index 85e06b9..1d28cfa 100644 --- a/Project Undercover/Assets/Scripts/GameManager.cs +++ b/Project Undercover/Assets/Scripts/GameManager.cs @@ -55,15 +55,16 @@ public class GameManager : Photon.PunBehaviour { spy.GetComponent().enabled = true; spy.GetComponent().SetColor(); } - /* + if (PhotonNetwork.isMasterClient) { - for (int i = 0; i < numNCPs; i++) + for (int i = 0; i < numNCPs; i++) { Vector3 randPos = SimpleNPCBehavior.GetRandomLocation(); - PhotonNetwork.Instantiate(NCPPrefab.name, randPos, Quaternion.identity, 0); + //photonView.RPC ("SpawnNPC", PhotonTargets.All, randPos); + PhotonNetwork.Instantiate(NCPPrefab.name, randPos, Quaternion.identity, 0); } - }*/ + } } @@ -79,6 +80,12 @@ public class GameManager : Photon.PunBehaviour { photonView.RPC("ShowSpiesWinScreen", PhotonTargets.All); } + [PunRPC] + void SpawnNPC(Vector3 pos) + { + Instantiate(NCPPrefab, pos, Quaternion.identity); + } + [PunRPC] void CompleteMissionRPC(int missionsCompleted) { diff --git a/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs b/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs index 33b0836..28ca423 100644 --- a/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs +++ b/Project Undercover/Assets/Scripts/SimpleNPCBehavior.cs @@ -19,6 +19,7 @@ public class SimpleNPCBehavior : Photon.PunBehaviour if (PhotonNetwork.isMasterClient) { photonView.RPC("TeleportToTarget", PhotonTargets.All, GetRandomLocation()); photonView.RPC("SetColorRPC", PhotonTargets.All, new Vector3(Random.value, Random.value, Random.value)); + Debug.Log ("setting color"); } }