Skip to content

Commit c9bb822

Browse files
EgedotErcanEgedotErcan
committed
Unit 2 Basic Gameplay prototpye 2 was finished
The game was finished in Unity from Unit 2 - Collision Decisions Lesson 2.4.1-2.4.6
1 parent 9e8a33b commit c9bb822

13 files changed

+762
-260
lines changed

‎Prototype 2/Assets/Prefabs/Animal_Cow_White.prefab

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,6 +1542,8 @@ GameObject:
15421542
- component: {fileID: 2742620917668348712}
15431543
- component: {fileID: 2742620918977521052}
15441544
- component: {fileID: -3753892652407508888}
1545+
- component: {fileID: 2893534390550564650}
1546+
- component: {fileID: -8744545731523759685}
15451547
m_Layer: 0
15461548
m_Name: Animal_Cow_White
15471549
m_TagString: Untagged
@@ -1608,6 +1610,31 @@ MonoBehaviour:
16081610
m_Script: {fileID: 11500000, guid: 9be7fa1bb9d092c4ea71a31952b02be6, type: 3}
16091611
m_Name:
16101612
m_EditorClassIdentifier:
1613+
--- !u!65 &2893534390550564650
1614+
BoxCollider:
1615+
m_ObjectHideFlags: 0
1616+
m_CorrespondingSourceObject: {fileID: 0}
1617+
m_PrefabInstance: {fileID: 0}
1618+
m_PrefabAsset: {fileID: 0}
1619+
m_GameObject: {fileID: 2742620917677837832}
1620+
m_Material: {fileID: 0}
1621+
m_IsTrigger: 1
1622+
m_Enabled: 1
1623+
serializedVersion: 2
1624+
m_Size: {x: 15.517036, y: 31.985538, z: 47.448868}
1625+
m_Center: {x: -0.13479193, y: 15.606932, z: 0.15922652}
1626+
--- !u!114 &-8744545731523759685
1627+
MonoBehaviour:
1628+
m_ObjectHideFlags: 0
1629+
m_CorrespondingSourceObject: {fileID: 0}
1630+
m_PrefabInstance: {fileID: 0}
1631+
m_PrefabAsset: {fileID: 0}
1632+
m_GameObject: {fileID: 2742620917677837832}
1633+
m_Enabled: 1
1634+
m_EditorHideFlags: 0
1635+
m_Script: {fileID: 11500000, guid: 0b9b7a13547510c48ba2cc06bc955631, type: 3}
1636+
m_Name:
1637+
m_EditorClassIdentifier:
16111638
--- !u!1 &2742620917677837976
16121639
GameObject:
16131640
m_ObjectHideFlags: 0

‎Prototype 2/Assets/Prefabs/Animal_Horse_Black.prefab

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,6 +1275,8 @@ GameObject:
12751275
- component: {fileID: 6926506448555224215}
12761276
- component: {fileID: 6926506447892589533}
12771277
- component: {fileID: -1445427462775112691}
1278+
- component: {fileID: 6737975268689536749}
1279+
- component: {fileID: 2845724671820099172}
12781280
m_Layer: 0
12791281
m_Name: Animal_Horse_Black
12801282
m_TagString: Untagged
@@ -1333,7 +1335,7 @@ MonoBehaviour:
13331335
m_Script: {fileID: 11500000, guid: ee9930c31d506dc4a8715da7805f3791, type: 3}
13341336
m_Name:
13351337
m_EditorClassIdentifier:
1336-
movingSpeed: 13
1338+
movingSpeed: 11
13371339
--- !u!114 &-1445427462775112691
13381340
MonoBehaviour:
13391341
m_ObjectHideFlags: 0
@@ -1346,6 +1348,31 @@ MonoBehaviour:
13461348
m_Script: {fileID: 11500000, guid: 9be7fa1bb9d092c4ea71a31952b02be6, type: 3}
13471349
m_Name:
13481350
m_EditorClassIdentifier:
1351+
--- !u!65 &6737975268689536749
1352+
BoxCollider:
1353+
m_ObjectHideFlags: 0
1354+
m_CorrespondingSourceObject: {fileID: 0}
1355+
m_PrefabInstance: {fileID: 0}
1356+
m_PrefabAsset: {fileID: 0}
1357+
m_GameObject: {fileID: 6926506448545793667}
1358+
m_Material: {fileID: 0}
1359+
m_IsTrigger: 1
1360+
m_Enabled: 1
1361+
serializedVersion: 2
1362+
m_Size: {x: 32.786858, y: 39.736214, z: 47.297092}
1363+
m_Center: {x: 1.0282373, y: 17.6692, z: 5.6311917}
1364+
--- !u!114 &2845724671820099172
1365+
MonoBehaviour:
1366+
m_ObjectHideFlags: 0
1367+
m_CorrespondingSourceObject: {fileID: 0}
1368+
m_PrefabInstance: {fileID: 0}
1369+
m_PrefabAsset: {fileID: 0}
1370+
m_GameObject: {fileID: 6926506448545793667}
1371+
m_Enabled: 1
1372+
m_EditorHideFlags: 0
1373+
m_Script: {fileID: 11500000, guid: 0b9b7a13547510c48ba2cc06bc955631, type: 3}
1374+
m_Name:
1375+
m_EditorClassIdentifier:
13491376
--- !u!1 &6926506448545793909
13501377
GameObject:
13511378
m_ObjectHideFlags: 0

