Commit Graph

80 Commits

Author SHA1 Message Date
e34c3a1f45 축제 잔디 사망루트 2026-07-23 17:16:30 +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
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
01fa5e9e92 축제 구준표루스 고백 2026-07-22 20:39:18 +09:00
47ca63e5d3 불꽃놀이 2026-07-22 19:26:44 +09:00
6347d94b35 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-22 14:02:32 +09:00
efed53af18 임시 베이킹 2026-07-22 13:09:07 +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
57d6cdfd80 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-20 18:14:48 +09:00
dldydtn9755-crypto
94287ee19d 벽쿵 완성본 2026-07-20 18:13:49 +09:00
50be43de93 챕터2 유나루트 완료 2026-07-20 18:12:43 +09:00
dldydtn9755-crypto
a4e92d57fb Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-20 12:46:28 +09:00
9e4a5ac143 파티클 수정 2026-07-20 12:25:42 +09:00
d835ddb21e 유나 드래곤폼 추가중 2026-07-17 18:09:45 +09:00
0a319f5906 2챕터 윤지후 루트 및 버그 수정 2026-07-17 15:56:18 +09:00
dldydtn9755-crypto
a9f5df1430 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-17 14:22:44 +09:00
fc06825972 물품들 상호작용 달기 2026-07-17 12:45:12 +09:00
ecfd2d7f47 UI 깊이 버퍼 변경 2026-07-17 11:48:57 +09:00
ef66cd22e7 행사용품들 에셋 2026-07-17 10:53:44 +09:00
69f3b0a6d3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 18:08:03 +09:00
1bf813a8dd 창고 꾸미는중 2026-07-16 18:07:15 +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
dldydtn9755-crypto
8e4b825957 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 17:57:32 +09:00
dldydtn9755-crypto
f1948452b6 131 2026-07-16 17:50:41 +09:00
dldydtn9755-crypto
7d8e1a62dc Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-16 16:37:00 +09:00
dldydtn9755-crypto
b67d6e5f56 도서관 현재 2026-07-16 16:35:13 +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
454adce428 챕터 1,2 라이팅맵 2026-07-16 16:30:58 +09:00
7aa008cd1a Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-16 12:15:39 +09:00
736edbce0f 이제는웃는거야스마일어게인 2026-07-16 12:12:03 +09:00
3c0e0ff75d 학생들 대화 설정 2026-07-15 17:09:21 +09:00
afc011bcd6 학생들 에셋 추가 2026-07-15 16:06:46 +09:00
18160cc301 D4폴더수정 2026-07-15 14:59:59 +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
ae958ac18f 프리팹수정 2026-07-14 12:47:48 +09:00
0e0e12a768 2026-07-14 씬체인지 2026-07-14 11:51:45 +09:00
de3e910d70 버그 수정 2026-07-13 13:16:28 +09:00
961611705a 2026-07-10 비동기 씬전환 2026-07-10 21:46:10 +09:00
7daed9c5af Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-10 17:27:15 +09:00