Degulleo/Degulleo3D
7
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

DEG-173 [Fix] 돌발 패널시 말풍선 출력 오류 해결

Browse Source
This commit is contained in:
Sehyeon 2025-05-14 16:07:28 +09:00
parent 97db3baa80
commit 5f62e48584
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/KSH/PlayerStats.cs
View File

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

1
Assets/LIN/Scripts/DailyRoutine/InteractionController.cs
View File

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

6
Assets/LIN/Scripts/UI/HousingCanvasController.cs
View File

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