iwnc2020/ProjectDDD
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

상호작용 클래스 분리

Browse Source
This commit is contained in:
NTG_Lenovo 2025-08-06 17:43:41 +09:00
parent 0b34f02a34
commit 239ab0601a
2 changed files with 150 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantCharacterInteraction.cs
View File

@ -1,62 +1,39 @@
using System.Threading.Tasks;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.InputSystem;
namespace DDD
{
public class RestaurantCharacterInteraction : MonoBehaviour, IInteractor, IEventHandler<RestaurantInteractionEvent>
{
private RestaurantPlayerDataSo _restaurantPlayerDataSo;
[SerializeField, ReadOnly] protected Collider[] _nearColliders = new Collider[10];
[ReadOnly, SerializeField] private Collider[] _nearColliders = new Collider[10];
private IInteractable _nearestInteractable;
private IInteractable _previousInteractable;
private IInteractable _interactingTarget;
protected IInteractable _nearestInteractable;
protected IInteractable _previousInteractable;
protected IInteractable _interactingTarget;
private float _interactHeldTime;
private bool _isInteracting;
protected float _interactHeldTime;
protected bool _isInteracting;
private void Start()
protected float _interactionRadius = 1f;
protected LayerMask _interactionLayerMask = (LayerMask)(-1);
protected virtual void Start() { }
protected virtual void Update()
{
_ = Initialize();
}
private void Update()
{
if (!_restaurantPlayerDataSo) return;
_nearestInteractable = GetNearestInteractable();
if (_nearestInteractable != _previousInteractable)
{
_previousInteractable = _nearestInteractable;
if (_nearestInteractable != null && _nearestInteractable.CanInteract())
{
BroadcastShowUi(_nearestInteractable, 0f);
}
else
{
EventBus.Broadcast(GameEvents.HideInteractionUiEvent);
}
OnNearestInteractableChanged(_nearestInteractable);
}
if (_isInteracting)
{
// 도중에 타겟이 바뀐 경우 초기화
if (_nearestInteractable != _interactingTarget)
{
_isInteracting = false;
_interactHeldTime = 0f;
_interactingTarget = null;
// UI 초기화
if (_nearestInteractable != null && _nearestInteractable.CanInteract())
{
BroadcastShowUi(_nearestInteractable, 0f);
}
ResetInteractionState();
return;
}
@ -67,109 +44,56 @@ private void Update()
if (_interactHeldTime >= requiredHoldTime)
{
ratio = 0f;
_isInteracting = false;
_interactingTarget.OnInteracted(this);
_interactingTarget = null;
OnInteractionCompleted();
}
BroadcastShowUi(_interactingTarget, ratio);
OnInteractionHoldProgress(ratio);
}
}
private void OnDestroy()
{
EventBus.Unregister<RestaurantInteractionEvent>(this);
protected virtual void OnDestroy() { }
if (_restaurantPlayerDataSo)
{
_restaurantPlayerDataSo.InteractAction.performed -= OnInteractPerformed;
_restaurantPlayerDataSo.InteractAction.canceled -= OnInteractCanceled;
}
}
protected virtual void OnNearestInteractableChanged(IInteractable newTarget) { }
protected virtual void OnInteractionHoldProgress(float ratio) { }
protected virtual void OnInteractionCompleted() { }
private async Task Initialize()
{
_restaurantPlayerDataSo = await AssetManager.LoadAsset<RestaurantPlayerDataSo>(DataConstants.RestaurantPlayerDataSo);
Debug.Assert(_restaurantPlayerDataSo != null, "_restaurantPlayerDataSo is null");
_restaurantPlayerDataSo.InteractAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Interact));
_restaurantPlayerDataSo.InteractAction.performed += OnInteractPerformed;
_restaurantPlayerDataSo.InteractAction.canceled += OnInteractCanceled;
EventBus.Register<RestaurantInteractionEvent>(this);
}
public void Invoke(RestaurantInteractionEvent evt)
{
// TODO : 이벤트결과를 보고 할 일이 있다면 여기서 뭔가 처리. 기본적으로 이벤트에서 이미 인터페이스로 인터랙션 처리됨
}
public GameObject GetInteractorGameObject()
{
return gameObject;
}
private void OnInteractPerformed(InputAction.CallbackContext context)
{
if (_nearestInteractable == null || _nearestInteractable.CanInteract() == false) return;
float requiredHoldTime = _nearestInteractable.GetRequiredHoldTime();
if (requiredHoldTime <= 0f)
{
_nearestInteractable.OnInteracted(this);
}
else
{
_isInteracting = true;
_interactHeldTime = 0f;
_interactingTarget = _nearestInteractable;
}
}
private void OnInteractCanceled(InputAction.CallbackContext context)
protected void ResetInteractionState()
{
_isInteracting = false;
_interactHeldTime = 0f;
OnInteractionHoldProgress(0f);
_interactingTarget = null;
if (_nearestInteractable != null && _nearestInteractable.CanInteract())
{
BroadcastShowUi(_nearestInteractable, 0f);
}
}
private IInteractable GetNearestInteractable()
protected IInteractable GetNearestInteractable()
{
int nearColliderCount = Physics.OverlapSphereNonAlloc(transform.position, _restaurantPlayerDataSo.InteractionRadius,
_nearColliders, _restaurantPlayerDataSo.InteractionLayerMask, QueryTriggerInteraction.Collide);
int nearColliderCount = Physics.OverlapSphereNonAlloc(transform.position, _interactionRadius,
_nearColliders, _interactionLayerMask, QueryTriggerInteraction.Collide);
IInteractable nearestInteractable = null;
float minDistance = float.MaxValue;
IInteractable nearest = null;
float minSqrDistance = float.MaxValue;
for (int i = 0; i < nearColliderCount; i++)
{
var interactable = _nearColliders[i].GetComponent<IInteractable>();
if (interactable == null || interactable.CanInteract() == false) continue;
if (interactable == null || !interactable.CanInteract()) continue;
float sqrMagnitude = (interactable.GetInteractableGameObject().transform.position - transform.position).sqrMagnitude;
if (sqrMagnitude > minDistance) continue;
nearestInteractable = interactable;
minDistance = sqrMagnitude;
}
return nearestInteractable;
}
private void BroadcastShowUi(IInteractable interactable, float ratio)
float sqrDistance = (interactable.GetInteractableGameObject().transform.position - transform.position).sqrMagnitude;
if (sqrDistance < minSqrDistance)
{
var evt = GameEvents.ShowInteractionUiEvent;
evt.TextKey = interactable.GetInteractionMessageKey();
evt.HoldProgress = ratio;
EventBus.Broadcast(evt);
minSqrDistance = sqrDistance;
nearest = interactable;
}
}
return nearest;
}
public virtual void Invoke(RestaurantInteractionEvent evt) { }
public GameObject GetInteractorGameObject() => gameObject;
}
}

