Compare commits
No commits in common. "41e047be403707b02e5673d11b01cd83a7f80fbf" and "19bf97bfb21a776c6493ca4d98102df982892fae" have entirely different histories.
41e047be40
...
19bf97bfb2
@ -22,14 +22,6 @@ public class InteractionController : MonoBehaviour
|
||||
PlayerStats.Instance.SetHousingCanvasController(housingCanvasController);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 출근 후 돌발 이벤트 발생을 위한 구독 취소
|
||||
/// </summary>
|
||||
public void ReSetAfterWorkEvent()
|
||||
{
|
||||
PlayerStats.Instance.OnWorked -= SuddenAfterWorkEventHappen;
|
||||
}
|
||||
|
||||
// 상호작용 가능한 사물 범위에 들어올 때
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
|
@ -13,7 +13,7 @@ public enum AfterWorkEventType
|
||||
public static class HousingConstants
|
||||
{
|
||||
//돌발 이벤트 확률 계산
|
||||
public static int AFTER_WORK_DENOMINATOR = 4;
|
||||
public static int AFTER_WORK_DENOMINATOR = 2;
|
||||
//돌발 이벤트 보여줄 시간
|
||||
public static float SUDDENEVENT_IAMGE_SHOW_TIME = 4.0f;
|
||||
//전환효과(Switching) 패널 애니메이션 시간
|
||||
|
@ -102,10 +102,6 @@ public partial class GameManager : Singleton<GameManager>,ISaveable
|
||||
public void ChangeToGameScene()
|
||||
{
|
||||
tryStageCount++; // 던전 시도 횟수 증가
|
||||
|
||||
InteractionController interactionController = FindObjectOfType<InteractionController>();
|
||||
interactionController.ReSetAfterWorkEvent();
|
||||
|
||||
var switchingPanel = PanelManager.GetPanel("SwitchingPanel").GetComponent<SwitchingPanelController>();
|
||||
switchingPanel.FadeAndSceneLoad("ReDungeon"); // 던전 Scene
|
||||
HandleSceneAudio("Dungeon");
|
||||
|
Loading…
x
Reference in New Issue
Block a user