Merge branch 'main' into DEG-143-세이브-강화-병합

Reviewed-on: #48
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>

Assets/KSH/DungeonPanelController.cs

@@ -9,6 +9,7 @@ public class DungeonPanelController : MonoBehaviour
     [SerializeField] private Slider _bossHealthBar; // 0~1 value
     [SerializeField] private Image[] _playerHealthImages; // color 값 white / black 로 조정
     private int _countHealth = 0;
+
     private int visibleHeartCount = 3; // 강화 레벨로 설정됨
     
     

Assets/KSH/PlayerStats.cs

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

Assets/KSH/SpeechBubbleFollower.cs

@@ -8,7 +8,7 @@ public class SpeechBubbleFollower : MonoBehaviour
     [SerializeField] private Transform playerTransform; 
     [SerializeField] private TMP_Text bubbleText;
     
-    private Vector3 offset = new Vector3(200f, 250f, 0); 
+    private Vector3 offset = new Vector3(150f, 200f, 0); 
     
     private Camera mainCamera;
     private RectTransform rectTransform;

Assets/LIN/Prefabs/SuddenEventPanel.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d5664f5a156d8a0449b8b9a6deebd122
+guid: 794d47980d56ee84f99de7726586558f
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/LIN/Prefabs/SuddenPanelImages.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f35de5ac1a0aecd43984efd8b24054e5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/LIN/ReHousing Loding Anim.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 84aaded28076685429f8940810bde779
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/LIN/Scripts/DailyRoutine/InteractionController.cs

@@ -12,14 +12,14 @@ public class InteractionController : MonoBehaviour
 
     [Header("UI 연동")] 
     [SerializeField] private HousingCanvasController housingCanvasController;
-
     [SerializeField] private InteractionAnimationPanelController interactionAnimationPanelController;
-
+    
     private void Start()
     {
         PlayerStats.Instance.OnWorked += SuddenAfterWorkEventHappen;
+        PlayerStats.Instance.SetInteractionPanelController(interactionAnimationPanelController);
     }
-
+    
     // 상호작용 가능한 사물 범위에 들어올 때
     private void OnTriggerEnter(Collider other)
     {
@@ -72,6 +72,12 @@ public class InteractionController : MonoBehaviour
                         return;
                     }
                 }
+
+                if (interactionType == ActionType.Eat && !PlayerStats.Instance.CanEat()) // 식사 횟수 제한 체크
+                {
+                    PlayerStats.Instance.ShowAndHideBubble("배불러서 못 먹어");
+                    return;
+                }
                 
                 if (interactionType == ActionType.Dungeon)
                 {
@@ -117,6 +123,20 @@ public class InteractionController : MonoBehaviour
         
         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);
             GameManager.Instance.PlaySuddenEventSound(afterWorkEventType);
         });

Assets/LIN/Scripts/UI/InteractionAnimationPanelController.cs

@@ -17,15 +17,27 @@ public class InteractionAnimationPanelController : MonoBehaviour
     private Coroutine _textAnimCoroutine;
     private Coroutine _autoHideCoroutine;
     private Canvas _parentCanvas;
+    
+    private bool _isAbsenceToday = false;
 
     public void SetDoingText(string text)
     {
         doingText.text = text;
     }
 
+    public bool IsPanelActive()
+    {
+        return panel.activeSelf;
+    }
+
     public void ShowAnimationPanel(ActionType actionType, string animationText)
     {
         PlayerStats.Instance.HideBubble();
+
+        if (actionType == ActionType.Sleep && !PlayerStats.Instance.HasWorkedToday) // 결근
+        {
+            _isAbsenceToday = true;
+        }
         
         // 1) 패널 활성화
         panel.SetActive(true);
@@ -88,6 +100,8 @@ public class InteractionAnimationPanelController : MonoBehaviour
             }
             yield return null;
         }
+        //로테이션 초기화
+        doingImage.rectTransform.localRotation = Quaternion.identity;
 
         GameManager.Instance.StopInteractionSound(actionType);
         //패널 닫고 애니메이션 null처리
@@ -110,6 +124,12 @@ public class InteractionAnimationPanelController : MonoBehaviour
             StopCoroutine(_autoHideCoroutine);
             _autoHideCoroutine = null;
         }
+
+        if (_isAbsenceToday) // 결근한 경우
+        {
+            PlayerStats.Instance.PerformAbsent();
+            return;
+        }
         
         // 패널 닫히고 결근 체크, 상호작용 패널과 결근 엔딩 채팅창이 겹치지 않기 위함
         PlayerStats.Instance.CheckAbsent();

Assets/Scripts/Character/CharacterBase.cs

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

Assets/Scripts/Character/Enemy/Bullet/BulletBase.cs

@@ -51,9 +51,15 @@ public class BulletBase : MonoBehaviour
         float moveDist = _speed * Time.deltaTime;
 
         // 1) Raycast 충돌 검사
-        if (Physics.Raycast(_prevPosition, _direction, out RaycastHit hit, moveDist, _targetLayer))
+        if (Physics.SphereCast(
+                _prevPosition,
+                1,
+                _direction,
+                out RaycastHit hit,
+                moveDist,
+                _targetLayer
+            ))
         {
-            // 닿은 지점으로 이동
             transform.position = hit.point;
             OnBulletHit(hit);
             return;
@@ -85,4 +91,11 @@ public class BulletBase : MonoBehaviour
         Debug.Log("## Bullet destroyed");
         Destroy(gameObject);
     }
+
+    // 기즈모로 반지름 시각화
+    private void OnDrawGizmosSelected()
+    {
+        Gizmos.color = Color.red;
+        Gizmos.DrawWireSphere(transform.position, 1);
+    }
 }

Assets/Scripts/Character/Enemy/CasterDemonController.cs

@@ -277,30 +277,29 @@ public class CasterDemonController : EnemyController
     private IEnumerator SlowFieldSpell()
     {
         var aimPosition = TargetPosOracle(out var basePos, out var rb);
-        // 1. 시전 애니메이션
-        transform.LookAt(aimPosition);
-        SetAnimation(Cast);
-        SFXPlayer(slowFieldSound);
 
-        // 2. 장판 생성과 세팅
+        transform.LookAt(aimPosition);
+
+        // 장판 생성과 세팅
         var fixedPos = new Vector3(aimPosition.x, aimPosition.y, aimPosition.z);
         var warning = Instantiate(chariotWarning, fixedPos, Quaternion.identity).GetComponent<MagicAoEField>();
 
-        warning.SetEffect(SlowFieldEffectData, null, null);
+        warning.SetEffect(SlowFieldEffectData, () =>
+        {
+            SetAnimation(Cast);
+            SFXPlayer(slowFieldSound);
+        }, null);
 
-        // 3. 짧은 텀 후 끝내기
+        // 짧은 텀 후 끝내기
         yield return Wait.For(1f);
     }
 
     private IEnumerator KnockbackSpell()
     {
-        // 시전 애니메이션
-        SetAnimation(Spin);
-        SFXPlayer(spinSound);
-
-        // 넉백 발생
         var knockback = Instantiate(chariotWarning, transform).GetComponent<MagicAoEField>();
-        knockback.SetEffect(KnockbackData, null, null, DebuffType.Knockback.ToString());
+        knockback.SetEffect(KnockbackData, ()=>{
+            SetAnimation(Spin);
+            SFXPlayer(spinSound);}, null, DebuffType.Knockback.ToString());
 
         yield return Wait.For(1f);
     }