‎Prototype 2/Assets/Prefabs/Dog_BullDog_01.prefab

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2069,6 +2069,8 @@ GameObject:
20692069
- component: {fileID: 8397168813140405558}
20702070
- component: {fileID: 8397168814134318182}
20712071
- component: {fileID: -266741333687504688}
2072+
- component: {fileID: 7091053838998462928}
2073+
- component: {fileID: 5882908635326607202}
20722074
m_Layer: 0
20732075
m_Name: Dog_BullDog_01
20742076
m_TagString: Untagged
@@ -2171,6 +2173,31 @@ MonoBehaviour:
21712173
m_Script: {fileID: 11500000, guid: 9be7fa1bb9d092c4ea71a31952b02be6, type: 3}
21722174
m_Name:
21732175
m_EditorClassIdentifier:
2176+
--- !u!65 &7091053838998462928
2177+
BoxCollider:
2178+
m_ObjectHideFlags: 0
2179+
m_CorrespondingSourceObject: {fileID: 0}
2180+
m_PrefabInstance: {fileID: 0}
2181+
m_PrefabAsset: {fileID: 0}
2182+
m_GameObject: {fileID: 8397168813147852682}
2183+
m_Material: {fileID: 0}
2184+
m_IsTrigger: 1
2185+
m_Enabled: 1
2186+
serializedVersion: 2
2187+
m_Size: {x: 0.14387487, y: 0.20255925, z: 0.27324772}
2188+
m_Center: {x: 0.0031858408, y: 0.091610186, z: 0.022961507}
2189+
--- !u!114 &5882908635326607202
2190+
MonoBehaviour:
2191+
m_ObjectHideFlags: 0
2192+
m_CorrespondingSourceObject: {fileID: 0}
2193+
m_PrefabInstance: {fileID: 0}
2194+
m_PrefabAsset: {fileID: 0}
2195+
m_GameObject: {fileID: 8397168813147852682}
2196+
m_Enabled: 1
2197+
m_EditorHideFlags: 0
2198+
m_Script: {fileID: 11500000, guid: 0b9b7a13547510c48ba2cc06bc955631, type: 3}
2199+
m_Name:
2200+
m_EditorClassIdentifier:
21742201
--- !u!1 &8397168813147882004
21752202
GameObject:
21762203
m_ObjectHideFlags: 0

