Skip to content
This repository was archived by the owner on May 26, 2018. It is now read-only.

Commit 6b19317

Browse files
sabishiangelsabishiangel
authored
Merge pull request #123 from aagavin/feature/arrow
Feature/arrow
2 parents a5ced88 + 4393472 commit 6b19317

File tree

4 files changed

+221
-17
lines changed

4 files changed

+221
-17
lines changed

‎game/Assets/Prefabs/FPSController.prefab

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ Transform:
279279
m_PrefabInternal: {fileID: 100100000}
280280
m_GameObject: {fileID: 1440884344294724}
281281
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
282-
m_LocalPosition: {x: -232.04, y: 214.5, z: 158.77}
282+
m_LocalPosition: {x: -358.552, y: 209.901, z: 127.47}
283283
m_LocalScale: {x: 1, y: 1, z: 1}
284284
m_Children:
285285
- {fileID: 4482944865414442}

‎game/Assets/Prefabs/WinObject.prefab

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GameObject:
2323
- component: {fileID: 114427019808579230}
2424
m_Layer: 0
2525
m_Name: WinObject
26-
m_TagString: Untagged
26+
m_TagString: KeyObject
2727
m_Icon: {fileID: 0}
2828
m_NavMeshLayer: 0
2929
m_StaticEditorFlags: 0

‎game/Assets/_Scenes/Level3.unity

