Commit Graph

79 Commits

Author SHA1 Message Date
b2d2f500d2 없음 2026-07-22 16:07:27 +09:00
dldydtn9755-crypto
0f0e6c6f63 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 16:59:10 +09:00
264b169006 마지막 씬 베이킹 2026-07-21 16:07:11 +09:00
dldydtn9755-crypto
18f496e503 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 13:10:28 +09:00
9284a63aac 페스티벌씬 에셋오류 수정 2026-07-21 13:05:05 +09:00
dldydtn9755-crypto
4f60232566 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-21 09:50:45 +09:00
dldydtn9755-crypto
e29c9071fe no message 2026-07-21 09:50:22 +09:00
f1d468d0ef 챕터2 나머지 완료 2026-07-20 19:37:27 +09:00
dldydtn9755-crypto
57d6cdfd80 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-20 18:14:48 +09:00
dldydtn9755-crypto
94287ee19d 벽쿵 완성본 2026-07-20 18:13:49 +09:00
50be43de93 챕터2 유나루트 완료 2026-07-20 18:12:43 +09:00
dldydtn9755-crypto
a4e92d57fb Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-20 12:46:28 +09:00
dldydtn9755-crypto
aeb328f9db no message 2026-07-20 12:42:04 +09:00
9e4a5ac143 파티클 수정 2026-07-20 12:25:42 +09:00
0a319f5906 2챕터 윤지후 루트 및 버그 수정 2026-07-17 15:56:18 +09:00
dldydtn9755-crypto
a9f5df1430 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-17 14:22:44 +09:00
dldydtn9755-crypto
b273af18e9 2 2026-07-17 14:20:28 +09:00
ad6ccadc8e 대화중에 아웃라인 안뜨게 2026-07-17 11:57:19 +09:00
ef66cd22e7 행사용품들 에셋 2026-07-17 10:53:44 +09:00
1bf813a8dd 창고 꾸미는중 2026-07-16 18:07:15 +09:00
dldydtn9755-crypto
8e4b825957 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 17:57:32 +09:00
dldydtn9755-crypto
f1948452b6 131 2026-07-16 17:50:41 +09:00
dldydtn9755-crypto
7d8e1a62dc Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 16:37:00 +09:00
dldydtn9755-crypto
b67d6e5f56 도서관 현재 2026-07-16 16:35:13 +09:00
963efde33e Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 16:34:22 +09:00
454adce428 챕터 1,2 라이팅맵 2026-07-16 16:30:58 +09:00
7aa008cd1a Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 12:15:39 +09:00
736edbce0f 이제는웃는거야스마일어게인 2026-07-16 12:12:03 +09:00
dldydtn9755-crypto
83fee62720 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 17:59:15 +09:00
c2216b0756 챕터2 구준표루스 루트 2026-07-15 17:58:28 +09:00
dldydtn9755-crypto
965e5911d9 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 17:56:04 +09:00
dldydtn9755-crypto
a161289ecf 자 이제 시작이야~ 2026-07-15 17:55:41 +09:00
8f3cacb39c 베타적 대화구조 2026-07-15 17:17:21 +09:00
dldydtn9755-crypto
789d9fd8ec Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:ㅇㅇ
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 15:03:57 +09:00
dldydtn9755-crypto
b081fa01b7 ㅇㅇㅇ 2026-07-15 15:00:07 +09:00
18160cc301 D4폴더수정 2026-07-15 14:59:59 +09:00
dldydtn9755-crypto
c3702652e9 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 14:08:26 +09:00
dldydtn9755-crypto
a700ba4054 ㅡㅎㅎ 2026-07-15 14:08:09 +09:00
e98b6f610d 대화시스템 수정 2026-07-15 14:07:25 +09:00
74d4bf2519 2챕터 진행중 2026-07-15 12:57:39 +09:00
5995681310 처음부분 추가 2026-07-14 17:40:16 +09:00
e0be196bbb 집씬으로 넘기기 2026-07-14 16:34:20 +09:00
b87651b186 버그 수정 2026-07-14 14:25:34 +09:00
b6a48895a8 오류 수정 2026-07-14 12:46:25 +09:00
058783d10d Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-13 17:35:01 +09:00
a111de1253 타이밍 수정 2026-07-13 17:09:40 +09:00
dldydtn9755-crypto
0cba1ed65a 도서관 완성 2026-07-13 15:42:53 +09:00
de3e910d70 버그 수정 2026-07-13 13:16:28 +09:00
ac52151604 스카이박스 텍스처 추가 2026-07-13 12:11:15 +09:00
e82538447d 2026-07-13 챕터2씬추가 및 대사 구성 2026-07-13 10:32:43 +09:00