DEG-173-돌발-패널-말풍선-오류 #59

Merged
Sehyeon merged 2 commits from DEG-173-돌발-패널-말풍선-오류 into main 2025-05-14 07:44:30 +00:00
3 changed files with 14 additions and 0 deletions
Showing only changes of commit 5f62e48584 - Show all commits

View File

@ -51,6 +51,7 @@ public class PlayerStats : MonoBehaviour,ISaveable
private bool _isActiveBubble;
private bool _hasShownBubbleToday; // 하루에 말풍선 하나만 표시하기
private InteractionAnimationPanelController _interactionAnimation; // 상호작용 패널 Active 여부 확인
private HousingCanvasController _housingCanvasController; // 돌발 패널 Active 여부 확인
private int _mealCount;
public int MealCount => _mealCount;
@ -149,9 +150,15 @@ public class PlayerStats : MonoBehaviour,ISaveable
_interactionAnimation = panelController;
}
public void SetHousingCanvasController(HousingCanvasController canvasController)
{
_housingCanvasController = canvasController;
}
public void ShowBubble()
{
if (_interactionAnimation != null && _interactionAnimation.IsPanelActive()) return;
if (_housingCanvasController != null && _housingCanvasController.IsSuddenPanelActive()) return;
if(_isActiveBubble)
_speechBubbleFollower.ShowMessage();

View File

@ -18,6 +18,7 @@ public class InteractionController : MonoBehaviour
{
PlayerStats.Instance.OnWorked += SuddenAfterWorkEventHappen;
PlayerStats.Instance.SetInteractionPanelController(interactionAnimationPanelController);
PlayerStats.Instance.SetHousingCanvasController(housingCanvasController);
}
// 상호작용 가능한 사물 범위에 들어올 때

View File

@ -152,6 +152,12 @@ public class HousingCanvasController : MonoBehaviour
_autoHideCoroutine = null;
}
public bool IsSuddenPanelActive()
{
return suddenPanel.activeSelf;
}
#endregion
}