11 Commits

Author SHA1 Message Date
HaeinLEE
b482e40e3a [Feat] 씬전환 로딩 패널 구현 2025-05-12 17:12:58 +09:00
HaeinLEE
f0e7096ca4 [Remove] 필요없는 파일 삭제 2025-05-07 17:03:43 +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
9d46d0e61f Merge pull request 'DEG-100-원거리-마법사-보스-몬스터-개발-단계-2' (!8) from DEG-100-원거리-마법사-보스-몬스터-개발-단계-2 into main
Reviewed-on: #8
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-01 06:43:11 +00:00
13588aa693 [feat] 슬로우 디버프 마법 생성
- 몬스터 에셋 적용
- 슬로우 마법 기능 추가

Work in JIRA ISSUE DEG-100
2025-05-01 15:03:23 +09:00
HaeinLEE
8edeab89c4 [Feat] 일상생활 튜토리얼 구현중 2025-04-30 13:52:58 +09:00
Jay
add7c67317 Merge branch 'main' of https://gitea.ysizuku.com/Degulleo/Degulleo3D into DEG-55-플레이어-피격-구현 2025-04-29 16:18:34 +09:00
Jay
e39b91600e DEG-55 [FEAT] 플레이어 피격 이펙트 구현 2025-04-29 16:17:50 +09:00
HaeinLEE
cdded898ec [Feat] 기존 커밋 복구 2025-04-28 17:44:00 +09:00
Sehyeon
bd44a7cdc5 DEG-15 기본 클래스 생성 2025-04-16 17:19:58 +09:00
99jamin
af8790f026 인테리어 추가
Interior 폴더에 정리
2025-04-16 11:42:07 +09:00