aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Assets/Scenes/Jungle.unity193
-rw-r--r--Assets/Scripts/Actors/Enemy.cs14
-rw-r--r--Assets/Scripts/LevelController.cs6
-rw-r--r--Assets/Scripts/Traps/TrapDamage.cs1
4 files changed, 198 insertions, 16 deletions
diff --git a/Assets/Scenes/Jungle.unity b/Assets/Scenes/Jungle.unity
index 2bb163d..c6979c4 100644
--- a/Assets/Scenes/Jungle.unity
+++ b/Assets/Scenes/Jungle.unity
@@ -452,6 +452,68 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1001 &49594509
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1984304316}
+ m_Modifications:
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -24.910004
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -26.82
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4799600927363337844, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ propertyPath: m_Name
+ value: Zombie (1)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+--- !u!4 &49594510 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ m_PrefabInstance: {fileID: 49594509}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &64907095
PrefabInstance:
m_ObjectHideFlags: 0
@@ -9825,6 +9887,11 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &565923084 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ m_PrefabInstance: {fileID: 8919320862215231254}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &579896363
PrefabInstance:
m_ObjectHideFlags: 0
@@ -11138,6 +11205,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3}
m_PrefabInstance: {fileID: 814781393}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &861919841 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
+ m_PrefabInstance: {fileID: 2119287057}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &869826067
PrefabInstance:
m_ObjectHideFlags: 0
@@ -305995,6 +306067,68 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3}
m_PrefabInstance: {fileID: 1954126716}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1955727881
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1984304316}
+ m_Modifications:
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 400.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 14.6
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 180
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8919320861035673885, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ propertyPath: m_Name
+ value: Mummy (1)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+--- !u!4 &1955727882 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
+ m_PrefabInstance: {fileID: 1955727881}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1961487387
GameObject:
m_ObjectHideFlags: 0
@@ -324689,6 +324823,41 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5267721061292888517, guid: 47596d04057f55146bb75d8cea49ccdb, type: 3}
m_PrefabInstance: {fileID: 1983189679}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1984304315
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1984304316}
+ m_Layer: 0
+ m_Name: Enemies
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1984304316
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1984304315}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 861919841}
+ - {fileID: 565923084}
+ - {fileID: 1955727882}
+ - {fileID: 49594510}
+ m_Father: {fileID: 0}
+ m_RootOrder: 9
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2019697999
GameObject:
m_ObjectHideFlags: 0
@@ -325003,15 +325172,15 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 1984304316}
m_Modifications:
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_RootOrder
- value: 9
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_LocalPosition.x
- value: -67.91
+ value: 23.839996
objectReference: {fileID: 0}
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_LocalPosition.y
@@ -325027,15 +325196,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 199732719703436395, guid: be3f47d037eef1240b8271b5e1da25ba, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -325472,19 +325641,19 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 1984304316}
m_Modifications:
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_RootOrder
- value: 10
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_LocalPosition.x
- value: -79.2
+ value: 422.5
objectReference: {fileID: 0}
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_LocalPosition.y
- value: -14.69
+ value: -3.4
objectReference: {fileID: 0}
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_LocalPosition.z
@@ -325496,7 +325665,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_LocalRotation.y
@@ -325504,7 +325673,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8919320861035673862, guid: d1ac05b890e176640a3d9fd9e24cd0c1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
diff --git a/Assets/Scripts/Actors/Enemy.cs b/Assets/Scripts/Actors/Enemy.cs
index 5abf7ce..d7d699e 100644
--- a/Assets/Scripts/Actors/Enemy.cs
+++ b/Assets/Scripts/Actors/Enemy.cs
@@ -10,6 +10,8 @@ namespace MontanaJohns.Actors
protected float attackRate = 0.5f;
protected float nextAttackTime = 0f;
+ bool playerSeen;
+
protected override void Awake()
{
base.Awake();
@@ -19,8 +21,16 @@ namespace MontanaJohns.Actors
// Update is called once per frame
void Update()
{
- MoveTowardsPlayer();
- Attack();
+ if(!playerSeen)
+ {
+ if (Mathf.Abs(player.transform.position.x - transform.position.x) <= 50 && Mathf.Abs(player.transform.position.y - transform.position.y) <= 15)
+ playerSeen = true;
+ }
+ else
+ {
+ MoveTowardsPlayer();
+ Attack();
+ }
CheckHealth();
}
diff --git a/Assets/Scripts/LevelController.cs b/Assets/Scripts/LevelController.cs
index 6d91d71..456dafe 100644
--- a/Assets/Scripts/LevelController.cs
+++ b/Assets/Scripts/LevelController.cs
@@ -11,7 +11,11 @@ public class LevelController : MonoBehaviour
{
Destroy(GameObject.Find("Boulder(Clone)"));
Destroy(GameObject.Find("BoobyTrapSpawnPoint(Clone)"));
- Destroy(GameObject.Find("Treasure"));
+ var currentTreasure = GameObject.Find("Treasure");
+ if(currentTreasure)
+ Destroy(currentTreasure);
+ else
+ Destroy(GameObject.Find("Treasure(Clone)"));
Instantiate(treasure);
}
}
diff --git a/Assets/Scripts/Traps/TrapDamage.cs b/Assets/Scripts/Traps/TrapDamage.cs
index a61df7b..7318368 100644
--- a/Assets/Scripts/Traps/TrapDamage.cs
+++ b/Assets/Scripts/Traps/TrapDamage.cs
@@ -51,7 +51,6 @@ public class TrapDamage : MonoBehaviour
if (collision.tag == "Player" || collision.tag == "Enemy")
{
collision.GetComponent<Actor>().TakeDamage(damage);
- Debug.Log("Damage");
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-20 14:41:06 +0000