mark/wirm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

game(scripts): standardise BroomSweeing

Browse source
This commit is contained in:
Mark Joshwel 2025-02-14 22:06:30 +08:00
parent 23122b395b
commit 57333686a3
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Game/Assets/Scripts/BroomSweeping.cs
View file

@ -11,9 +11,9 @@ using UnityEngine;
public class BroomSweeping : MonoBehaviour public class BroomSweeping : MonoBehaviour
{ {
// To track how much trash has been collected so far // To track how much trash has been collected so far
public int dirtSweeped; public int dirtSweepCount;
// Defines how much trash is needed to collect in order to unlock the door // Defines how much trash is needed to collect to unlock the door
public int dirtRequired = 10; public int dirtRequired = 10;
// Defines UI references // Defines UI references
@ -25,39 +25,37 @@ public class BroomSweeping : MonoBehaviour
[Header("Audio References")] public AudioSource audioSource; [Header("Audio References")] public AudioSource audioSource;
public AudioClip sweepingSound; public AudioClip sweepingSound;
private GameManager gameManager; private GameManager _gameManager;
private PostProcessingManager PostProcessingManager; private PostProcessingManager _postProcessingManager;
private bool taskCompleted; private bool _taskCompleted;
// Update is called once per frame // Update is called once per frame
private void Update() private void Update()
{ {
if (dirtSweeped >= dirtRequired && !taskCompleted) if (dirtSweepCount < dirtRequired || _taskCompleted) return;
{
taskCompleted = true;
GameManager.Instance.FloorSweepedTaskComplete();
storyPanelUI.SetActive(true); _taskCompleted = true;
storyText.text = "I hope the house is clean enough now so I don't get scolded later..."; GameManager.Instance.FloorSweepedTaskComplete();
StartCoroutine(ClearMessageAfterSeconds(7f)); storyPanelUI.SetActive(true);
} storyText.text = "I hope the house is clean enough now so I don't get scolded later...";
StartCoroutine(ClearMessageAfterSeconds(7f));
} }
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
// Now correctly checks for "Dirt" before triggering // Now correctly checks for "Dirt" before triggering
if (other.CompareTag("Dirt")) if (!other.CompareTag("Dirt")) return;
{
dirtSweeped++;
// Destroy it to prevent extra counting dirtSweepCount++;
Destroy(other.gameObject);
// Play sound only if no other sound is currently playing // Destroy it to prevent extra counting
if (!audioSource.isPlaying) audioSource.PlayOneShot(sweepingSound); Destroy(other.gameObject);
}
// Play sound only if no other sound is currently playing
if (!audioSource.isPlaying) audioSource.PlayOneShot(sweepingSound);
} }
private IEnumerator ClearMessageAfterSeconds(float delay) private IEnumerator ClearMessageAfterSeconds(float delay)