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
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
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
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
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
NTG
7ace76bd82
프리팹 수정
2025-08-26 16:33:27 +09:00
NTG
0f3a958b96
상호작용 ui 수정
2025-08-26 16:32:59 +09:00
NTG
15c7dd0f04
데이터 동기화
2025-08-26 14:38:46 +09:00
NTG
493e05e1f7
Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/cook_ui
2025-08-26 14:22:20 +09:00
NTG
79ba4c2b36
Merge branch 'feature/interaction_subsystem' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop
...
# Conflicts:
# Assets/_DDD/Restaurant/Environments/Props/Prop_CustomerTable.prefab
2025-08-26 14:04:48 +09:00
NTG
ee832175d8
cookUi 임시 저장
2025-08-26 13:59:03 +09:00
NTG
0da44a51ae
cookUi 제작중
2025-08-25 20:30:04 +09:00
24239dc138
Customer AI 주문 서브트리 및 데코레이터 추가
...
레스토랑 씬용 임시 AStarPath 싱글톤 추가
2025-08-25 20:14:39 +09:00
d26a9b5356
영업 세팅 상호작용 추가
2025-08-25 19:02:36 +09:00
NTG
deeceeef65
confirm ui 수정
2025-08-25 14:00:03 +09:00
22047aeb8b
인터랙션 초기화 로직 수정 및 CustomerNpc 프리팹 업데이트
2025-08-25 13:03:07 +09:00
NTG
e135850dda
롤백
2025-08-25 10:56:42 +09:00
NTG
cf43d6f0ff
commonButton 연동
2025-08-25 10:54:25 +09:00
NTG
3e93ad0b39
ui 바인딩 로직 수정
2025-08-25 05:12:05 +09:00
NTG
acb4a8a170
using 정리
2025-08-24 20:48:20 +09:00
NTG
4ca10808a9
ui 로직 개선
2025-08-24 20:44:32 +09:00
352f00645d
smoothness 수치 개별 조정
2025-08-21 19:59:09 +09:00
NTG
b0ffb9df08
checklist 로직 분리
2025-08-21 19:26:14 +09:00
Jeonghyeon Ha
a8ff9a1707
Updated subtree
2025-08-21 19:21:26 +09:00
Jeonghyeon Ha
f8122d8c70
AI 액션 정리: LookAtInteractionTarget 껍데기/골격 추가 및 MoveToInteractionTarget 경로 재계산/정지 처리 안정화
2025-08-21 19:19:20 +09:00
Jeonghyeon Ha
71fbd60719
Refactored MoveToInteractionTarget
2025-08-21 19:13:39 +09:00
Jeonghyeon Ha
4ef63ec9a9
AI 비헤이비어 트리 액션 및 컨디셔널 구현
...
RestaurantOrderAvailable, StartRestaurantOrder, MoveToInteractionTarget
2025-08-21 19:12:06 +09:00
NTG
5642a5fe77
inventoryView 로직 분리
2025-08-21 19:11:47 +09:00
NTG
f75ec7684f
hasFlag 사용
2025-08-21 18:18:34 +09:00
NTG
5b0e6fd786
TodayMenuView viewModel 로직 분리
2025-08-21 18:15:51 +09:00
3a981723bd
기본 프랍 smoothness 수치 0으로 변경
2025-08-21 18:09:10 +09:00
NTG
4867427b8b
폴더 정리
2025-08-21 16:44:47 +09:00
Jeonghyeon Ha
8f56d99bf7
손님 비헤이비어 트리 초안 작성
2025-08-21 16:40:49 +09:00
NTG
ac49d77573
ui 생성 로직 변경
2025-08-21 16:25:27 +09:00
NTG
0dc138ea2f
uibutton 임시저장
2025-08-20 20:15:49 +09:00
Jeonghyeon Ha
5efc97f64d
Merge branch 'feature/interaction_subsystem' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/interaction_subsystem
2025-08-20 19:04:14 +09:00
117ed8228b
Update Assets/_DDD/_Scripts/RestaurantEnvironment/RestaurantEnvironment.cs
2025-08-20 10:00:39 +00:00
56a0880184
서브 시스템 수정, 인터렉트 컴포넌트에 서브 시스템 검색 인터페이스 추가
2025-08-20 18:55:30 +09:00
Jeonghyeon Ha
f895464e22
커스터머 테이블에 레스토랑 오더 인터랙션 컴포넌트 추가
2025-08-20 18:42:07 +09:00
NTG
4a18a239e8
임시 가이드라인
2025-08-20 18:16:57 +09:00
