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
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
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
08016f97b4
Merge pull request 'feature/customer_moveto/FixToBlackboard' ( #28 ) from feature/customer_moveto/FixToBlackboard into develop
...
Reviewed-on: #28
2025-08-28 04:01:29 +00: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
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
17ea4c85dc
Merge pull request 'feature/namespace_restaurant' ( #27 ) from feature/namespace_restaurant into develop
...
Reviewed-on: #27
2025-08-27 08:06:55 +00: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
Jeonghyeon Ha
2da23bf811
gitattribute 수정
2025-08-27 13:52:40 +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
20bc0cda32
에셋 동기화
2025-08-26 20:48:47 +09:00
318537f3d5
메뉴판 롤백
2025-08-26 20:45:14 +09:00