‎Prototype 2/Assets/Prefabs/Food_Cookie_01.prefab

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ GameObject:
1313
- component: {fileID: 3777077501769495993}
1414
- component: {fileID: 3777077500633576035}
1515
- component: {fileID: 6005611482382925814}
16+
- component: {fileID: 3643511822626724558}
17+
- component: {fileID: 6035683035454982706}
18+
- component: {fileID: -8838302620433231971}
1619
m_Layer: 0
1720
m_Name: Food_Cookie_01
1821
m_TagString: Untagged
@@ -108,3 +111,44 @@ MonoBehaviour:
108111
m_Script: {fileID: 11500000, guid: 9be7fa1bb9d092c4ea71a31952b02be6, type: 3}
109112
m_Name:
110113
m_EditorClassIdentifier:
114+
--- !u!65 &3643511822626724558
115+
BoxCollider:
116+
m_ObjectHideFlags: 0
117+
m_CorrespondingSourceObject: {fileID: 0}
118+
m_PrefabInstance: {fileID: 0}
119+
m_PrefabAsset: {fileID: 0}
120+
m_GameObject: {fileID: 3777077501771492217}
121+
m_Material: {fileID: 0}
122+
m_IsTrigger: 1
123+
m_Enabled: 1
124+
serializedVersion: 2
125+
m_Size: {x: 0.52475095, y: 0.06719126, z: 0.52475107}
126+
m_Center: {x: 0, y: -0.0000000018626451, z: -0.000000074505806}
127+
--- !u!54 &6035683035454982706
128+
Rigidbody:
129+
m_ObjectHideFlags: 0
130+
m_CorrespondingSourceObject: {fileID: 0}
131+
m_PrefabInstance: {fileID: 0}
132+
m_PrefabAsset: {fileID: 0}
133+
m_GameObject: {fileID: 3777077501771492217}
134+
serializedVersion: 2
135+
m_Mass: 1
136+
m_Drag: 0
137+
m_AngularDrag: 0.05
138+
m_UseGravity: 0
139+
m_IsKinematic: 0
140+
m_Interpolate: 0
141+
m_Constraints: 0
142+
m_CollisionDetection: 0
143+
--- !u!114 &-8838302620433231971
144+
MonoBehaviour:
145+
m_ObjectHideFlags: 0
146+
m_CorrespondingSourceObject: {fileID: 0}
147+
m_PrefabInstance: {fileID: 0}
148+
m_PrefabAsset: {fileID: 0}
149+
m_GameObject: {fileID: 3777077501771492217}
150+
m_Enabled: 1
151+
m_EditorHideFlags: 0
152+
m_Script: {fileID: 11500000, guid: 0b9b7a13547510c48ba2cc06bc955631, type: 3}
153+
m_Name:
154+
m_EditorClassIdentifier:

‎Prototype 2/Assets/Scripts/DetectCollision.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
public class DetectCollision : MonoBehaviour
6+
{
7+
// Start is called before the first frame update
8+
void Start()
9+
{
10+
11+
}
12+
13+
// Update is called once per frame
14+
void Update()
15+
{
16+
17+
}
18+
private void OnTriggerEnter(Collider other)
19+
{
20+
Destroy(gameObject);
21+
Destroy(other.gameObject);
22+
}
23+
}

‎Prototype 2/Assets/Scripts/DetectCollision.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Prototype 2/Assets/Scripts/PlayerController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class PlayerController : MonoBehaviour
66
{
7-
private float leftRightSpeed = 10f;
7+
private float leftRightSpeed = 20f;
88
private float xRange = 12f;
99
private float horizontalInput;
1010

‎Prototype 2/Assets/Scripts/SpawnManager.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,25 @@ public class SpawnManager : MonoBehaviour
77
public GameObject[] animalPrefabs;
88
private float spawnRangeX = 13f;
99
private float spawnPosZ = 20f;
10+
private float startDelay = 2f;
11+
private float spawnInterval = 1.5f;
12+
1013

11-
// Start is called before the first frame update
1214
void Start()
1315
{
14-
16+
InvokeRepeating("SpawnRandomAnimal", startDelay, spawnInterval);
1517
}
1618

17-
// Update is called once per frame
19+
1820
void Update()
1921
{
20-
int animalIndex = Random.Range(0, animalPrefabs.Length);
21-
Vector3 spawnPosition = new Vector3(Random.Range(-spawnRangeX,spawnRangeX), 0, spawnPosZ);
2222

23-
if (Input.GetKeyDown(KeyCode.S))
24-
{
25-
Instantiate(animalPrefabs[animalIndex], spawnPosition, animalPrefabs[animalIndex].transform.rotation);
26-
}
23+
}
24+
25+
private void SpawnRandomAnimal()
26+
{
27+
int animalIndex = Random.Range(0, animalPrefabs.Length);
28+
Vector3 spawnPosition = new Vector3(Random.Range(-spawnRangeX, spawnRangeX), 0, spawnPosZ);
29+
Instantiate(animalPrefabs[animalIndex], spawnPosition, animalPrefabs[animalIndex].transform.rotation);
2730
}
2831
}

0 commit comments

Comments
 (0)