Commit Graph

496 Commits

Author SHA1 Message Date
NTG
7e26ba79bf Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop 2025-08-19 13:51:55 +09:00
NTG
9d57bcb040 so 싱글톤 추가 2025-08-19 13:51:42 +09:00
lsm
850ff5a1f3 Merge remote-tracking branch 'origin/develop' into develop 2025-08-19 12:30:05 +09:00
lsm
dfb51d9c9f 익스터널 메타 데이터 수정 2025-08-19 12:29:41 +09:00
lsm
a8dbfbe0e3 조리기구 프랍 추가 2025-08-19 12:27:32 +09:00
NTG
b8eec075ab state 로직 롤백 2025-08-19 12:12:10 +09:00
NTG
e7cb187068 에셋 동기화 2025-08-18 19:52:02 +09:00
NTG
c5c04b1469 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop
# Conflicts:
#	Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
2025-08-18 19:49:19 +09:00
NTG
6d9e7a7f51 data, state 관리 로직 전부 수정
ScriptableSingleton 모두 삭제
2025-08-18 19:48:36 +09:00
lsm
4af6f0c990 Merge remote-tracking branch 'origin/develop' into develop 2025-08-18 18:38:40 +09:00
lsm
a25fdd59be 조리기구 프랍 추가 2025-08-18 18:28:04 +09:00
85a24fc9b6 프랍 스케일값 정리 2025-08-18 18:23:10 +09:00
1b6483dd7c Merge remote-tracking branch 'origin/develop' into develop 2025-08-18 17:21:57 +09:00
b2c6e95be7 태건님이 시켰음 2025-08-18 17:21:46 +09:00
NTG
dcd5a0c2d8 Remove ignored files from the repository 2025-08-18 17:18:57 +09:00
NTG
885baf9673 gitignore 재수정 2025-08-18 17:17:56 +09:00
cf514b9be2 레스토랑 스케일 정리 2025-08-18 17:15:16 +09:00
NTG
6bd4ada658 에셋 변경 2025-08-18 17:12:07 +09:00
NTG
2410c93607 현지화 데이터 smart string 연동 처리 2025-08-18 17:12:01 +09:00
NTG
9944e27234 ProjectDDD 메뉴 추가 2025-08-18 16:54:25 +09:00
7f31f08d71 Merge remote-tracking branch 'origin/develop' into develop 2025-08-18 16:41:41 +09:00
fb04e6a5ed 태건님이 시킴 2025-08-18 16:41:24 +09:00
NTG
f44a2d99eb Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into feature/restaurant_ui
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2025-08-18 16:27:18 +09:00
NTG
a6ef8f9f8d DDD 프로젝트 일괄 설정 기능 추가 2025-08-18 16:26:33 +09:00
NTG
d7c190fccf 게임 매니저 수정 2025-08-18 16:26:16 +09:00
NTG
57a7a1bcdd 아틀라스 패킹 기능 추가 2025-08-18 16:25:53 +09:00
9f295912e7 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2025-08-18 16:22:49 +09:00
9002f1f7d2 레스토랑 ㅁ자 구조 롤백 2025-08-18 16:21:16 +09:00
649056466d 비늘오리 꿈해초 프랍 추가 2025-08-18 15:51:00 +09:00
NTG
bcf28ee7c3 smart string 이벤트 호출 위치 변경 2025-08-18 14:29:30 +09:00
NTG
bfc23da955 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop
# Conflicts:
#	.cursorrules
#	Packages/com.distantlands.cozy.core/Content/Demo/Terrain/New Terrain 2.asset
2025-08-18 14:23:39 +09:00
NTG
c6b9519f11 merge 2025-08-18 14:21:53 +09:00
NTG
56ec16bcf5 addressable 동기화 2025-08-18 14:15:30 +09:00
NTG
226bada6a6 fixed gitignore 2025-08-18 14:15:13 +09:00
NTG
96aa756769 RestaurantRunController 오류 수정 2025-08-18 14:09:56 +09:00
NTG
cb2970b897 UiManager PopupState기능 분리 2025-08-18 13:26:18 +09:00
NTG
e558be9257 Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop 2025-08-17 22:01:50 +09:00
NTG
18994439d1 add cursor rule 2025-08-17 22:00:15 +09:00
NTG
59867e063f 에셋 변경 2025-08-17 21:56:51 +09:00
NTG
6c08cb3537 현지화 로직 수정 2025-08-17 21:56:34 +09:00
NTG
56b5f3a701 customer state 로직 수정 2025-08-17 21:56:25 +09:00
NTG
63f8e26cb5 레스토랑 글로벌 메세지 컨트롤러 추가 2025-08-17 21:55:49 +09:00
NTG
d6dd319b7a 상속 클래스 변경 2025-08-17 21:54:46 +09:00
NTG
d580d611c1 FlowController로 공용 상속 클래스 변경 2025-08-17 21:53:43 +09:00
NTG
ff66c5d94f ui 체크리스트 기능 추가 2025-08-17 21:51:51 +09:00
NTG
4b1aa5229a GameState 추가 2025-08-17 21:49:38 +09:00
NTG
cb90c9d288 GameController (RestaurantController 보다 상위) 컨트롤러 추가 2025-08-17 21:49:06 +09:00
NTG
3099961e65 요리도구-오늘의메뉴 매칭 기능 추가 2025-08-17 16:31:11 +09:00
NTG
fbe003c0c2 navigation 제거 2025-08-17 16:30:51 +09:00
NTG
21cf69123c ui 오류 수정 2025-08-17 16:23:05 +09:00