Commit Graph

58 Commits

Author SHA1 Message Date
ea0324ceb1 2026-07-10 학생회실 적용 2026-07-10 17:45:03 +09:00
7daed9c5af Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-10 17:27:15 +09:00
932aad8c56 2026-07-10 대화 BGM,이펙트 2026-07-10 17:27:11 +09:00
dldydtn9755-crypto
342a787843 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-10 16:33:29 +09:00
dldydtn9755-crypto
b92a929cf7 학생회실 2026-07-10 16:33:25 +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
a368a27465 윤지후 추가 2026-07-10 12:33:14 +09:00
51056f0994 2026-07-10 다이얼로그 시스템 대대적 수정 2026-07-10 12:17:10 +09:00
5edc62d6c4 경고 수정 2026-07-09 19:57:42 +09:00
10da112692 2026-07-09 노예계약 진행중 2026-07-09 19:56:42 +09:00
a9508682aa Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 19:37:44 +09:00
9a592d47c6 2026-07-09 구준표루스 타임라인 2026-07-09 19:37:41 +09:00
dldydtn9755-crypto
295a9e9740 챕터3 씬만 만들었는데 공룡 움직임 재현 안됨 2026-07-09 19:29:51 +09:00
dldydtn9755-crypto
f2d3a29956 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 19:22:49 +09:00
7bcf7dda98 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 17:36:01 +09:00
5b08398def 인트로 2026-07-09 17:35:07 +09:00
9747fa114f 2026-07-09 이동 애니메이션 추가 2026-07-09 17:34:59 +09:00
c535c0aa3d 2026-07-09 문 프리팹화 2026-07-09 16:56:29 +09:00
7441d4242e 문고리 열기 2026-07-09 16:23:36 +09:00
dldydtn9755-crypto
25698a8906 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 15:28:37 +09:00
ef50055194 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-09 15:27:39 +09:00
dcd15573bb 2026-07-09 예시 2026-07-09 15:27:34 +09:00
dldydtn9755-crypto
b84b70cc05 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXR Package Settings.asset
2026-07-09 15:03:04 +09:00
dldydtn9755-crypto
de0fa61a62 cxc 2026-07-09 15:01:49 +09:00
19a3332912 bgm 2026-07-09 13:03:04 +09:00
1036e2fbc7 2026-07-09 꼬리밟고 대화 2026-07-09 12:28:11 +09:00
c21436705e 2026-07-09 꼬리밟는씬 제작중 2026-07-09 11:35:29 +09:00
dldydtn9755-crypto
fb51c2e2a3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation 2026-07-08 19:03:28 +09:00
dldydtn9755-crypto
6e4ff9fcb4 컴퓨터 ui 완성 2026-07-08 19:03:07 +09:00
27a0dfcd44 2026-07-08 이벤트존 추가 2026-07-08 18:15:44 +09:00
f00da071ff 유나 수정 2026-07-08 17:33:40 +09:00
1c96bff7a2 유나변경 2026-07-08 17:17:58 +09:00
74b6342070 2026-07-08 유나 프로토타입버전 추가 2026-07-08 16:57:32 +09:00
511fb9cccb 2026-07-08 대화 UI 2026-07-08 14:48:40 +09:00
8573e2a9e0 기본폰트 변경하기 2026-07-08 10:08:53 +09:00
dldydtn9755-crypto
fb64493648 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
#	Assets/XR/Settings/OpenXRPackageSettings.asset
2026-07-07 18:12:25 +09:00
dldydtn9755-crypto
f385c661da ui 2026-07-07 18:11:41 +09:00
0b3263e353 2026-07-07 여러대화중 선택할수 있게 변경 2026-07-07 17:40:16 +09:00
62793123a4 오류수정? 2026-07-07 17:09:00 +09:00
d9e0b56dfb 오류 수정 2026-07-07 16:03:14 +09:00
30bb030229 대화로직 수정중 2026-07-07 15:52:25 +09:00
62bd779312 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/XR/Settings/OpenXRPackageSettings.asset
2026-07-07 15:45:06 +09:00
40185a40d2 다이얼로그 시스템 수정중 2026-07-07 15:44:24 +09:00
dldydtn9755-crypto
b372c1d91e test2 2026-07-07 15:32:32 +09:00
86a0f2c8eb 한글 깨지는거 수정 2026-07-07 14:28:54 +09:00
acc55b09d3 Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts:
#	Assets/01_Scenes/_TestScenes/Test1.unity
#	Assets/XR/Settings/OpenXRPackageSettings.asset
2026-07-07 14:20:49 +09:00
85dae3d159 2026-07-07 폰트추가,대화 테스트 2026-07-07 14:20:00 +09:00
dldydtn9755-crypto
3669dc0a17 저장 로드 2026-07-07 11:08:12 +09:00
d88f8770cd 2026-07-06 테스트 씬 제작중 2026-07-06 14:17:12 +09:00