21 Commits

Author SHA1 Message Date
HaeinLEE
b0309939c6 [feat] 로딩패널 애니메이션 추가 완료 2025-05-13 17:01:04 +09:00
Lim0_C
bf17dfd164 DEG-158 [Fix] 컷씬 애니메이션 기움 현상 고침 2025-05-13 15:03:31 +09:00
Sehyeon
f666ea85ac git conflict resolve 2025-05-13 09:30:56 +09:00
55993df843 Merge pull request 'DEG-144-체력0탈진-연출-추가이전에 로딩패널 구현' (!39) from DEG-144-체력0탈진-연출-추가 into main
Reviewed-on: #39
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
2025-05-12 14:56:55 +00:00
HaeinLEE
b2d0c3b0bb [Remove] 필요없는 변수 삭제 2025-05-12 21:52:19 +09:00
HaeinLEE
e2cf947531 [Style] 테스트용 주석 추가 2025-05-12 17:19:44 +09:00
HaeinLEE
b482e40e3a [Feat] 씬전환 로딩 패널 구현 2025-05-12 17:12:58 +09:00
aac6fb33bc [fix] 세탁기 UI 이미지 찌그러지는 문제 해결
- 애니메이션 클립에서 사이즈 조절

Work in JIRA ISSUE DEG-145
2025-05-12 16:50:12 +09:00
Sehyeon
5041233ba7 DEG-137 [Feat] 말풍선 최종 2025-05-12 16:34:27 +09:00
Sehyeon
e01987c1d8 DEG-137 [Feat] 출근 수정 2025-05-12 14:49:57 +09:00
HaeinLEE
cd6f53e580 [Fix] 돌발이벤트 씬 저장항목 누락 2025-05-12 13:44:00 +09:00
HaeinLEE
c17ec2c0a9 [Feat] 돌발 이벤트 사운드 추가 그리고 리팩토링 2025-05-10 02:40:09 +09:00
HaeinLEE
4ae48da950 [Feat] 돌발 이벤트 컷씬 추가 2025-05-10 01:44:58 +09:00
Sehyeon
e58e0df8e9 git conflict reslove 2025-05-09 11:42:05 +09:00
Sehyeon
f0d7d621e0 DEG-68 [Feat] 오디오 추가 2025-05-08 17:48:30 +09:00
HaeinLEE
5daf8c4577 Merge branch 'main' into DEG-77-튜토리얼-구현
# Conflicts:
#	Assets/LIN/Scripts/DailyRoutine/InteractionController.cs
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Cartoon_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Foley & Impact_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/GUN_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Magic_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Open & Close_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Sci-Fi_SpaceShip_Signal_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Whoosh_Cinematic_Preview.mp3
#	Assets/StoreAssets/RPG Tiny Hero Duo/Prefab/MaleCharacterPBR.prefab
#	Assets/UnityTechnologies/Basic Asset Pack Interior/Materials/Grey.mat
2025-05-07 13:59:43 +09:00
HaeinLEE
a40902a5de [Feat] 튜토리얼 애니메이션 생성 2025-05-05 21:40:47 +09:00
Sehyeon
e198af6c19 DEG-124 [Feat] npc 상호작용 추가 2025-05-02 10:32:09 +09:00
Sehyeon
837d4eacc9 DEG-124 [Feat] prop 변경 2025-05-01 17:54:55 +09:00
HaeinLEE
c262b9e2f7 [Feat] 컷씬 자동 꺼짐 기능 2025-04-28 21:24:43 +09:00
HaeinLEE
cdded898ec [Feat] 기존 커밋 복구 2025-04-28 17:44:00 +09:00