Commit Graph

199 Commits

Author SHA1 Message Date
6b25854fe9 모니터 안보이는거 수정 2026-07-28 15:48:38 +09:00
a730cbdb29 레코더 포함 2026-07-28 14:35:27 +09:00
507e940079 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-28 14:12:54 +09:00
1b603fdbc0 빌드프로파일 설정 2026-07-28 14:12:06 +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
506d9cdb8e 스카이박스 오류 수정 2026-07-28 11:42:21 +09:00
fab2663cc6 호감도 진행도 배분 (챕터1,2,5) 2026-07-28 10:22:05 +09:00
efb2cc45a5 라이팅 베이킹 1,2 2026-07-28 10:03:30 +09:00
b7bef052e0 은잔디 명예소방관 2026-07-27 21:25:20 +09:00
dldydtn9755-crypto
d02166e83e 0727 2026-07-27 21:23:06 +09:00
be268a1deb 딜레이 수정 2026-07-27 20:58:13 +09:00
2e6729bf86 유나 표정,제스쳐 추가 2026-07-27 20:52:18 +09:00
dldydtn9755-crypto
87f5eb6ed5 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/ReflectionProbe-0.exr.meta
#	Assets/01_Scenes/Hischool_Chapter4/Festival_Test Baking Set.asset.meta
2026-07-27 20:09:59 +09:00
dldydtn9755-crypto
5235999588 중간 2026-07-27 20:08:20 +09:00
3558b85ce3 라이팅 수정 2026-07-27 18:26:57 +09:00
75e0b5309d 라이팅 수정 2026-07-27 18:25:13 +09:00
dd5afa08d2 마지막씬 보이스클립 2026-07-27 17:16:32 +09:00
926a33a88c 제스처 수정 2026-07-27 14:49:03 +09:00
c191bea41d 대화중 표정 수정 2026-07-27 14:38:25 +09:00
dldydtn9755-crypto
45b5d46019 세팅은 완 2026-07-24 21:10:38 +09:00
dldydtn9755-crypto
310c186407 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-24 14:40:50 +09:00
52a0f6ea39 챕터1,2 다시 베이킹 2026-07-24 14:27:46 +09:00
fd2f4d051b 진행도 정리 2026-07-24 14:15:38 +09:00
c2a10b4bf3 유나 엔딩 2026-07-24 13:21:49 +09:00
ad15f47c75 멸망엔딩 2026-07-24 12:08:24 +09:00
dldydtn9755-crypto
dba67d5874 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 17:58:13 +09:00
dldydtn9755-crypto
be755323fc 현재 2026-07-23 17:58:02 +09:00
ffa6320e4d 축제 윤지후져루트 2026-07-23 17:56:58 +09:00
e34c3a1f45 축제 잔디 사망루트 2026-07-23 17:16:30 +09:00
dldydtn9755-crypto
3618615ea8 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 15:42:38 +09:00
f83646b613 고정각도 회전 2026-07-23 15:41:47 +09:00
dldydtn9755-crypto
993e5f7960 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 15:17:51 +09:00
dldydtn9755-crypto
b14e94e4bc Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/04_Models/Festival/Canopy/swing-sofa/shaded 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_diffuse 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_metallic 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_normal 1.png.meta
#	Assets/04_Models/Festival/Canopy/swing-sofa/texture_roughness 1.png.meta
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-23 15:13:40 +09:00
74d72f675a Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 15:10:16 +09:00
dldydtn9755-crypto
3274990163 dd 2026-07-23 15:07:03 +09:00
c3a8d1ce2e 대화 시작시 기본회전 막기 옵션 추가 2026-07-23 15:06:05 +09:00
568b035282 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-23 14:54:14 +09:00
c74b723fdc 김치 2026-07-23 14:53:51 +09:00
de5fe5b85a 히든제스처 2026-07-23 13:08:43 +09:00
e1c43c9b3d 히든분기 2026-07-23 10:50:22 +09:00
3db450e78d 챕터1,2 라이팅 다시 구움 2026-07-23 10:21:48 +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
088d2088e7 축제 수정 2026-07-22 21:10:52 +09:00
01fa5e9e92 축제 구준표루스 고백 2026-07-22 20:39:18 +09:00
791da2be7f Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-22 19:27:28 +09:00
47ca63e5d3 불꽃놀이 2026-07-22 19:26:44 +09:00
ffb023da52 인트로수정 2026-07-22 18:02:45 +09:00
6347d94b35 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-22 14:02:32 +09:00