gjcampbell/ICDBWTMAG2020
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored and reworked mouse based triggers to remove some funky pickup/drop bugs for cleaning items

Browse Source
This commit is contained in:
Gregory Campbell
2020-06-07 14:15:27 -04:00
parent e1965d4024
commit 3df68ebf20
3 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/GameScript.cs
+32 -36
View File
@@ -36,47 +36,43 @@ public class GameScript : MonoBehaviour
Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y);
RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero);
if (hit.collider != null)
if(hit.collider != null && hit.collider.gameObject.tag == "Restart" && gameOver)
{
if(hit.collider.gameObject.tag == "Restart" && gameOver)
{
Restart.SetActive(false);
Object.SetActive(true);
Setup();
gameOver = false;
timer = 0.0f;
objectsPolished = 0;
}
if (hit.collider.gameObject.tag == "Item" && !clicked && !gameOver)
{
pickedUpItem = hit.collider.gameObject;
clicked = true;
Cursor.visible = false;
} else if (hit.collider.gameObject.tag == "Item" && clicked)
{
clicked = false;
Cursor.visible = true;
if(pickedUpItem.name == "Rag")
{
pickedUpItem.transform.position = new Vector2(7.25f, 2.5f);
} else if (pickedUpItem.name == "SprayBottle"){
pickedUpItem.transform.position = new Vector2(7.25f, -2.5f);
}
pickedUpItem.transform.rotation = Quaternion.identity;
pickedUpItem = null;
}
//Debug.Log("Clicked " + pickedUpItem.name);
Restart.SetActive(false);
Object.SetActive(true);
Setup();
gameOver = false;
timer = 0.0f;
objectsPolished = 0;
}
if (hit.collider != null && hit.collider.gameObject.tag == "Item" && !clicked && !gameOver)
{
pickedUpItem = hit.collider.gameObject;
clicked = true;
Cursor.visible = false;
} else if (hit.collider != null && clicked)
{
clicked = false;
Cursor.visible = true;
if(pickedUpItem.name == "Rag")
{
pickedUpItem.transform.position = new Vector2(7.25f, 2.5f);
} else if (pickedUpItem.name == "SprayBottle"){
pickedUpItem.transform.position = new Vector2(7.25f, -2.5f);
}
pickedUpItem.transform.rotation = Quaternion.identity;
pickedUpItem = null;
}
//Debug.Log("Clicked " + pickedUpItem.name);
}