+164
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,18 @@ Transform:
452452
GameObject:
453453
m_PrefabParentObject: {fileID: 100000, guid: 3c56c64a2ab75cc47958f360b6f02938, type: 3}
454454
m_PrefabInternal: {fileID: 1743380789}
455+
--- !u!65 &97752446
456+
BoxCollider:
457+
m_ObjectHideFlags: 0
458+
m_PrefabParentObject: {fileID: 0}
459+
m_PrefabInternal: {fileID: 0}
460+
m_GameObject: {fileID: 97752445}
461+
m_Material: {fileID: 0}
462+
m_IsTrigger: 0
463+
m_Enabled: 1
464+
serializedVersion: 2
465+
m_Size: {x: 2.000001, y: 0.25695705, z: 0.60000056}
466+
m_Center: {x: -0.00000071525574, y: -0.87163925, z: 0.29980013}
455467
--- !u!64 &97752448
456468
MeshCollider:
457469
m_ObjectHideFlags: 0
@@ -470,6 +482,18 @@ MeshCollider:
470482
GameObject:
471483
m_PrefabParentObject: {fileID: 100000, guid: 3c56c64a2ab75cc47958f360b6f02938, type: 3}
472484
m_PrefabInternal: {fileID: 537373850}
485+
--- !u!65 &102895862
486+
BoxCollider:
487+
m_ObjectHideFlags: 0
488+
m_PrefabParentObject: {fileID: 0}
489+
m_PrefabInternal: {fileID: 0}
490+
m_GameObject: {fileID: 102895861}
491+
m_Material: {fileID: 0}
492+
m_IsTrigger: 0
493+
m_Enabled: 1
494+
serializedVersion: 2
495+
m_Size: {x: 2.000001, y: 0.26308727, z: 0.60000056}
496+
m_Center: {x: -0.000009059906, y: -0.868557, z: 0.2998459}
473497
--- !u!64 &102895864
474498
MeshCollider:
475499
m_ObjectHideFlags: 0
@@ -804,6 +828,18 @@ MeshCollider:
804828
GameObject:
805829
m_PrefabParentObject: {fileID: 100000, guid: 6dd60b4eb00d3eb48afad34090c7fa1b, type: 3}
806830
m_PrefabInternal: {fileID: 618051424}
831+
--- !u!65 &217657452
832+
BoxCollider:
833+
m_ObjectHideFlags: 0
834+
m_PrefabParentObject: {fileID: 0}
835+
m_PrefabInternal: {fileID: 0}
836+
m_GameObject: {fileID: 217657451}
837+
m_Material: {fileID: 0}
838+
m_IsTrigger: 0
839+
m_Enabled: 1
840+
serializedVersion: 2
841+
m_Size: {x: 0.25272503, y: 2.0000017, z: 0.6000006}
842+
m_Center: {x: 0.8737117, y: 0.00030201674, z: 0.29969332}
807843
--- !u!64 &217657454
808844
MeshCollider:
809845
m_ObjectHideFlags: 0
@@ -1119,6 +1155,18 @@ MeshCollider:
11191155
GameObject:
11201156
m_PrefabParentObject: {fileID: 100000, guid: a123cd3a2106b9746ba9c256157edb81, type: 3}
11211157
m_PrefabInternal: {fileID: 1466251894}
1158+
--- !u!65 &369218171
1159+
BoxCollider:
1160+
m_ObjectHideFlags: 0
1161+
m_PrefabParentObject: {fileID: 0}
1162+
m_PrefabInternal: {fileID: 0}
1163+
m_GameObject: {fileID: 369218170}
1164+
m_Material: {fileID: 0}
1165+
m_IsTrigger: 0
1166+
m_Enabled: 1
1167+
serializedVersion: 2
1168+
m_Size: {x: 0.23750229, y: 2.0000007, z: 0.60000056}
1169+
m_Center: {x: -0.881423, y: 0.00018596649, z: 0.2999054}
11221170
--- !u!64 &369218173
11231171
MeshCollider:
11241172
m_ObjectHideFlags: 0
@@ -1210,6 +1258,7 @@ Transform:
12101258
- {fileID: 990157570}
12111259
- {fileID: 86076953}
12121260
- {fileID: 977368577}
1261+
- {fileID: 1570322267}
12131262
m_Father: {fileID: 0}
12141263
m_RootOrder: 1
12151264
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2623,6 +2672,18 @@ MeshCollider:
26232672
GameObject:
26242673
m_PrefabParentObject: {fileID: 100000, guid: a123cd3a2106b9746ba9c256157edb81, type: 3}
26252674
m_PrefabInternal: {fileID: 131530050}
2675+
--- !u!65 &791121108
2676+
BoxCollider:
2677+
m_ObjectHideFlags: 0
2678+
m_PrefabParentObject: {fileID: 0}
2679+
m_PrefabInternal: {fileID: 0}
2680+
m_GameObject: {fileID: 791121107}
2681+
m_Material: {fileID: 0}
2682+
m_IsTrigger: 0
2683+
m_Enabled: 1
2684+
serializedVersion: 2
2685+
m_Size: {x: 0.24717534, y: 2.0000017, z: 0.6000006}
2686+
m_Center: {x: -0.8765069, y: -0.0000032186508, z: 0.29967806}
26262687
--- !u!64 &791121110
26272688
MeshCollider:
26282689
m_ObjectHideFlags: 0
@@ -4844,6 +4905,18 @@ Transform:
48444905
GameObject:
48454906
m_PrefabParentObject: {fileID: 100000, guid: a123cd3a2106b9746ba9c256157edb81, type: 3}
48464907
m_PrefabInternal: {fileID: 877652678}
4908+
--- !u!65 &1563185382
4909+
BoxCollider:
4910+
m_ObjectHideFlags: 0
4911+
m_PrefabParentObject: {fileID: 0}
4912+
m_PrefabInternal: {fileID: 0}
4913+
m_GameObject: {fileID: 1563185381}
4914+
m_Material: {fileID: 0}
4915+
m_IsTrigger: 0
4916+
m_Enabled: 1
4917+
serializedVersion: 2
4918+
m_Size: {x: 0.21704945, y: 2.0000017, z: 0.60000074}
4919+
m_Center: {x: -0.89151114, y: -0.00013458701, z: 0.29986393}
48474920
--- !u!64 &1563185384
48484921
MeshCollider:
48494922
m_ObjectHideFlags: 0
@@ -4858,6 +4931,61 @@ MeshCollider:
48584931
m_InflateMesh: 0
48594932
m_SkinWidth: 0.01
48604933
m_Mesh: {fileID: 4300000, guid: a123cd3a2106b9746ba9c256157edb81, type: 3}
4934+
--- !u!1001 &1570322266
4935+
Prefab:
4936+
m_ObjectHideFlags: 0
4937+
serializedVersion: 2
4938+
m_Modification:
4939+
m_TransformParent: {fileID: 369883338}
4940+
m_Modifications:
4941+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4942+
propertyPath: m_LocalPosition.x
4943+
value: -6.84
4944+
objectReference: {fileID: 0}
4945+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4946+
propertyPath: m_LocalPosition.y
4947+
value: -4.41
4948+
objectReference: {fileID: 0}
4949+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4950+
propertyPath: m_LocalPosition.z
4951+
value: 3.24
4952+
objectReference: {fileID: 0}
4953+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4954+
propertyPath: m_LocalRotation.x
4955+
value: 0.9426408
4956+
objectReference: {fileID: 0}
4957+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4958+
propertyPath: m_LocalRotation.y
4959+
value: 0.05648659
4960+
objectReference: {fileID: 0}
4961+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4962+
propertyPath: m_LocalRotation.z
4963+
value: -0.25257978
4964+
objectReference: {fileID: 0}
4965+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4966+
propertyPath: m_LocalRotation.w
4967+
value: 0.21081066
4968+
objectReference: {fileID: 0}
4969+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4970+
propertyPath: m_RootOrder
4971+
value: 52
4972+
objectReference: {fileID: 0}
4973+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4974+
propertyPath: m_LocalEulerAnglesHint.y
4975+
value: 30
4976+
objectReference: {fileID: 0}
4977+
- target: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4978+
propertyPath: m_LocalEulerAnglesHint.x
4979+
value: 154.788
4980+
objectReference: {fileID: 0}
4981+
m_RemovedComponents: []
4982+
m_ParentPrefab: {fileID: 100100000, guid: 517c701cdcbbb17418f41124d274147b, type: 2}
4983+
m_IsPrefabParent: 0
4984+
--- !u!4 &1570322267 stripped
4985+
Transform:
4986+
m_PrefabParentObject: {fileID: 4800401081769942, guid: 517c701cdcbbb17418f41124d274147b,
4987+
type: 2}
4988+
m_PrefabInternal: {fileID: 1570322266}
48614989
--- !u!1 &1586769410 stripped
48624990
GameObject:
48634991
m_PrefabParentObject: {fileID: 100000, guid: 72640556a995a3b4493c8781b08d0f1c, type: 3}
@@ -4997,6 +5125,18 @@ Transform:
49975125
GameObject:
49985126
m_PrefabParentObject: {fileID: 100000, guid: a123cd3a2106b9746ba9c256157edb81, type: 3}
49995127
m_PrefabInternal: {fileID: 1736408302}
5128+
--- !u!65 &1669286681
5129+
BoxCollider:
5130+
m_ObjectHideFlags: 0
5131+
m_PrefabParentObject: {fileID: 0}
5132+
m_PrefabInternal: {fileID: 0}
5133+
m_GameObject: {fileID: 1669286680}
5134+
m_Material: {fileID: 0}
5135+
m_IsTrigger: 0
5136+
m_Enabled: 1
5137+
serializedVersion: 2
5138+
m_Size: {x: 0.23864104, y: 2.0000007, z: 0.6000006}
5139+
m_Center: {x: -0.8806817, y: -0.0000009536743, z: 0.29994583}
50005140
--- !u!64 &1669286683
50015141
MeshCollider:
50025142
m_ObjectHideFlags: 0
@@ -5473,6 +5613,18 @@ MeshCollider:
54735613
GameObject:
54745614
m_PrefabParentObject: {fileID: 100000, guid: 3c56c64a2ab75cc47958f360b6f02938, type: 3}
54755615
m_PrefabInternal: {fileID: 1072281685}
5616+
--- !u!65 &1788384132
5617+
BoxCollider:
5618+
m_ObjectHideFlags: 0
5619+
m_PrefabParentObject: {fileID: 0}
5620+
m_PrefabInternal: {fileID: 0}
5621+
m_GameObject: {fileID: 1788384131}
5622+
m_Material: {fileID: 0}
5623+
m_IsTrigger: 0
5624+
m_Enabled: 1
5625+
serializedVersion: 2
5626+
m_Size: {x: 2.000001, y: 0.22939435, z: 0.60000056}
5627+
m_Center: {x: -0.00024414062, y: -0.8854523, z: 0.2997574}
54765628
--- !u!64 &1788384134
54775629
MeshCollider:
54785630
m_ObjectHideFlags: 0
@@ -5491,6 +5643,18 @@ MeshCollider:
54915643
GameObject:
54925644
m_PrefabParentObject: {fileID: 100000, guid: 27cebd4453c1596479be72e84d0675b0, type: 3}
54935645
m_PrefabInternal: {fileID: 548879369}
5646+
--- !u!65 &1853404550
5647+
BoxCollider:
5648+
m_ObjectHideFlags: 0
5649+
m_PrefabParentObject: {fileID: 0}
5650+
m_PrefabInternal: {fileID: 0}
5651+
m_GameObject: {fileID: 1853404549}
5652+
m_Material: {fileID: 0}
5653+
m_IsTrigger: 0
5654+
m_Enabled: 1
5655+
serializedVersion: 2
5656+
m_Size: {x: 0.23520231, y: 2.0000007, z: 0.60000056}
5657+
m_Center: {x: 0.8823418, y: 0.00017595291, z: 0.3001713}
54945658
--- !u!64 &1853404552
54955659
MeshCollider:
54965660
m_ObjectHideFlags: 0

