Commit Graph

572 Commits

Author SHA1 Message Date
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
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
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
Jeonghyeon Ha
fbe0f26562 네임스페이스 수정에 따른 서브트리 무한루프 수정 2025-08-27 17:51:16 +09:00
faaa2cbce6 Merge remote-tracking branch 'origin/develop' into feature/customer_behavior 2025-08-27 17:27:28 +09:00
Jeonghyeon Ha
e70df5b580 클래스 이름 수정 - 접두사 제거 2025-08-27 17:25:11 +09:00
b204a7b1b9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/customer_behavior
# Conflicts:
#	Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs
2025-08-27 17:09:48 +09:00
Jeonghyeon Ha
be0a7f4cfe 인터랙션 구조 수정 2025-08-27 17:05:54 +09:00
Jeonghyeon Ha
a473f517eb 네임스페이스 수정 및 폴더 정리 - Game, Restaurant 2025-08-27 16:52:34 +09:00
78d6356e67 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/customer_behavior 2025-08-27 13:20:55 +09:00
NTG
a1c33cdaf5 payload 롤백 2025-08-27 13:18:44 +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
42c9c56cb6 Merge remote-tracking branch 'origin/feature/customer_behavior' into feature/customer_behavior 2025-08-27 11:45:49 +09:00
bfcc99be38 로그 추가 2025-08-27 11:45:27 +09:00
Jeonghyeon Ha
b0eb18f9c0 Added todo comment 2025-08-27 11:44:51 +09:00
Jeonghyeon Ha
4049b38c19 Merge branch 'feature/customer_behavior' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/customer_behavior
# Conflicts:
#	Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs
2025-08-27 11:28:05 +09:00
Jeonghyeon Ha
fa2ebd4510 레스토랑 오더 솔버 코멘트 변경 2025-08-27 11:23:43 +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
ad3306077a 메타 파일 추가 2025-08-26 23:13:02 +09:00
NTG
d671b91e92 cookui 수정 중 2025-08-26 20:56:15 +09:00
71adf5aacf 테스트 씬 추가 2025-08-26 20:55:13 +09:00
lsm
20bc0cda32 에셋 동기화 2025-08-26 20:48:47 +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
lsm
c78802ee37 Merge remote-tracking branch 'origin/develop' into develop 2025-08-26 19:36:14 +09:00
lsm
5cd3127b86 영업 세팅 상호작용(메뉴 가판대) 추가 2025-08-26 19:35:38 +09:00
lsm
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
NTG
851e95cdcc scriptableObject 메모리 누수 방지 2025-08-26 18:55:57 +09:00
92e2cda1a9 Payload 추가된 버전 머지 2025-08-26 17:43:51 +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
1663ff055c 레스토랑 식사 인터랙션 서브 시스템 및 솔버 초기 구현 추가 2025-08-26 17:37:17 +09:00
NTG
8bfb378818 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/cook_ui 2025-08-26 17:28:16 +09:00
NTG
88a11022b3 interactable용 payload 로직 추가 2025-08-26 17:27:50 +09:00