Commit Graph

53 Commits

Author SHA1 Message Date
dldydtn9755-crypto
d02166e83e 0727 2026-07-27 21:23:06 +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
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
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
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
dldydtn9755-crypto
3274990163 dd 2026-07-23 15:07:03 +09:00
c3a8d1ce2e 대화 시작시 기본회전 막기 옵션 추가 2026-07-23 15:06:05 +09:00
de5fe5b85a 히든제스처 2026-07-23 13:08:43 +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
dldydtn9755-crypto
df5839f78d 다이얼로그 완성 2026-07-21 16:57:02 +09:00
dldydtn9755-crypto
4491741ce2 dd 2026-07-21 13:10:04 +09:00
f1d468d0ef 챕터2 나머지 완료 2026-07-20 19:37:27 +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
0a319f5906 2챕터 윤지후 루트 및 버그 수정 2026-07-17 15:56:18 +09:00
512c55c63b 2챕터 윤지후져 루트 2026-07-17 14:35:36 +09:00
c2216b0756 챕터2 구준표루스 루트 2026-07-15 17:58:28 +09:00
3c0e0ff75d 학생들 대화 설정 2026-07-15 17:09:21 +09:00
74d4bf2519 2챕터 진행중 2026-07-15 12:57:39 +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
0e0e12a768 2026-07-14 씬체인지 2026-07-14 11:51:45 +09:00
e82538447d 2026-07-13 챕터2씬추가 및 대사 구성 2026-07-13 10:32:43 +09:00
961611705a 2026-07-10 비동기 씬전환 2026-07-10 21:46:10 +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
173f3823b6 2026-07-10 대화 끼어들기 구현 2026-07-10 12:55:02 +09:00
51056f0994 2026-07-10 다이얼로그 시스템 대대적 수정 2026-07-10 12:17:10 +09:00
9a592d47c6 2026-07-09 구준표루스 타임라인 2026-07-09 19:37:41 +09:00
dcd15573bb 2026-07-09 예시 2026-07-09 15:27:34 +09:00
1036e2fbc7 2026-07-09 꼬리밟고 대화 2026-07-09 12:28:11 +09:00
27a0dfcd44 2026-07-08 이벤트존 추가 2026-07-08 18:15:44 +09:00
74b6342070 2026-07-08 유나 프로토타입버전 추가 2026-07-08 16:57:32 +09:00