Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

업데
dd
2026-08-03 09:29:26 +09:00 · 2026-08-03 09:25:47 +09:00 · 2026-07-31 09:33:09 +09:00 · 2026-07-29 17:43:38 +09:00 · 2026-07-29 17:42:55 +09:00 · 2026-07-29 14:39:06 +09:00
277 changed files with 17713 additions and 1608 deletions
--- a/Assets/01_Scenes/Festival_Chapter5.unity
+++ b/Assets/01_Scenes/Festival_Chapter5.unity
--- a/Assets/01_Scenes/Hischool_Chapter1.unity
+++ b/Assets/01_Scenes/Hischool_Chapter1.unity
--- a/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset
+++ b/Assets/01_Scenes/Hischool_Chapter1/LightingData.asset
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-0_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-1_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-2_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-3_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-4_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-5_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-6_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-7_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png
+++ b/Assets/01_Scenes/Hischool_Chapter1/Lightmap-8_comp_shadowmask.png
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-0.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-1.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-10.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-11.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-12.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-13.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-14.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-15.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-16.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-17.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-18.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-19.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-2.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-20.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-21.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-22.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-23.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-24.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-25.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-26.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-3.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-4.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-5.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-6.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-7.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-8.exr
--- a/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr
+++ b/Assets/01_Scenes/Hischool_Chapter1/ReflectionProbe-9.exr
--- a/Assets/01_Scenes/Hischool_Chapter2.unity
+++ b/Assets/01_Scenes/Hischool_Chapter2.unity
--- a/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset
+++ b/Assets/01_Scenes/Hischool_Chapter2/LightingData.asset
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-0_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-1_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-2_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-3_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-4_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-5_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-6_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-7_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_dir.png
--- a/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/Lightmap-8_comp_light.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-0.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-0.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-1.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-1.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-10.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-10.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-11.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-11.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-12.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-12.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-13.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-13.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-14.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-14.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-15.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-15.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-16.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-16.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-17.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-17.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-18.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-18.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-19.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-19.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-2.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-2.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-20.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-20.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-21.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-21.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-22.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-22.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-23.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-23.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-24.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-24.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-25.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-25.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-26.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-26.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-3.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-3.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-4.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-4.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-5.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-5.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-6.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-6.exr
--- a/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-7.exr
+++ b/Assets/01_Scenes/Hischool_Chapter2/ReflectionProbe-7.exr
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rainylinjing-reboot	2a95ab5a25	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-08-03 09:29:26 +09:00
rainylinjing-reboot	4b31c58854	업데	2026-08-03 09:25:47 +09:00
dldydtn9755-crypto	ac1cbc4ee4	dd	2026-07-31 09:33:09 +09:00
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
rainylinjing-reboot	f58e912846	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-07-29 14:39:06 +09:00
rainylinjing-reboot	c5af07a951	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-07-29 14:39:00 +09:00
nakjun	fb1a927342	젖은 기획서	2026-07-29 12:41:20 +09:00
nakjun	ca04eb1c0b	보이스,BGM 볼륨 믹서 (사이드체인, 컴프레서, 파라미터EQ)	2026-07-29 11:35:37 +09:00
rainylinjing-reboot	5baee0bcf3	수정안했음	2026-07-29 09:42:51 +09:00
nakjun	070ff444ab	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-07-28 21:25:20 +09:00
nakjun	5dbc9b0a06	브금 추가.	2026-07-28 21:25:17 +09:00
dldydtn9755-crypto	be832dc9fc	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation # Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset	2026-07-28 21:22:22 +09:00
dldydtn9755-crypto	d970835039	0728	2026-07-28 21:21:29 +09:00
nakjun	15da7b570a	녹화카메라 최적의 각도	2026-07-28 20:51:54 +09:00
nakjun	5d3d193fc9	레코드 카메라	2026-07-28 18:38:16 +09:00
nakjun	a7588e9f24	레코드 카메라 설정	2026-07-28 18:37:43 +09:00
nakjun	f7e130fd2c	ui 안보이는 현상	2026-07-28 17:53:11 +09:00
nakjun	995d36cae8	ui들 수정	2026-07-28 17:12:27 +09:00
nakjun	982566db7b	진행도에 따라 다른 챕터 가기	2026-07-28 15:51:59 +09:00
nakjun	6b25854fe9	모니터 안보이는거 수정	2026-07-28 15:48:38 +09:00
nakjun	a730cbdb29	레코더 포함	2026-07-28 14:35:27 +09:00
nakjun	507e940079	Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation	2026-07-28 14:12:54 +09:00
nakjun	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
nakjun	506d9cdb8e	스카이박스 오류 수정	2026-07-28 11:42:21 +09:00
nakjun	fab2663cc6	호감도 진행도 배분 (챕터1,2,5)	2026-07-28 10:22:05 +09:00
nakjun	efb2cc45a5	라이팅 베이킹 1,2	2026-07-28 10:03:30 +09:00
nakjun	b7bef052e0	은잔디 명예소방관	2026-07-27 21:25:20 +09:00
dldydtn9755-crypto	d02166e83e	0727	2026-07-27 21:23:06 +09:00
nakjun	be268a1deb	딜레이 수정	2026-07-27 20:58:13 +09:00
nakjun	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