diff --git a/Assets/Prefabs/Enemy/Jendral.prefab b/Assets/Prefabs/Enemy/Jendral.prefab
index 1f7d590478bbe0a870ad2f4a9d6176c0ecad668a..b80689d284eada127fd209004370d21c27b3c8b0 100644
--- a/Assets/Prefabs/Enemy/Jendral.prefab
+++ b/Assets/Prefabs/Enemy/Jendral.prefab
@@ -2656,7 +2656,6 @@ MonoBehaviour:
health: 0
hitParticle: {fileID: 0}
healthBar: {fileID: 842498105109381099}
- coin: {fileID: 3129200342344496425, guid: 3e29573f06c0a7e4fa986fff41de17af, type: 3}
isDead: 0
--- !u!114 &4250396705889160816
MonoBehaviour:
diff --git a/Assets/Scenes/Level03.unity b/Assets/Scenes/Level03.unity
index 20274955198215fa868b9a8faecf07d0560a6d0c..e5fe12b48776e36f0c10909f5c9cbf401ea09ef7 100644
--- a/Assets/Scenes/Level03.unity
+++ b/Assets/Scenes/Level03.unity
@@ -131,6 +131,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 728095708}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 2
@@ -785,7 +789,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 204019709}
- m_Layer: 0
+ m_Layer: 8
m_Name: walls
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1123,6 +1127,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1813624333}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 3
@@ -1669,6 +1677,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 728095708}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -1719,6 +1731,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 712902079}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 1
@@ -1765,7 +1781,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 712902079}
- m_Layer: 0
+ m_Layer: 8
m_Name: back
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1799,7 +1815,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 728095708}
- m_Layer: 0
+ m_Layer: 8
m_Name: left
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2302,9 +2318,9 @@ GameObject:
- component: {fileID: 821178760}
- component: {fileID: 821178759}
- component: {fileID: 821178758}
- m_Layer: 0
+ m_Layer: 7
m_Name: AimPos
- m_TagString: Untagged
+ m_TagString: PlayerBullet
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2676,6 +2692,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 728095708}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 4
@@ -2721,6 +2741,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1813624333}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 4
@@ -2921,6 +2945,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1558268092}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -3061,6 +3089,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1813624333}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 2
@@ -3118,7 +3150,7 @@ GameObject:
- component: {fileID: 1020583632}
- component: {fileID: 1020583631}
- component: {fileID: 1020583630}
- m_Layer: 0
+ m_Layer: 8
m_Name: ceiling
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -3224,6 +3256,10 @@ PrefabInstance:
propertyPath: m_Name
value: crypt_wall (1)
objectReference: {fileID: 0}
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -3845,6 +3881,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1813624333}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -3903,6 +3943,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 728095708}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 1
@@ -3960,6 +4004,10 @@ PrefabInstance:
propertyPath: m_Name
value: crypt_wall (2)
objectReference: {fileID: 0}
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -4435,6 +4483,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 728095708}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 3
@@ -4695,7 +4747,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1558268092}
- m_Layer: 0
+ m_Layer: 8
m_Name: front
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5013,6 +5065,63 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
m_PrefabInstance: {fileID: 32872129}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1628361186
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 266344222175847303, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_Name
+ value: GameStateManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 75.2497
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 118.28951
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 82.369125
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7866824068808640646, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f4f1865830a71ae4cbcbbd02a4b8aa1e, type: 3}
--- !u!4 &1630074877 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4250805365076402, guid: 8da19fac2d7b4534895cdd95853c048f, type: 3}
@@ -5552,6 +5661,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1813624333}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 1
@@ -5621,7 +5734,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1813624333}
- m_Layer: 0
+ m_Layer: 8
m_Name: right
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5755,6 +5868,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 712902079}
m_Modifications:
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -6189,6 +6306,10 @@ PrefabInstance:
propertyPath: m_Name
value: crypt_wall (1)
objectReference: {fileID: 0}
+ - target: {fileID: 1094198129471722, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
+ propertyPath: m_Layer
+ value: 8
+ objectReference: {fileID: 0}
- target: {fileID: 4080719392071276, guid: 615688eb22692db418c6f8646a5b507c, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -6417,7 +6538,7 @@ GameObject:
- component: {fileID: 2022094945}
- component: {fileID: 2022094944}
- component: {fileID: 2022094943}
- m_Layer: 0
+ m_Layer: 8
m_Name: floor
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -6710,3 +6831,4 @@ SceneRoots:
- {fileID: 1235770507}
- {fileID: 986477002}
- {fileID: 1464365226}
+ - {fileID: 1628361186}
diff --git a/Assets/Scripts/Enemy/EnemyHealth.cs b/Assets/Scripts/Enemy/EnemyHealth.cs
index 1fd40d2de67900edb75dbf8a4844199d4579461a..3e1fca353584780f6d1efe47aceb6114fb89e227 100644
--- a/Assets/Scripts/Enemy/EnemyHealth.cs
+++ b/Assets/Scripts/Enemy/EnemyHealth.cs
@@ -44,7 +44,7 @@ public class EnemyHealth : MonoBehaviour
GetComponent<OrbManager>().DropRandomOrb();
Debug.Log("ENEMYDEAD:" + gameObject.name);
- if (gameObject.CompareTag("Raja"))
+ if (!gameObject.CompareTag("Raja"))
{
GetComponent<OrbManager>().DropRandomOrb();
if(gameObject.CompareTag("Kroco"))
diff --git a/Assets/Scripts/Objective/Level03/Objective03.cs b/Assets/Scripts/Objective/Level03/Objective03.cs
index 6e8d84351c9f1bba6e10ac685a8c1143daa7bd60..79a124d80145ce00ccd00e6e23aa85e0707675fa 100644
--- a/Assets/Scripts/Objective/Level03/Objective03.cs
+++ b/Assets/Scripts/Objective/Level03/Objective03.cs
@@ -15,29 +15,32 @@ public class Objective03 : Objective
public override bool IsCompleted()
{
- int krocoTreshold = 20;
- int kepalaKrocoTreshold = 10;
- int jendralTreshold = 3;
+ int krocoTreshold = 1;
+ int kepalaKrocoTreshold = 0;
+ int jendralTreshold = 0;
int krocoKilled = GameStateManager.Instance.krocoKill - curKrocoKilled;
KrocoUI.SetText("Kroco: " +krocoKilled.ToString()+"/"+krocoTreshold);
- int kepalaKrocoKilled = GameStateManager.Instance.krocoKill - curKepalaKrocoKilled;
+ int kepalaKrocoKilled = GameStateManager.Instance.kepalaKrocoKill - curKepalaKrocoKilled;
KepalaKrocoUI.SetText("Kepala Kroco: "+kepalaKrocoKilled.ToString()+"/"+kepalaKrocoTreshold);
- int jendralKilled = GameStateManager.Instance.krocoKill - curJendralKilled;
+ int jendralKilled = GameStateManager.Instance.jendralKill - curJendralKilled;
JendralUI.SetText("Jendral: "+krocoKilled.ToString()+"/"+jendralTreshold);
if (krocoKilled >= krocoTreshold && kepalaKrocoKilled >= kepalaKrocoTreshold && jendralKilled >= jendralTreshold)
{
altar.SetActive(true);
float playerDistance = Vector3.Distance(altar.transform.position, player.position);
- if (playerDistance < 10f)
+ if (playerDistance < 2.5f)
{
return true;
}
}
- altar.SetActive(false);
+ else
+ {
+ altar.SetActive(false);
+ }
return false;
}
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index ab8746fba00ecf845d1d9601d48fb29ac11152de..1e2aa5bd3f226c11a7a602030ff1bc1880c2c523 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -11,6 +11,10 @@ TagManager:
- Enemy
- Raja
- CheatUI
+ - PlayerEyes
+ - Jendral
+ - Kroco
+ - KepalaKroco
layers:
- Default
- TransparentFX
@@ -20,7 +24,7 @@ TagManager:
- UI
- DialogueBox
- Bullet
- -
+ - WallUnderground
-
-
-