DEG-77-튜토리얼-구현 #14

Merged
heain0122 merged 9 commits from DEG-77-튜토리얼-구현 into main 2025-05-07 08:06:40 +00:00

9 Commits

Author SHA1 Message Date
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
HaeinLEE
5d17b2ba60 main pull 2025-05-07 13:47:30 +09:00
HaeinLEE
66c7ce7972 [Remove] 테스트용 파일 삭제 2025-05-07 09:31:09 +09:00
HaeinLEE
c2250c28bf [Feat] 드래그 애니메이션 추가 2025-05-06 03:09:43 +09:00
HaeinLEE
a40902a5de [Feat] 튜토리얼 애니메이션 생성 2025-05-05 21:40:47 +09:00
HaeinLEE
f991e82fa9 [Style] 폴더 정리 2025-05-02 18:42:05 +09:00
HaeinLEE
39a726b172 [Feat] 일상생활 튜토리얼 아주 일부 2025-04-30 23:17:07 +09:00
HaeinLEE
8edeab89c4 [Feat] 일상생활 튜토리얼 구현중 2025-04-30 13:52:58 +09:00