Compare commits

..

No commits in common. "55533e6571ca1ad8b47c42158f1298808192a5a3" and "ae7a08a2054f8770a19825d8b5f67bc182821f8e" have entirely different histories.

7 changed files with 123 additions and 110 deletions

View File

@ -10,9 +10,9 @@ public class DungeonPanelController : MonoBehaviour
[SerializeField] private Image[] _playerHealthImages; // color 값 white / black 로 조정 [SerializeField] private Image[] _playerHealthImages; // color 값 white / black 로 조정
private int _countHealth = 0; private int _countHealth = 0;
public void SetBossHealthBar(float hp) // hp: 0~300 public void SetBossHealthBar(float hp) // hp: 0~100
{ {
float normalizedHp = hp / 300f; // 0~1 사이 값으로 조정 float normalizedHp = hp / 100f; // 0~1 사이 값으로 조정
_bossHealthBar.value = normalizedHp; _bossHealthBar.value = normalizedHp;
} }

View File

@ -41,19 +41,14 @@ public class PlayerStats : MonoBehaviour
// 결근 이벤트 관련 변수 // 결근 이벤트 관련 변수
private bool _hasWorkedToday = false; private bool _hasWorkedToday = false;
public bool HasWorkedToday => _hasWorkedToday;
private bool _hasCheckedAbsenceToday = false; // 결근 체크, 하루에 결근 여러 번 체크 안하기 위함 private bool _hasCheckedAbsenceToday = false; // 결근 체크, 하루에 결근 여러 번 체크 안하기 위함
public event Action OnAbsent; // 결근 public event Action OnAbsent; // 결근
// 말풍선 // 말풍선
private GameObject _messagePanelInstance; private GameObject messagePanelInstance;
private SpeechBubbleFollower _speechBubbleFollower; private SpeechBubbleFollower speechBubbleFollower;
private bool _isActiveBubble; private bool isActiveBubble;
private bool _hasShownBubbleToday; // 하루에 말풍선 하나만 표시하기 private bool hasShownBubbleToday; // 하루에 말풍선 하나만 표시하기
private int _mealCount;
public int MealCount => _mealCount;
private const int MAX_MEAL_COUNT = 2; // 하루 2회 제한
private void Awake() private void Awake()
{ {
@ -82,7 +77,6 @@ public class PlayerStats : MonoBehaviour
CheckBubble(); CheckBubble();
SceneManager.sceneLoaded += OnSceneLoaded; // 씬 전환 이벤트 SceneManager.sceneLoaded += OnSceneLoaded; // 씬 전환 이벤트
_mealCount = 0; // 식사 횟수 0회
} }
#region (Bubble) #region (Bubble)
@ -102,10 +96,10 @@ public class PlayerStats : MonoBehaviour
private void LoadMessagePanel() private void LoadMessagePanel()
{ {
if (_messagePanelInstance != null) // 기존 패널 파괴 if (messagePanelInstance != null) // 기존 패널 파괴
{ {
Destroy(_messagePanelInstance); Destroy(messagePanelInstance);
_messagePanelInstance = null; messagePanelInstance = null;
} }
GameObject messagePanelPrefab = Resources.Load<GameObject>("Prefabs/MessagePanel"); GameObject messagePanelPrefab = Resources.Load<GameObject>("Prefabs/MessagePanel");
@ -114,57 +108,49 @@ public class PlayerStats : MonoBehaviour
{ {
Canvas canvas = FindObjectOfType<Canvas>(); Canvas canvas = FindObjectOfType<Canvas>();
_messagePanelInstance = Instantiate(messagePanelPrefab, canvas.transform); messagePanelInstance = Instantiate(messagePanelPrefab, canvas.transform);
_speechBubbleFollower = _messagePanelInstance.GetComponent<SpeechBubbleFollower>(); speechBubbleFollower = messagePanelInstance.GetComponent<SpeechBubbleFollower>();
_speechBubbleFollower.SetPlayerTransform(); speechBubbleFollower.SetPlayerTransform();
if (_speechBubbleFollower != null) if (speechBubbleFollower != null)
{ {
_isActiveBubble = false; isActiveBubble = false;
_hasShownBubbleToday = false; hasShownBubbleToday = false;
_speechBubbleFollower.HideMessage(); speechBubbleFollower.HideMessage();
} }
} }
} }
private void CheckBubble() private void CheckBubble()
{ {
if (_isActiveBubble) if (isActiveBubble)
{ {
_isActiveBubble = false; isActiveBubble = false;
HideBubble(); HideBubble();
} }
if (TimeStat >= 8.0f && TimeStat < 9.0f && !_isActiveBubble && !_hasShownBubbleToday) if (TimeStat >= 8.0f && TimeStat < 9.0f && !isActiveBubble && !hasShownBubbleToday)
{ {
_hasShownBubbleToday = true; hasShownBubbleToday = true;
_isActiveBubble = true; isActiveBubble = true;
ShowBubble(); ShowBubble();
} }
} }
private InteractionAnimationPanelController _interactionAnimation;
public void SetInteractionPanelController(InteractionAnimationPanelController panelController)
{
_interactionAnimation = panelController;
}
public void ShowBubble() public void ShowBubble()
{ {
if (_interactionAnimation.IsPanelActive()) return; if(isActiveBubble)
speechBubbleFollower.ShowMessage();
if(_isActiveBubble)
_speechBubbleFollower.ShowMessage();
} }
public void HideBubble() public void HideBubble()
{ {
_speechBubbleFollower.HideMessage(); speechBubbleFollower.HideMessage();
} }
public void ShowAndHideBubble(string text) public void ShowAndHideBubble(string text)
{ {
_speechBubbleFollower.ShowAndHide(text); speechBubbleFollower.ShowAndHide(text);
} }
#endregion #endregion
@ -185,17 +171,13 @@ public class PlayerStats : MonoBehaviour
// 9시가 지났는데 출근하지 않은 경우 // 9시가 지났는데 출근하지 않은 경우
if (TimeStat >= 9.0f && !_hasWorkedToday) if (TimeStat >= 9.0f && !_hasWorkedToday)
{
PerformAbsent();
}
}
public void PerformAbsent() // 강제 결근 이벤트
{ {
_hasCheckedAbsenceToday = true; // 결근 체크 완료 표시 _hasCheckedAbsenceToday = true; // 결근 체크 완료 표시
OnAbsent?.Invoke(); OnAbsent?.Invoke();
PerformAction(ActionType.Absence); // 평판 -3 PerformAction(ActionType.Absence); // 평판 -3
Debug.Log("결근 처리: 평판 감소" + ReputationStat);
}
} }
// 행동 처리 메서드 // 행동 처리 메서드
@ -218,16 +200,6 @@ public class PlayerStats : MonoBehaviour
_hasWorkedToday = true; _hasWorkedToday = true;
OnWorked?.Invoke(); OnWorked?.Invoke();
} }
if (actionType == ActionType.Eat)
{
_mealCount++;
}
}
public bool CanEat()
{
return _mealCount < MAX_MEAL_COUNT; // 식사 횟수 0,1 일 때만 true
} }
// 출근 가능 여부 확인 메서드 // 출근 가능 여부 확인 메서드
@ -299,10 +271,7 @@ public class PlayerStats : MonoBehaviour
// 결근 관련 변수 초기화 // 결근 관련 변수 초기화
_hasWorkedToday = false; _hasWorkedToday = false;
_hasCheckedAbsenceToday = false; _hasCheckedAbsenceToday = false;
_hasShownBubbleToday = false; hasShownBubbleToday = false;
// 식사 횟수 초기화
_mealCount = 0;
OnDayEnded?.Invoke(); OnDayEnded?.Invoke();
} }