105
Assets/_DDD/_Scripts/RestaurantCharacter/RestaurantPlayerInteraction.cs Normal file
View File

@ -0,0 +1,105 @@
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.InputSystem;
namespace DDD
{
public class RestaurantPlayerInteraction : RestaurantCharacterInteraction
{
private RestaurantPlayerDataSo _restaurantPlayerDataSo;
protected override void Start()
{
base.Start();
_ = Initialize();
}
private async Task Initialize()
{
_restaurantPlayerDataSo = await AssetManager.LoadAsset<RestaurantPlayerDataSo>(DataConstants.RestaurantPlayerDataSo);
Debug.Assert(_restaurantPlayerDataSo != null, "_restaurantPlayerDataSo is null");
_restaurantPlayerDataSo.InteractAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.Interact));
_restaurantPlayerDataSo.InteractAction.performed += OnInteractPerformed;
_restaurantPlayerDataSo.InteractAction.canceled += OnInteractCanceled;
_interactionRadius = _restaurantPlayerDataSo.InteractionRadius;
_interactionLayerMask = _restaurantPlayerDataSo.InteractionLayerMask;
EventBus.Register<RestaurantInteractionEvent>(this);
}
protected override void OnDestroy()
{
base.OnDestroy();
if (_restaurantPlayerDataSo != null)
{
_restaurantPlayerDataSo.InteractAction.performed -= OnInteractPerformed;
_restaurantPlayerDataSo.InteractAction.canceled -= OnInteractCanceled;
}
EventBus.Unregister<RestaurantInteractionEvent>(this);
}
private void OnInteractPerformed(InputAction.CallbackContext context)
{
if (_nearestInteractable == null || !_nearestInteractable.CanInteract()) return;
float requiredHoldTime = _nearestInteractable.GetRequiredHoldTime();
if (requiredHoldTime <= 0f)
{
_nearestInteractable.OnInteracted(this);
}
else
{
_isInteracting = true;
_interactHeldTime = 0f;
_interactingTarget = _nearestInteractable;
}
}
private void OnInteractCanceled(InputAction.CallbackContext context)
{
ResetInteractionState();
}
protected override void OnNearestInteractableChanged(IInteractable newTarget)
{
if (newTarget != null && newTarget.CanInteract())
{
BroadcastShowUi(newTarget, 0f);
}
else
{
if (_isInteracting == false)
{
EventBus.Broadcast(GameEvents.HideInteractionUiEvent);
}
}
}
protected override void OnInteractionHoldProgress(float ratio)
{
if (_interactingTarget != null)
{
BroadcastShowUi(_interactingTarget, ratio);
}
}
protected override void OnInteractionCompleted()
{
}
private void BroadcastShowUi(IInteractable interactable, float ratio)
{
var evt = GameEvents.ShowInteractionUiEvent;
evt.TextKey = interactable.GetInteractionMessageKey();
evt.HoldProgress = ratio;
EventBus.Broadcast(evt);
}
}
}