Commit Graph

21 Commits

Author SHA1 Message Date
36cfe1d923 Exit, Entry 이벤트 추가, emotion 표현 액션, 만족도 평가 액션, 마커 탐색-등록 액션 추가, 마커 컴포넌트 추가 2025-08-29 17:16:48 +09:00
Jeonghyeon Ha
517a7ec1f4 Merge remote-tracking branch 'origin/feature/DisplayUiComponent' into develop
# Conflicts:
#	Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs
2025-08-29 11:07:26 +09:00
NTG
6037cd4d63 병합 오류 수정 및 GetLocalizedString null 처리 2025-08-28 20:19:37 +09:00
NTG
c85504e8f8 Merge remote-tracking branch 'origin/feature/cook_ui' into develop
# Conflicts:
#	Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab
#	Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs
#	Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs
2025-08-28 20:03:53 +09:00
NTG
33db6a1c6c 상호작용 메세지 로직 완성 2025-08-28 20:00:22 +09:00
NTG
b9e31ce74d 상호작용 메세지 로직 수정 2025-08-28 19:06:38 +09:00
7527803a73 Merge remote-tracking branch 'origin/develop' into feature/DisplayUiComponent 2025-08-28 18:59:27 +09:00
2bc3f5e52b 리팩토링: RestaurantOrderSolverBase 추가 2025-08-28 18:58:24 +09:00
NTG
aa628edf1b Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/Interaction_type_message 2025-08-28 18:17:07 +09:00
Jeonghyeon Ha
3eeed819b2 인터랙션 hidden( interactor side )과 available( interactable side ) 분리 2025-08-28 18:16:46 +09:00
NTG
896b82b6f1 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/Interaction_type_message 2025-08-28 18:11:30 +09:00
NTG
1b45975502 interactionData 추가 2025-08-28 18:11:13 +09:00
Jeonghyeon Ha
ab734e8081 인터랙션 숨김 조건 추가 2025-08-28 16:52:18 +09:00
7a30a1c028 Merge remote-tracking branch 'origin/feature/fix_startRestaurantOrder' into feature/DisplayUiComponent 2025-08-28 15:47:40 +09:00
533ca8ccf1 MealSubsystem, Solver 제거 2025-08-28 15:46:53 +09:00
Jeonghyeon Ha
a7d741b81e 레스토랑 상호작용 시스템 개선:
- 고객 AI 주문 시작/대기/가용성 로직 정리 및 안정성 향상
- IInteractionSubsystemOwner 및 Order Subsystem 연동 보강
- PlayerInteraction/InteractionComponent 이벤트 흐름 수정
- Wait 주문 솔버 로직 보정
- 고객 기본/주문 서브트리 에셋 업데이트
2025-08-28 14:52:21 +09:00
NTG
3720adfd78 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/cook_ui
# Conflicts:
#	Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs
2025-08-28 14:06:22 +09:00
61fd509c96 중첩상태 제거 및 플레이어-손님 OrderSolver 분배, 초기화 부분 리팩토링 2025-08-28 12:43:32 +09:00
NTG
e5ebb71832 요리도구 ui와 상호작용 2025-08-27 19:38:46 +09:00
Jeonghyeon Ha
18a9d9fef0 fixed customer interaction flow 2025-08-27 19:15:21 +09:00
Jeonghyeon Ha
e70df5b580 클래스 이름 수정 - 접두사 제거 2025-08-27 17:25:11 +09:00