Commit Graph

74 Commits

Author SHA1 Message Date
dldydtn9755-crypto
b1f2618ef5 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-29 17:43:38 +09:00
dldydtn9755-crypto
4feab8d265 드디어 완성 2026-07-29 17:42:55 +09:00
070ff444ab Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-28 21:25:20 +09:00
5dbc9b0a06 브금 추가. 2026-07-28 21:25:17 +09:00
dldydtn9755-crypto
d970835039 0728 2026-07-28 21:21:29 +09:00
dldydtn9755-crypto
23bc3ef3f3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-28 14:11:46 +09:00
dldydtn9755-crypto
dd4f318a9c 컴퓨터 설정까지 2026-07-28 14:08:45 +09:00
dldydtn9755-crypto
d02166e83e 0727 2026-07-27 21:23:06 +09:00
2e6729bf86 유나 표정,제스쳐 추가 2026-07-27 20:52:18 +09:00
75e0b5309d 라이팅 수정 2026-07-27 18:25:13 +09:00
dd5afa08d2 마지막씬 보이스클립 2026-07-27 17:16:32 +09:00
c191bea41d 대화중 표정 수정 2026-07-27 14:38:25 +09:00
c2a10b4bf3 유나 엔딩 2026-07-24 13:21:49 +09:00
ad15f47c75 멸망엔딩 2026-07-24 12:08:24 +09:00
ffa6320e4d 축제 윤지후져루트 2026-07-23 17:56:58 +09:00
e34c3a1f45 축제 잔디 사망루트 2026-07-23 17:16:30 +09:00
f83646b613 고정각도 회전 2026-07-23 15:41:47 +09:00
c3a8d1ce2e 대화 시작시 기본회전 막기 옵션 추가 2026-07-23 15:06:05 +09:00
de5fe5b85a 히든제스처 2026-07-23 13:08:43 +09:00
e1c43c9b3d 히든분기 2026-07-23 10:50:22 +09:00
dldydtn9755-crypto
4a048adf73 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:ff
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-27.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr.meta
#	Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-22 21:27:27 +09:00
dldydtn9755-crypto
96dcd6e361 다이얼로그 일단 다 넣고 다 넣긴함 오류 수정 해아함 2026-07-22 21:19:13 +09:00
47ca63e5d3 불꽃놀이 2026-07-22 19:26:44 +09:00
50be43de93 챕터2 유나루트 완료 2026-07-20 18:12:43 +09:00
d835ddb21e 유나 드래곤폼 추가중 2026-07-17 18:09:45 +09:00
512c55c63b 2챕터 윤지후져 루트 2026-07-17 14:35:36 +09:00
fc06825972 물품들 상호작용 달기 2026-07-17 12:45:12 +09:00
ad6ccadc8e 대화중에 아웃라인 안뜨게 2026-07-17 11:57:19 +09:00
8f3cacb39c 베타적 대화구조 2026-07-15 17:17:21 +09:00
e98b6f610d 대화시스템 수정 2026-07-15 14:07:25 +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
5995681310 처음부분 추가 2026-07-14 17:40:16 +09:00
e0be196bbb 집씬으로 넘기기 2026-07-14 16:34:20 +09:00
0df40f9065 버그 수정 2026-07-14 12:15:48 +09:00
0e0e12a768 2026-07-14 씬체인지 2026-07-14 11:51:45 +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
c30a74c9c3 타이틀 타이밍 2026-07-13 11:25:44 +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
932aad8c56 2026-07-10 대화 BGM,이펙트 2026-07-10 17:27:11 +09:00
bda7752fb3 2026-07-10 노예계약서 서명 기능 2026-07-10 15:45:32 +09:00