b7f9fbb5ab
Merge remote-tracking branch 'origin/develop' into develop
2025-09-01 09:40:48 +09:00
a119382330
인터렉션 충돌 머지
2025-09-01 09:40:23 +09:00
NTG
12caf353e5
리소스 최신화
2025-08-31 20:59:12 +09:00
NTG
57938a0966
메뉴 ui 상호작용 조건 추가
2025-08-29 19:47:56 +09:00
65f2f17752
Merge remote-tracking branch 'origin/develop' into develop
2025-08-29 19:41:19 +09:00
NTG
83da52c864
Merge remote-tracking branch 'origin/develop' into develop
2025-08-29 19:36:01 +09:00
NTG
909a0382e9
말풍선 set 오류 수정
2025-08-29 19:35:52 +09:00
759384d626
Merge branch 'feature/Entry-ExitPoint' into develop
...
# Conflicts:
# Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs
2025-08-29 19:35:08 +09:00
ec4f5d58c1
블랙보드에 사용할 SO 제작, MoveToTarget 대중화
2025-08-29 19:30:16 +09:00
Jeonghyeon Ha
1c254312b2
레스토랑 오더 시 빌 아이템에 이미지 넣기
2025-08-29 19:23:37 +09:00
0be6cb6059
Merge pull request 'feature/order_interaction_ui' ( #35 ) from feature/order_interaction_ui into develop
...
Reviewed-on: #35
2025-08-29 10:14:35 +00:00
Jeonghyeon Ha
bf253cd988
주문 인터랙션 처리
2025-08-29 19:09:42 +09:00
NTG
9bd86247a7
cook_system 병합
2025-08-29 19:06:54 +09:00
NTG
de70e83859
Merge branch 'feature/cook_system' into develop
2025-08-29 19:04:37 +09:00
NTG
aafb52a99b
리소스 추가 및 변경
2025-08-29 19:03:25 +09:00
NTG
f78b5d33a9
캐릭터 carrier 컴포넌트 추가
2025-08-29 19:03:11 +09:00
NTG
362444c1a5
요리에 말풍선 기능 추가
2025-08-29 19:02:51 +09:00
NTG
778629883c
말풍선 로직 추가
2025-08-29 19:02:35 +09:00
NTG
da03795275
virtual carriable 클래스 추가
2025-08-29 19:02:24 +09:00
NTG
d0c799f177
요리 state 기능 추가
2025-08-29 19:01:27 +09:00
NTG
de32443df9
불필요 비동기 제거
2025-08-29 18:59:46 +09:00
466313acb9
수정 사항 적용(string key를 enum nameof로 변경, 퇴장 이벤트 쿼리 삭제)
2025-08-29 18:23:57 +09:00
bc23cea88a
Entry, Exit 마커 오브젝트 씬 배치, NPC Entry 위치 수정
2025-08-29 17:34:59 +09:00
36cfe1d923
Exit, Entry 이벤트 추가, emotion 표현 액션, 만족도 평가 액션, 마커 탐색-등록 액션 추가, 마커 컴포넌트 추가
2025-08-29 17:16:48 +09:00
Jeonghyeon Ha
c903c0c210
Bill Hud 초안 작성
2025-08-29 16:51:48 +09:00
Jeonghyeon Ha
8a1b13d075
Interactor 인터페이스에 Solver type fetch하는 함수 추가
2025-08-29 16:50:54 +09:00
6d1973a312
Merge pull request 'feature/order_interaction' ( #33 ) from feature/order_interaction into develop
...
Reviewed-on: #33
2025-08-29 05:43:30 +00: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
Jeonghyeon Ha
44dc99e83f
레스토랑 주문 인터랙션 구현 초안 작성
2025-08-29 14:35:08 +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
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
Jeonghyeon Ha
0bdacf1e19
Added highlight proxy
2025-08-29 12:16:37 +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
6e5f0d2234
임시 테이블 상호작용 UI 추가
2025-08-28 19:51:14 +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
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
