Commit Graph

109 Commits

Author SHA1 Message Date
c74b723fdc 김치 2026-07-23 14:53:51 +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
9da9759f53 NPC 대화가림 레이어 추가 2026-07-15 17:30:12 +09:00
dd96e9cc5a 챕터2 초기위치 설정 및 챕터1잔재 삭제 2026-07-15 17:20:42 +09:00
8f3cacb39c 베타적 대화구조 2026-07-15 17:17:21 +09:00
3c0e0ff75d 학생들 대화 설정 2026-07-15 17:09:21 +09:00
afc011bcd6 학생들 에셋 추가 2026-07-15 16:06:46 +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
dldydtn9755-crypto
59ca4db765 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-15 13:20:48 +09:00
dldydtn9755-crypto
ad4d183552 . 2026-07-15 13:20:42 +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
1b74e347bf 진행도에 따른 다음챕터 넘기기 2026-07-14 18:10:13 +09:00
2f95fc0667 메모추가 2026-07-14 17:49:03 +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
ae958ac18f 프리팹수정 2026-07-14 12:47:48 +09:00
b6a48895a8 오류 수정 2026-07-14 12:46:25 +09:00
0df40f9065 버그 수정 2026-07-14 12:15:48 +09:00
0e0e12a768 2026-07-14 씬체인지 2026-07-14 11:51:45 +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
1aa0df2e5a Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-13 12:11:28 +09:00
ac52151604 스카이박스 텍스처 추가 2026-07-13 12:11:15 +09:00
e1bb3bf779 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-13 11:26:40 +09:00
c30a74c9c3 타이틀 타이밍 2026-07-13 11:25:44 +09:00
1db505c940 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-13 10:32:47 +09:00
e82538447d 2026-07-13 챕터2씬추가 및 대사 구성 2026-07-13 10:32:43 +09:00
33f2c13223 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-13 09:42:23 +09:00
410fc4a76d 카메라높이 2026-07-13 09:38:04 +09:00
f20e17e353 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-10 21:49:05 +09:00
961611705a 2026-07-10 비동기 씬전환 2026-07-10 21:46:10 +09:00
dldydtn9755-crypto
e927f24ad8 책장 첫줄 자동 2026-07-10 21:33:59 +09:00
dldydtn9755-crypto
9073825501 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-10 17:48:38 +09:00
dldydtn9755-crypto
a5480cb8b1 챕터5 2026-07-10 17:47:51 +09:00
ea0324ceb1 2026-07-10 학생회실 적용 2026-07-10 17:45:03 +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