‎game/Assets/_Scripts/Level_3/ArrowScript.cs

+55-15
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,84 @@
22
using System.Collections.Generic;
33
using UnityEngine;
44

5+
/*
6+
* Pedro Bento
7+
* Aaron Fernandes
8+
* Waynell Lovell
9+
* Ashley Tjonhing
10+
*
11+
*
12+
* COMP 305 - Assignment 4 | Final
13+
*/
14+
15+
16+
/// <summary>
17+
/// Arrow script class
18+
/// </summary>
519
public class ArrowScript : MonoBehaviour {
620

7-
private Transform key;
21+
private Vector3 key;
22+
private Transform player;
823

9-
// Use this for initialization
24+
/// <summary>
25+
/// Start this instance.
26+
/// </summary>
1027
void Start () {
1128

12-
key = GameObject.FindGameObjectWithTag("KeyObject").transform;
13-
14-
if (!key)
15-
Debug.Log("ERROR could not find Key!");
29+
StartCoroutine ("Starter");
1630
}
1731

18-
// Update is called once per frame
32+
/// <summary>
33+
/// Update this instance.
34+
/// </summary>
1935
void Update () {
20-
StartCoroutine("Rotator", 0.1f);
21-
36+
Rotation();
2237
}
2338

2439
void Rotation()
2540
{
26-
Vector2 target = key.position;
41+
//Couldn't fix this <(T_T)>^(T_T)^<(T_T)>
42+
Vector3 target = key;
2743

28-
float dx = this.transform.position.x - target.x;
29-
float dy = this.transform.position.y - target.y;
44+
float dx = player.position.x - target.x;
45+
float dy = player.position.y - target.y;
46+
float dz = player.position.z - target.z;
3047

3148
float angle = Mathf.Atan2(dy, dx) * Mathf.Rad2Deg;
3249

33-
Quaternion rot = Quaternion.Euler(new Vector3(0, 0, angle));
50+
Quaternion rot = Quaternion.Euler(0, 0, angle);
51+
Debug.Log(angle);
3452

3553
this.transform.rotation = rot;
3654

3755
}
3856

57+
/// <summary>
58+
/// Starter IEnumerator
59+
/// </summary>
60+
IEnumerator Starter()
61+
{
62+
yield return new WaitForSeconds(1f);
63+
Debug.Log (GameObject.FindGameObjectWithTag ("KeyObject"));
64+
key = GameObject.FindGameObjectWithTag("KeyObject").transform.position;
65+
66+
player = GameObject.FindGameObjectWithTag("Player").transform;
67+
/*
68+
if (!key) {
69+
Debug.Log ("ERROR could not find Key!");
70+
}
71+
*/
72+
}
73+
74+
75+
/// <summary>
76+
/// Rotator this instance.
77+
/// </summary>
3978
IEnumerator Rotator()
40-
{
41-
yield return new WaitForSeconds(0.1f);
79+
{
80+
yield return new WaitForSeconds(5f);
4281
Rotation();
82+
Debug.Log("boo");
4383
}
4484

4585

0 commit comments

Comments
 (0)