Commit Graph

39 Commits

Author SHA1 Message Date
Jeonghyeon Ha
f174fabd34 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop 2025-09-01 17:55:30 +09:00
Jeonghyeon Ha
dfe19cbb4c 레스토랑 Serve 인터랙션 처리 2025-09-01 17:55:26 +09:00
dc9bd260d1 Merge remote-tracking branch 'origin/develop' into develop 2025-09-01 16:53:15 +09:00
3f237cd1c1 추가 사항: RestaurantEnvironmentPointQueryEvent 삭제, CheckCumulateOrderCount 조건 액션 추가, CustomerBlackboardSo 클래스 추가, ExitSubtree 에셋 추가 2025-09-01 16:33:52 +09:00
Jeonghyeon Ha
529da3b713 RestaurantOrder Serve 상태일 때 음식 표시 2025-09-01 16:26:38 +09:00
Jeonghyeon Ha
49a709b3c4 하이라이트 아웃라인, 월드 UI 렌더 수정 2025-09-01 14:30:29 +09:00
a119382330 인터렉션 충돌 머지 2025-09-01 09:40:23 +09:00
759384d626 Merge branch 'feature/Entry-ExitPoint' into develop
# Conflicts:
#	Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs
2025-08-29 19:35:08 +09:00
Jeonghyeon Ha
1c254312b2 레스토랑 오더 시 빌 아이템에 이미지 넣기 2025-08-29 19:23:37 +09:00
Jeonghyeon Ha
bf253cd988 주문 인터랙션 처리 2025-08-29 19:09:42 +09:00
466313acb9 수정 사항 적용(string key를 enum nameof로 변경, 퇴장 이벤트 쿼리 삭제) 2025-08-29 18:23:57 +09:00
36cfe1d923 Exit, Entry 이벤트 추가, emotion 표현 액션, 만족도 평가 액션, 마커 탐색-등록 액션 추가, 마커 컴포넌트 추가 2025-08-29 17:16:48 +09:00
Jeonghyeon Ha
c903c0c210 Bill Hud 초안 작성 2025-08-29 16:51:48 +09:00
Jeonghyeon Ha
8a1b13d075 Interactor 인터페이스에 Solver type fetch하는 함수 추가 2025-08-29 16:50:54 +09:00
6d1973a312 Merge pull request 'feature/order_interaction' (#33) from feature/order_interaction into develop
Reviewed-on: #33
2025-08-29 05:43:30 +00:00
Jeonghyeon Ha
44dc99e83f 레스토랑 주문 인터랙션 구현 초안 작성 2025-08-29 14:35:08 +09:00
NTG
c22f0ad9ed type 네임 변경 2025-08-29 14:34:18 +09:00
NTG
34790bbc1a cookSolver 최신화 2025-08-29 14:17:32 +09:00
Jeonghyeon Ha
0bdacf1e19 Added highlight proxy 2025-08-29 12:16:37 +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