2026-04-13 스킬,퀵슬롯 시스템 수정중

This commit is contained in:
2026-04-13 18:04:55 +09:00
parent de0ba90953
commit 71a6fda0da
57 changed files with 9074 additions and 59 deletions

View File

@@ -0,0 +1,234 @@
using TMPro;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class QuickSlot : MonoBehaviour, IDropHandler, IPointerClickHandler, IBeginDragHandler, IDragHandler, IEndDragHandler
{
[Header("Slot Binding")]
public string SlotName; // "UseSlot_Q", "UseSlot_E", ...
[Header("References")]
[SerializeField] private Image _iconImage;
[SerializeField] private TextMeshProUGUI _stackText;
public UseableEntry CurrentEntry { get; private set; }
private Transform _dragTransform;
private Transform _iconOriginalParent;
private CanvasGroup _iconCanvasGroup;
private void Awake()
{
if (_iconImage != null)
{
_iconCanvasGroup = _iconImage.GetComponent<CanvasGroup>();
if (_iconCanvasGroup == null)
_iconCanvasGroup = _iconImage.gameObject.AddComponent<CanvasGroup>();
}
ClearSlot();
}
private void Start()
{
_dragTransform = GameManager.Instance.InGameUI.DragCanvas;
}
private void Update()
{
// 아이템 퀵슬롯은 인벤토리와 동기화: 스택 수량 갱신 및 소진 시 자동 해제
if (CurrentEntry is Item itemData)
{
int total = GameManager.Instance.Inventory.GetTotalStack(itemData);
if (total <= 0)
{
ClearSlot();
return;
}
if (_stackText != null)
{
_stackText.text = itemData.IsStackable ? total.ToString() : "";
_stackText.enabled = itemData.IsStackable;
}
}
else if (_stackText != null)
{
_stackText.enabled = false;
}
}
public void SetEntry(UseableEntry entry)
{
CurrentEntry = entry;
UpdateUI();
}
public void ClearSlot()
{
CurrentEntry = null;
if (_iconImage != null)
{
_iconImage.sprite = null;
_iconImage.enabled = false;
}
if (_stackText != null)
{
_stackText.text = "";
_stackText.enabled = false;
}
}
public void UpdateUI()
{
if (CurrentEntry == null || CurrentEntry.Icon == null)
{
if (_iconImage != null) _iconImage.enabled = false;
return;
}
_iconImage.sprite = CurrentEntry.Icon;
_iconImage.enabled = true;
}
public void Execute(InputState state)
{
if (CurrentEntry == null) return;
if (CurrentEntry is Item itemData)
{
// 아이템은 누를 때(Started)만 사용
if (state == InputState.Started)
GameManager.Instance.Inventory.UseItemByData(itemData);
}
else if (CurrentEntry is SkillData skillData)
{
// 스킬은 Started/Canceled 모두 전달 (Charge/Channel 지원)
var character = GameManager.Instance.Level.CurrentCharacter;
if (character == null) return;
if (character.TryGetComponent<SkillModule>(out var skillModule))
skillModule.SkillInputByData(skillData, state);
}
}
public void OnDrop(PointerEventData eventData)
{
GameObject dropped = eventData.pointerDrag;
if (dropped == null) return;
// 인벤토리에서 드래그
InventoryItemControl invItem = dropped.GetComponent<InventoryItemControl>();
if (invItem != null && invItem.ParentSlot != null && invItem.ParentSlot.currentItem != null)
{
SetEntry(invItem.ParentSlot.currentItem.Data);
return;
}
// 다른 퀵슬롯에서 드래그 → 스왑
QuickSlot otherSlot = dropped.GetComponent<QuickSlot>();
if (otherSlot != null && otherSlot != this)
{
UseableEntry temp = CurrentEntry;
SetEntry(otherSlot.CurrentEntry);
otherSlot.SetEntry(temp);
}
// 스킬창에서 드래그는 스킬창 제작 시 SkillEntryControl 같은 컴포넌트를 여기서 감지
}
public void OnPointerClick(PointerEventData eventData)
{
if (eventData.button == PointerEventData.InputButton.Right)
{
ClearSlot();
}
}
public void OnBeginDrag(PointerEventData eventData)
{
if (CurrentEntry == null || _iconImage == null)
{
eventData.pointerDrag = null;
return;
}
_iconOriginalParent = _iconImage.transform.parent;
_iconImage.transform.SetParent(_dragTransform);
_iconCanvasGroup.blocksRaycasts = false;
}
public void OnDrag(PointerEventData eventData)
{
if (_iconImage == null) return;
_iconImage.transform.position = eventData.position;
}
public void OnEndDrag(PointerEventData eventData)
{
_iconCanvasGroup.blocksRaycasts = true;
_iconImage.transform.SetParent(_iconOriginalParent);
_iconImage.transform.localPosition = Vector3.zero;
UpdateUI();
}
}
/*
1. (InputManager, LevelManager)
: OnKeyDown_KKeyEvent + OnKeyDown_KKey K
: LevelManager에서 K키 InGameUIManager.SkillWindowToggle에
: Input Action Asset의 Character와 InGameUI OnKeyDown_KKey
2. SkillModule ( )
Before: Q/E/R/T가 InputManager에
After: _equippedSkills만 . .
SkillSlotNames, _skillBindData, DispatchSlot, RegisterSkillsToQuickslot, BindSlotAction
_equippedSkillDataCache[] + GetEquippedSkillDatas() ( )
3. QuickSlot ( )
: 1. UseableEntry
SlotName (UseSlot_Q~UseSlot_G)
SetEntry(entry) / ClearSlot() / Execute(state)
Execute(): Item이면 Inventory.UseItemByData(), SkillData면 SkillModule.SkillInputByData()
:
OnDrop: ,
OnBeginDrag/OnEndDrag: ( )
OnPointerClick :
Update(): , 0
4. QuickSlotController (QuickSlotRoot에 )
:
Awake(): QuickSlot[]
Start(): SlotName으로 LevelManager.BindSlotAction() slot.Execute(state)
RegisterEntry(slotName, entry) / GetSlot(slotName) API
5. InventoryManager ( )
GetTotalStack(Item): ( )
UseItemByData(Item):
6.
SkillEntry: . IBeginDragHandler/IDragHandler/IEndDragHandler로 SetEntry() .
SkillWindowUI: Toggle() / + Refresh() SkillModule.GetEquippedSkillDatas()
7. InGameUIManager
QuickSlot, SkillWindow
SkillWindowToggle(): /
Q
InputManager.OnKeyDown_SlotQEvent
LevelManager.BindSlotAction이
QuickSlot.Execute(state)
: Item Inventory.UseItemByData
SkillData SkillModule.SkillInputByData
K키 SkillWindow SkillModule에서
SkillEntry QuickSlot
QuickSlot.SetEntry(skillData)
InventoryItemControl
QuickSlot.OnDrop SetEntry(itemData)
QuickSlot.Update가 ClearSlot
*/

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 1b986e78d40a4ec4ebe640f5dc4defdc

View File

@@ -0,0 +1,41 @@
using UnityEngine;
public class QuickSlotController : MonoBehaviour
{
private QuickSlot[] _slots;
private void Awake()
{
_slots = GetComponentsInChildren<QuickSlot>(true);
}
private void Start()
{
foreach (var slot in _slots)
{
if (string.IsNullOrEmpty(slot.SlotName)) continue;
QuickSlot captured = slot;
GameManager.Instance.Level.BindSlotAction(captured.SlotName, (state) => captured.Execute(state));
}
}
// 외부(스킬창/SkillModule 등)에서 슬롯에 등록할 때 호출
public void RegisterEntry(string slotName, UseableEntry entry)
{
foreach (var slot in _slots)
{
if (slot.SlotName == slotName)
{
slot.SetEntry(entry);
return;
}
}
}
public QuickSlot GetSlot(string slotName)
{
foreach (var slot in _slots)
if (slot.SlotName == slotName) return slot;
return null;
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 0150a6644db52824c9b546e9f34c221d