View File

@ -12,12 +12,12 @@ public class InteractionController : MonoBehaviour
[Header("UI 연동")] [Header("UI 연동")]
[SerializeField] private HousingCanvasController housingCanvasController; [SerializeField] private HousingCanvasController housingCanvasController;
[SerializeField] private InteractionAnimationPanelController interactionAnimationPanelController; [SerializeField] private InteractionAnimationPanelController interactionAnimationPanelController;
private void Start() private void Start()
{ {
PlayerStats.Instance.OnWorked += SuddenAfterWorkEventHappen; PlayerStats.Instance.OnWorked += SuddenAfterWorkEventHappen;
PlayerStats.Instance.SetInteractionPanelController(interactionAnimationPanelController);
} }
// 상호작용 가능한 사물 범위에 들어올 때 // 상호작용 가능한 사물 범위에 들어올 때
@ -73,12 +73,6 @@ public class InteractionController : MonoBehaviour
} }
} }
if (interactionType == ActionType.Eat && !PlayerStats.Instance.CanEat()) // 식사 횟수 제한 체크
{
PlayerStats.Instance.ShowAndHideBubble("배불러서 못 먹어");
return;
}
if (interactionType == ActionType.Dungeon) if (interactionType == ActionType.Dungeon)
{ {
GameManager.Instance.ChangeToGameScene(); GameManager.Instance.ChangeToGameScene();
@ -123,20 +117,6 @@ public class InteractionController : MonoBehaviour
housingCanvasController.ShowSuddenEventPanel(suddenEventText, () => housingCanvasController.ShowSuddenEventPanel(suddenEventText, () =>
{ {
if (afterWorkEventType == AfterWorkEventType.OvertimeWork)
{
if (!PlayerStats.Instance.CanPerformByHealth(ActionType.OvertimeWork))
{
PlayerStats.Instance.ShowAndHideBubble("체력이 없어...");
return;
}
PlayerStats.Instance.PerformAction(ActionType.OvertimeWork);
}
else
{
PlayerStats.Instance.PerformAction(ActionType.TeamDinner);
}
housingCanvasController.ShowSuddenEventImage(afterWorkEventType); housingCanvasController.ShowSuddenEventImage(afterWorkEventType);
GameManager.Instance.PlaySuddenEventSound(afterWorkEventType); GameManager.Instance.PlaySuddenEventSound(afterWorkEventType);
}); });

View File

@ -18,27 +18,15 @@ public class InteractionAnimationPanelController : MonoBehaviour
private Coroutine _autoHideCoroutine; private Coroutine _autoHideCoroutine;
private Canvas _parentCanvas; private Canvas _parentCanvas;
private bool _isAbsenceToday = false;
public void SetDoingText(string text) public void SetDoingText(string text)
{ {
doingText.text = text; doingText.text = text;
} }
public bool IsPanelActive()
{
return panel.activeSelf;
}
public void ShowAnimationPanel(ActionType actionType, string animationText) public void ShowAnimationPanel(ActionType actionType, string animationText)
{ {
PlayerStats.Instance.HideBubble(); PlayerStats.Instance.HideBubble();
if (actionType == ActionType.Sleep && !PlayerStats.Instance.HasWorkedToday) // 결근
{
_isAbsenceToday = true;
}
// 1) 패널 활성화 // 1) 패널 활성화
panel.SetActive(true); panel.SetActive(true);
// 2) 기존 코루틴 정리 // 2) 기존 코루틴 정리
@ -125,12 +113,6 @@ public class InteractionAnimationPanelController : MonoBehaviour
_autoHideCoroutine = null; _autoHideCoroutine = null;
} }
if (_isAbsenceToday) // 결근한 경우
{
PlayerStats.Instance.PerformAbsent();
return;
}
// 패널 닫히고 결근 체크, 상호작용 패널과 결근 엔딩 채팅창이 겹치지 않기 위함 // 패널 닫히고 결근 체크, 상호작용 패널과 결근 엔딩 채팅창이 겹치지 않기 위함
PlayerStats.Instance.CheckAbsent(); PlayerStats.Instance.CheckAbsent();
PlayerStats.Instance.ShowBubble(); PlayerStats.Instance.ShowBubble();

View File

@ -7,7 +7,7 @@ public abstract class CharacterBase : MonoBehaviour
{ {
[Header("기본 능력치")] [Header("기본 능력치")]
public string characterName; // 이름 public string characterName; // 이름
private int maxHP = 300; // 최대 체력 public int maxHP = 100; // 최대 체력
public int currentHP; // 현재 체력 public int currentHP; // 현재 체력
public float attackPower = 10f; // 공격력 public float attackPower = 10f; // 공격력
public float defensePower = 5f; // 방어력 public float defensePower = 5f; // 방어력