NTG
752d9b7f2d
Merge remote-tracking branch 'origin/develop' into feature/cook_system
2025-08-29 14:38:26 +09:00
f9bb1fb262
깨진 데코레이터 수정
2025-08-29 14:19:56 +09:00
4bdb2899e0
기존 타임 리미터를 손님 타임 리미터로 변경
2025-08-29 13:41:27 +09:00
NTG
8445640c20
리소스 최신화
2025-08-29 12:15:09 +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
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
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
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
Jeonghyeon Ha
c1b1dbb14b
Merge branch 'feature/fix_startRestaurantOrder' into develop
2025-08-28 16:53:23 +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
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
61fd509c96
중첩상태 제거 및 플레이어-손님 OrderSolver 분배, 초기화 부분 리팩토링
2025-08-28 12:43:32 +09:00
60205d3c00
Merge remote-tracking branch 'origin/feature/customer_moveto' into feature/customer_moveto/FixToBlackboard
2025-08-28 10:51:37 +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
NTG
e5ebb71832
요리도구 ui와 상호작용
2025-08-27 19:38:46 +09:00
Jeonghyeon Ha
fbe0f26562
네임스페이스 수정에 따른 서브트리 무한루프 수정
2025-08-27 17:51:16 +09:00
78d6356e67
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/customer_behavior
2025-08-27 13:20:55 +09:00
NTG
62a916392d
Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/cook_ui
...
# Conflicts:
# Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs
2025-08-27 13:06:26 +09:00
NTG
571fa1e4f0
cook subsystem 분리
2025-08-27 13:05:08 +09:00
Jeonghyeon Ha
b0528c5486
Merge branch 'feature/customer_behavior' into develop
2025-08-27 13:04:55 +09:00
bfcc99be38
로그 추가
2025-08-27 11:45:27 +09:00
NTG
fdfc970a09
Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/cook_ui
2025-08-27 03:07:10 +09:00
NTG
7bd87844e9
cook ui 초안
2025-08-27 03:06:44 +09:00
NTG
d671b91e92
cookui 수정 중
2025-08-26 20:56:15 +09:00
71adf5aacf
테스트 씬 추가
2025-08-26 20:55:13 +09:00
318537f3d5
메뉴판 롤백
2025-08-26 20:45:14 +09:00
0c513ea21a
Revert "영업 세팅 상호작용(메뉴 가판대) 추가"
...
This reverts commit 5cd3127b86
2025-08-26 20:18:07 +09:00
5bf5008e17
Revert "레스토랑 스테이지 수정"
...
This reverts commit bae9a43ef7
2025-08-26 20:17:28 +09:00
ade5bc4cf4
Merge remote-tracking branch 'origin/develop' into develop
2025-08-26 19:38:26 +09:00
bae9a43ef7
레스토랑 스테이지 수정
2025-08-26 19:38:12 +09:00
c78802ee37
Merge remote-tracking branch 'origin/develop' into develop
2025-08-26 19:36:14 +09:00
5cd3127b86
영업 세팅 상호작용(메뉴 가판대) 추가
2025-08-26 19:35:38 +09:00
17bfa771de
영업 세팅 상호작용(메뉴 가판대) 추가
2025-08-26 19:35:15 +09:00
b57cc45902
메모리 누수, UI 변경점 머지
2025-08-26 19:14:52 +09:00
556ddcba13
Merge remote-tracking branch 'origin/develop' into feature/customer_behavior
...
# Conflicts:
# Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs
2025-08-26 19:00:07 +09:00
NTG
7ef27bbeae
cook ui 작업 중
2025-08-26 18:56:40 +09:00
471a436a0c
Merge remote-tracking branch 'origin/develop' into feature/customer_behavior
...
# Conflicts:
# Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs
2025-08-26 17:38:48 +09:00
