main #13

Closed
heain0122 wants to merge 47 commits from main into DEG-77-튜토리얼-구현
4 changed files with 13 additions and 5 deletions
Showing only changes of commit 5a9482fdbc - Show all commits

View File

@ -1,8 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using UnityEditor.TextCore.Text;
using UnityEngine;
using UnityEngine.SceneManagement;
public enum PlayerState { None, Idle, Move, Win, Hit, Dead }
@ -62,6 +64,11 @@ public class PlayerController : CharacterBase, IObserver<GameObject>
hitEffectController = GetComponentInChildren<PlayerHitEffectController>();
PlayerInit();
// isBattle 초기화 (임시)
/*bool isHousingScene = SceneManager.GetActiveScene().name.Contains("Housing");
_isBattle = !isHousingScene;
Debug.Log("_isBattle: " + _isBattle);*/
}
private void Update()

BIN
Assets/KSH/DungeonTestScene.unity (Stored with Git LFS)

Binary file not shown.

BIN
Assets/KSH/ReHousing.unity (Stored with Git LFS)

Binary file not shown.

View File

@ -80,7 +80,8 @@ public partial class GameManager : Singleton<GameManager>
private void OnDestroy()
{
PlayerStats.Instance.OnDayEnded -= AdvanceDay; // 이벤트 구독 해제
if(PlayerStats.Instance != null)
PlayerStats.Instance.OnDayEnded -= AdvanceDay; // 이벤트 구독 해제
}
private void OnApplicationQuit()