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

DEG-178-돌발이벤트패널-버그수정 #63

Closed
heain0122 wants to merge 7 commits from DEG-178-돌발이벤트패널-버그수정 into main
pull from: DEG-178-돌발이벤트패널-버그수정
merge into: Degulleo:main
Conversation 3 Commits 7 Files Changed 37 +7 -1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89ed88db3e - Show all commits

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

@ -22,6 +22,11 @@ public class InteractionController : MonoBehaviour
PlayerStats.Instance.SetHousingCanvasController(housingCanvasController); PlayerStats.Instance.SetHousingCanvasController(housingCanvasController);
} }
public void ReSetAfterWorkEvent()
{
PlayerStats.Instance.OnWorked -= SuddenAfterWorkEventHappen;
}
// 상호작용 가능한 사물 범위에 들어올 때 // 상호작용 가능한 사물 범위에 들어올 때
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
@ -118,7 +123,6 @@ public class InteractionController : MonoBehaviour
// Interaction Controller와 같은 방식으로 작동됩니다. // Interaction Controller와 같은 방식으로 작동됩니다.
private void SuddenAfterWorkEventHappen() private void SuddenAfterWorkEventHappen()
{ {
PlayerStats.Instance.OnWorked -= SuddenAfterWorkEventHappen;
AfterWorkEventType afterWorkEventType = SuddenEventCalculator(); AfterWorkEventType afterWorkEventType = SuddenEventCalculator();
if (afterWorkEventType == AfterWorkEventType.None) return; if (afterWorkEventType == AfterWorkEventType.None) return;

2
Assets/Scripts/Common/GameManager.cs
View File

@ -95,6 +95,8 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
public void ChangeToGameScene() public void ChangeToGameScene()
{ {
tryStageCount++; // 던전 시도 횟수 증가 tryStageCount++; // 던전 시도 횟수 증가
InteractionController interactionController = FindObjectOfType<InteractionController>();
interactionController.ReSetAfterWorkEvent();
SceneManager.LoadScene("ReDungeon"); // 던전 Scene SceneManager.LoadScene("ReDungeon"); // 던전 Scene
HandleSceneAudio("Dungeon"); HandleSceneAudio("Dungeon");
} }