Commit Graph

517 Commits

Author SHA1 Message Date
4bdb2899e0 기존 타임 리미터를 손님 타임 리미터로 변경 2025-08-29 13:41:27 +09:00
015cadde31 손님 타임 리미터 제작, 블랙보드 기록 여부, string 키 입력 추가
IAIBlackboard 메서드를 제네릭 메서드로 변경
2025-08-29 13:35:46 +09:00
2fe3bbb9ac 공유 변수 스코프 재조정 - 이제 서브트리를 복제해서 사용하므로 그래프 단위로 조정 2025-08-29 11:53:33 +09:00
3e49bb8e18 Merge remote-tracking branch 'origin/develop' into develop 2025-08-29 11:35:33 +09:00
d911c1205d 타임 리미터 제작, 그에 맞는 오더 서브트리 변경 2025-08-29 11:35:22 +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
8a93361f3f Merge remote-tracking branch 'origin/feature/Interaction_type_message' into develop 2025-08-28 20:01:11 +09:00
NTG
33db6a1c6c 상호작용 메세지 로직 완성 2025-08-28 20:00:22 +09:00
6e5f0d2234 임시 테이블 상호작용 UI 추가 2025-08-28 19:51:14 +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
Jeonghyeon Ha
cc86bd6427 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop 2025-08-28 18:58:04 +09:00
Jeonghyeon Ha
45ae01777a NPC 서브트리 인스턴스화 2025-08-28 18:58:01 +09:00
7205b9afbe Merge remote-tracking branch 'origin/develop' into develop 2025-08-28 18:30:18 +09:00
76e8d6bfd0 창문 밤하늘 수정, 스위치 테스트 2025-08-28 18:30:07 +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
c1b1dbb14b Merge branch 'feature/fix_startRestaurantOrder' into develop 2025-08-28 16:53:23 +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
d30e562d3a 오류 유발 요소 제거 2025-08-28 14:56:45 +09:00
48eedfc590 Merge remote-tracking branch 'origin/develop' into develop 2025-08-28 14:54:39 +09:00
300711c47b 씬 최신화 2025-08-28 14:54:29 +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
NTG
86c0f67c7c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs
#	Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs
#	Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs
2025-08-28 13:06:46 +09:00
NTG
4a4c46f5a1 구글 시트 so 연동 시스템 수정 2025-08-28 13:01:44 +09:00
45c6f03cc9 BehaviorTree에 공유변수를 CustomerData를 CustomerDataId로 변경 2025-08-28 12:56:09 +09:00
60d0c80ad3 Blackboard Customer data Id만 받도록 수정 2025-08-28 12:55:21 +09:00
NTG
ba5d3ffb59 구글 시트 로직 수정 (클래스명 변경) 2025-08-28 12:49:47 +09:00
d1f4980da2 Merge remote-tracking branch 'origin/feature/customer_moveto' into feature/customer_moveto/FixToBlackboard 2025-08-28 12:43:45 +09:00
61fd509c96 중첩상태 제거 및 플레이어-손님 OrderSolver 분배, 초기화 부분 리팩토링 2025-08-28 12:43:32 +09:00
Jeonghyeon Ha
8050d0d19e AIMoveTo 디버그 드로우 추가 2025-08-28 11:24:44 +09:00
60205d3c00 Merge remote-tracking branch 'origin/feature/customer_moveto' into feature/customer_moveto/FixToBlackboard 2025-08-28 10:51:37 +09:00
b4e001f03f Refactor: Simplify interaction target retrieval in WaitForPlayerInteraction using TryGetComponent and shared blackboard. 2025-08-28 10:49:44 +09:00
Jeonghyeon Ha
d2f33de6ab 커스터머 AI 블랙보드 세팅 2025-08-28 10:49:29 +09:00
8851da71d3 Merge branch 'feature/customer_behavior' into feature/customer_moveto/FixToBlackboard
# Conflicts:
#	Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs
2025-08-27 19:47:22 +09:00
Jeonghyeon Ha
dfc4fa26d6 MoveTo, LookAt 타겟 지정 수정 2025-08-27 19:43:08 +09:00
NTG
e5ebb71832 요리도구 ui와 상호작용 2025-08-27 19:38:46 +09:00
Jeonghyeon Ha
bf1fe51957 Merge branch 'feature/fixcustomer_interaction' into develop 2025-08-27 19:18:52 +09:00
Jeonghyeon Ha
18a9d9fef0 fixed customer interaction flow 2025-08-27 19:15:21 +09:00
NTG
05ab2c0b89 async 경고 수정 2025-08-27 18:53:46 +09:00
NTG
3289b55874 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/cook_ui 2025-08-27 18:44:57 +09:00
NTG
db5de56b3b Addressable기능 AssetManager로 통합 2025-08-27 17:52:33 +09:00