diff --git a/Assets/01_Scenes/BossScene.unity b/Assets/01_Scenes/BossScene.unity index f0a7de0..c94e4d9 100644 --- a/Assets/01_Scenes/BossScene.unity +++ b/Assets/01_Scenes/BossScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:339bc9184f148704e03bbab5a49eb8509fb4328338273b23e9b4f23f53b2e580 -size 191219 +oid sha256:b72ab2bd177dd4658cea02681eaf7ef0dd72c46e10522ec25b9380d5b3dea439 +size 212561 diff --git a/Assets/01_Scenes/GameScene.unity b/Assets/01_Scenes/GameScene.unity index 9a542fd..6178771 100644 --- a/Assets/01_Scenes/GameScene.unity +++ b/Assets/01_Scenes/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28049e66d99c50ec23d821d7ea3c23f30f4117b3b89083ae62b2e66beee8a8d6 -size 146900 +oid sha256:1a094601dfda7d787c784156243abd46e9a35b1653d8ee2f3531ff04cc38454c +size 167965 diff --git a/Assets/02_Scripts/Enemy/WaveManager.cs b/Assets/02_Scripts/Enemy/WaveManager.cs index 9d994ee..be6316e 100644 --- a/Assets/02_Scripts/Enemy/WaveManager.cs +++ b/Assets/02_Scripts/Enemy/WaveManager.cs @@ -77,6 +77,9 @@ private void Start() { _ = Util.RunDelayed(1f,StartWaves,destroyCancellationToken); } + + if(BossZoneButton != null) + BossZoneButton.onClick.AddListener(() => SceneLoadManager.Instance.RequestSceneChange("BossScene")); } private void OnDestroy() @@ -85,7 +88,7 @@ private void OnDestroy() _waveCts?.Dispose(); } - private async Awaitable WaveUIOn() + private async Awaitable ShowWaveUI() { try { @@ -106,12 +109,8 @@ private async Awaitable WaveUIOn() // 외부에서 호출해 웨이브 시작 (예: UI 버튼, 트리거). public void StartWaves() { - Debug.Log("aaaa"); - if (_waves == null || _waves.Count == 0) return; RunAllWaves(); - - _ = WaveUIOn(); } // 진행 중인 웨이브 강제 중단. 게임 오버/메뉴 진입 등에 사용. @@ -176,6 +175,8 @@ private async void RunAllWaves() // 4) 타이머 감소 private async Awaitable RunWave(WaveData wave, CancellationToken token) { + _ = ShowWaveUI(); + IsRunning = true; TimeRemaining = wave.TimeLimit; _aliveEnemies.Clear(); @@ -358,6 +359,7 @@ public void StageClearEvent() public void GameClear() { - GameClearText.gameObject.SetActive(true); + if(GameClearText != null) + GameClearText.gameObject.SetActive(true); } }