Commit Graph

691 Commits

Author SHA1 Message Date
NTG
67e908bd8c 로컬 addressable 설정값 수정 2025-08-29 14:40:49 +09:00
NTG
752d9b7f2d Merge remote-tracking branch 'origin/develop' into feature/cook_system 2025-08-29 14:38:26 +09:00
NTG
59afe0823c 리소스, db 최신화 2025-08-29 14:37:51 +09:00
NTG
c22f0ad9ed type 네임 변경 2025-08-29 14:34:18 +09:00
f9bb1fb262 깨진 데코레이터 수정 2025-08-29 14:19:56 +09:00
NTG
34790bbc1a cookSolver 최신화 2025-08-29 14:17:32 +09:00
NTG
7b8f4cc245 상호작용 메세지 처리 최적화 2025-08-29 14:12:05 +09:00
NTG
c40adf2eb6 InteractionDisplayParameters null 처리 강화 2025-08-29 14:11:47 +09:00
77991d562b 잘못된 네임스페이스 수정 2025-08-29 13:49:15 +09:00
4bdb2899e0 기존 타임 리미터를 손님 타임 리미터로 변경 2025-08-29 13:41:27 +09:00
9f79812250 Merge remote-tracking branch 'origin/develop' into feature/TimeLimiter 2025-08-29 13:38:39 +09:00
015cadde31 손님 타임 리미터 제작, 블랙보드 기록 여부, string 키 입력 추가
IAIBlackboard 메서드를 제네릭 메서드로 변경
2025-08-29 13:35:46 +09:00
NTG
16415ac426 요리 더미 로직 연결 2025-08-29 13:28:03 +09:00
NTG
6929728b23 viewModel 로직 추상화 2025-08-29 13:27:43 +09:00
NTG
bf7388bc30 현지화 데이터 최신화 2025-08-29 13:27:02 +09:00
NTG
e96cb599fb interactionType subsystem 없는 경우 보완 2025-08-29 12:58:57 +09:00
NTG
75f09e75d2 ui 추상화 로직 강제 2025-08-29 12:53:54 +09:00
ce936a053d Merge pull request 'feature/TimeLimiter' (#31) from feature/TimeLimiter into develop
Reviewed-on: #31
Reviewed-by: Jeonghyeon <jeonghyeon@capers.co.kr>
2025-08-29 03:19:45 +00:00
Jeonghyeon Ha
bdd6eb45de git diff 어트리뷰트 수정 2025-08-29 12:17:30 +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
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
447335ef20 Merge remote-tracking branch 'origin/develop' into feature/DisplayUiComponent 2025-08-28 19:51:30 +09:00
6e5f0d2234 임시 테이블 상호작용 UI 추가 2025-08-28 19:51:14 +09:00
Jeonghyeon Ha
7180b4f6ca gitattribute unity smart merge (unityYamlMerge) 추가 2025-08-28 19:12:38 +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