gjcampbell/Super-Robo-Squad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a few bugs involving the party or enemy not being destroyed during a game over or victory state respectively

Browse Source
This commit is contained in:
Gregory Campbell
2020-04-10 13:17:26 -04:00
parent 9d0cebf3cf
commit 00d19e0f0a
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Test Scene.unity
+8 -8
View File
@@ -520,7 +520,7 @@ GameObject:
- component: {fileID: 253563189} - component: {fileID: 253563189}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position m_Name: Party Member Position
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -945,7 +945,7 @@ GameObject:
- component: {fileID: 584866349} - component: {fileID: 584866349}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position m_Name: Party Member Position
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -1236,7 +1236,7 @@ GameObject:
- component: {fileID: 901586392} - component: {fileID: 901586392}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position m_Name: Party Member Position
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -1478,7 +1478,7 @@ GameObject:
- component: {fileID: 982463267} - component: {fileID: 982463267}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position 3 m_Name: Party Member Position 3
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -1590,7 +1590,7 @@ GameObject:
- component: {fileID: 1054126017} - component: {fileID: 1054126017}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position 2 m_Name: Party Member Position 2
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -2418,7 +2418,7 @@ GameObject:
- component: {fileID: 1537576151} - component: {fileID: 1537576151}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position 4 m_Name: Party Member Position 4
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -2579,7 +2579,7 @@ GameObject:
- component: {fileID: 1729514559} - component: {fileID: 1729514559}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position 1 m_Name: Party Member Position 1
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@@ -2692,7 +2692,7 @@ GameObject:
- component: {fileID: 1887744310} - component: {fileID: 1887744310}
m_Layer: 0 m_Layer: 0
m_Name: Party Member Position m_Name: Party Member Position
m_TagString: Untagged m_TagString: Party
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
Assets/Scripts/GMScript.cs
+5 -6
View File
@@ -90,7 +90,7 @@ public class GMScript : MonoBehaviour
EnemyHealthText.text = enemyHealth.ToString(); EnemyHealthText.text = enemyHealth.ToString();
PartyHealthText.text = partyHealth.ToString(); PartyHealthText.text = partyHealth.ToString();
if (Input.GetMouseButtonDown(0)) if (Input.GetMouseButtonDown(0) && gameover == false && victory == false)
{ {
Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition); Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y); Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y);
@@ -128,10 +128,8 @@ public class GMScript : MonoBehaviour
{ {
partyHealth = 0; partyHealth = 0;
for(int i = 0; i < partySize; i++) GameObject[] party = GameObject.FindGameObjectsWithTag("Party");
{ foreach(GameObject memeber in party) GameObject.Destroy(memeber);
Destroy(GameObject.FindWithTag("Party"));
}
print("The Super Robo Squad has been destroyed! Try again!"); print("The Super Robo Squad has been destroyed! Try again!");
@@ -143,7 +141,8 @@ public class GMScript : MonoBehaviour
{ {
enemyHealth = 0; enemyHealth = 0;
Destroy(GameObject.FindWithTag("Enemy")); GameObject[] enemy = GameObject.FindGameObjectsWithTag("Enemy");
foreach(GameObject parts in enemy) GameObject.Destroy(parts);
print("The enemy robot has been destroyed! Congrats!"); print("The enemy robot has been destroyed! Congrats!");