Commit Graph

67 Commits

Author SHA1 Message Date
dldydtn9755-crypto
96dcd6e361 다이얼로그 일단 다 넣고 다 넣긴함 오류 수정 해아함 2026-07-22 21:19:13 +09:00
1aacaa854c 쉐이더 2026-07-21 15:52:20 +09:00
9284a63aac 페스티벌씬 에셋오류 수정 2026-07-21 13:05:05 +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
9e4a5ac143 파티클 수정 2026-07-20 12:25:42 +09:00
d835ddb21e 유나 드래곤폼 추가중 2026-07-17 18:09:45 +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
fc06825972 물품들 상호작용 달기 2026-07-17 12:45:12 +09:00
ecfd2d7f47 UI 깊이 버퍼 변경 2026-07-17 11:48:57 +09:00
ef66cd22e7 행사용품들 에셋 2026-07-17 10:53:44 +09:00
69f3b0a6d3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 18:08:03 +09:00
1bf813a8dd 창고 꾸미는중 2026-07-16 18:07:15 +09:00
d1babb74e2 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 18:03:32 +09:00
ffec2f1f3f 행복한순간이야해피데이 2026-07-16 17:59:28 +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
3c0e0ff75d 학생들 대화 설정 2026-07-15 17:09:21 +09:00
afc011bcd6 학생들 에셋 추가 2026-07-15 16:06:46 +09:00
18160cc301 D4폴더수정 2026-07-15 14:59:59 +09:00
376423a2cb Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-15 12:58:03 +09:00
74d4bf2519 2챕터 진행중 2026-07-15 12:57:39 +09:00
dldydtn9755-crypto
07cc9267a8 컴퓨터 수정 2026-07-15 12:53:00 +09:00
ae958ac18f 프리팹수정 2026-07-14 12:47:48 +09:00
0e0e12a768 2026-07-14 씬체인지 2026-07-14 11:51:45 +09:00
de3e910d70 버그 수정 2026-07-13 13:16:28 +09:00
961611705a 2026-07-10 비동기 씬전환 2026-07-10 21:46:10 +09:00
7daed9c5af Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-10 17:27:15 +09:00
932aad8c56 2026-07-10 대화 BGM,이펙트 2026-07-10 17:27:11 +09:00
dldydtn9755-crypto
342a787843 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-10 16:33:29 +09:00
dldydtn9755-crypto
b92a929cf7 학생회실 2026-07-10 16:33:25 +09:00
bda7752fb3 2026-07-10 노예계약서 서명 기능 2026-07-10 15:45:32 +09:00
a368a27465 윤지후 추가 2026-07-10 12:33:14 +09:00
51056f0994 2026-07-10 다이얼로그 시스템 대대적 수정 2026-07-10 12:17:10 +09:00
10da112692 2026-07-09 노예계약 진행중 2026-07-09 19:56:42 +09:00
a9508682aa Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 19:37:44 +09:00
9a592d47c6 2026-07-09 구준표루스 타임라인 2026-07-09 19:37:41 +09:00
dldydtn9755-crypto
f2d3a29956 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 19:22:49 +09:00
9747fa114f 2026-07-09 이동 애니메이션 추가 2026-07-09 17:34:59 +09:00
c535c0aa3d 2026-07-09 문 프리팹화 2026-07-09 16:56:29 +09:00
dldydtn9755-crypto
25698a8906 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 15:28:37 +09:00