Commit Graph

13 Commits

Author SHA1 Message Date
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
01fa5e9e92 축제 구준표루스 고백 2026-07-22 20:39:18 +09:00
15eeb9d469 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-22 10:15:03 +09:00
60f9a992ae 반영안함 2026-07-22 10:14:55 +09:00
0703f5fae0 라이팅 임시저장 2026-07-21 21:22:12 +09:00
1aacaa854c 쉐이더 2026-07-21 15:52:20 +09:00
9284a63aac 페스티벌씬 에셋오류 수정 2026-07-21 13:05:05 +09:00
dldydtn9755-crypto
94287ee19d 벽쿵 완성본 2026-07-20 18:13:49 +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
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
736edbce0f 이제는웃는거야스마일어게인 2026-07-16 12:12:03 +09:00