Fiore
|
f80e4e2016
|
[HOTFIX] 병합 과정에서 누락된 데이터 복원
Work in JIRA ISSUE DEG-100
|
2025-05-08 16:21:18 +09:00 |
|
|
|
6321606597
|
Merge pull request 'DEG-112-던전맵-제작' (!17) from DEG-112-던전맵-제작 into main
Reviewed-on: #17
Reviewed-by: heain0122 <heain0122@gmail.com>
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
|
2025-05-08 06:48:27 +00:00 |
|
|
|
91383841fa
|
Merge branch 'main' into DEG-112-던전맵-제작
|
2025-05-08 04:21:55 +00:00 |
|
Parkillhwan
|
4b5a3a25a4
|
DEG-112-던전맵-제작
|
2025-05-07 23:59:31 +09:00 |
|
|
|
d5df426b8f
|
Merge pull request 'DEG-100 원거리 마법사 보스 개발' (!16) from DEG-100-원거리-마법사-보스-몬스터-개발-단계-3 into main
Reviewed-on: #16
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
|
2025-05-07 08:07:18 +00:00 |
|
|
|
885e637119
|
Merge pull request 'DEG-77-튜토리얼-구현' (!14) from DEG-77-튜토리얼-구현 into main
Reviewed-on: #14
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
|
2025-05-07 08:06:38 +00:00 |
|
HaeinLEE
|
f0e7096ca4
|
[Remove] 필요없는 파일 삭제
|
2025-05-07 17:03:43 +09:00 |
|
Fiore
|
2b0502775c
|
[refact] 변수 정리 및 가독성 정리
- 안쓰는 유징문 제거
- 넉백과 슬로우 이펙트 프리팹 분리
- 데미지 이펙트 캐싱처리
- 패턴 실행 유틸리티 합침
Work in JIRA ISSUE DEG-100
|
2025-05-07 15:41:14 +09:00 |
|
|
|
3151e17899
|
Merge pull request 'DEG-126-상호작용-로딩ui-애니메이션-작업' (!15) from DEG-126-상호작용-로딩ui-애니메이션-작업 into main
Reviewed-on: #15
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: heain0122 <heain0122@gmail.com>
|
2025-05-07 06:23:06 +00:00 |
|
Fiore
|
64bccf2a3b
|
불필요한 공백 제거
Work in JIRA ISSUE DEG-100
|
2025-05-07 14:59:37 +09:00 |
|
Lim0_C
|
d73dbd3a64
|
DEG-126 [fix] Housework용어 수정
|
2025-05-07 14:57:44 +09:00 |
|
Lim0_C
|
32529f84f6
|
Merge branch 'main' into DEG-126-상호작용-로딩ui-애니메이션-작업
|
2025-05-07 14:49:01 +09:00 |
|
Lim0_C
|
ce25bcb2ff
|
DEG-126 [Feat] 침대 상호작용 컷신 추가
|
2025-05-07 14:48:18 +09:00 |
|
Fiore
|
b9a014df88
|
[refact] 도망 로직 개선, 코루틴 최적화
- 몬스터가 텔레포트로 도망칠 위치를 에디터에서 수정할 수 있도록 개선
- 플레이어와 거리 계산 최적화
- 코루틴에서 사용하는 WaitForSecond 객체 캐싱 유틸 추가
Work in JIRA ISSUE #DEG-100
|
2025-05-07 14:27:29 +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 |
|
|
|
cbfd6ea865
|
Merge pull request 'DEG-25-강화-기초-로직-구현' (!10) from DEG-25-강화-기초-로직-구현 into main
Reviewed-on: #10
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
|
2025-05-07 04:38:26 +00:00 |
|
|
|
26b0de9ab6
|
Merge pull request 'DEG-125 [FEAT] 플레이어 공격, 피격 애니메이션 및 상태 구현' (!12) from DEG-125-플레이어-유료-에셋-적용 into main
Reviewed-on: #12
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
|
2025-05-07 04:32:57 +00:00 |
|
|
|
8799af7966
|
Merge pull request 'DEG-124-실내-맵-재제작' (!11) from DEG-124-실내-맵-재제작 into main
Reviewed-on: #11
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
|
2025-05-07 04:31:45 +00:00 |
|
Jay
|
ef74894971
|
DEG-125 [FEAT] 플레이어 태그 수정
|
2025-05-07 13:20: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 |
|
Jay
|
12790941d7
|
Merge branch 'main' of https://gitea.ysizuku.com/Degulleo/Degulleo3D into DEG-125-플레이어-유료-에셋-적용
|
2025-05-02 19:17:16 +09:00 |
|
Jay
|
6f8dd0863f
|
DEG-125 [FEAT] 플레이어 공격, 피격 애니메이션 및 상태 구현
|
2025-05-02 19:16:48 +09:00 |
|
HaeinLEE
|
f991e82fa9
|
[Style] 폴더 정리
|
2025-05-02 18:42:05 +09:00 |
|
Lim0_C
|
2fefd93081
|
Merge branch 'main' into DEG-126-상호작용-로딩ui-애니메이션-작업
|
2025-05-02 17:43:57 +09:00 |
|
Lim0_C
|
699f2c8e79
|
DEG-126 [Feat] 상호작용 로딩 애니메이션 추가
출근, 던전, 식사 로딩 애니메이션
|
2025-05-02 17:31:58 +09:00 |
|
Sehyeon
|
5a9482fdbc
|
DEG-124 [Fix] 버그 수정
|
2025-05-02 17:23:54 +09:00 |
|
|
|
cbc6817075
|
[refact] 디버프 종류 ENUM으로 정리
Work in JIRA ISSUE DEG-100
|
2025-05-02 15:18:50 +09:00 |
|
99jamin
|
36d0b5a3f0
|
DEG - 25 [FIX] 폰트 오류 수정
|
2025-05-02 14:45:28 +09:00 |
|
99jamin
|
533f6c23f0
|
Merge branch 'main' into DEG-25-강화-기초-로직-구현
|
2025-05-02 14:35:56 +09:00 |
|
99jamin
|
9419f9f9b9
|
DEG-25 [Feat] 강화 세이브 연동 테스트 구현
|
2025-05-02 14:34:10 +09:00 |
|
Sehyeon
|
d4de4f320d
|
Merge branch 'main' into DEG-124-실내-맵-재제작
|
2025-05-02 14:22:52 +09:00 |
|
Sehyeon
|
c3a7814c94
|
DEG-124 [Feat] 씬 이동 구현
|
2025-05-02 14:20:31 +09:00 |
|
|
|
32b3cb918a
|
[Feat] 넉백 기능 구현
- 플레이어가 PlayerController를 사용한다고 가정하고 넉백 구현
Work in JIRA ISSUE DEG-100
|
2025-05-02 11:51:24 +09:00 |
|
99jamin
|
6c7536c1ae
|
DEG-25 [Feat] 강화 애니메이션 및 코드 리팩토링
|
2025-05-02 11:41:32 +09:00 |
|
|
|
fa1a5174c5
|
Merge pull request 'DEG-125 [FEAT] 캐릭터 에셋 대체 및 move, battlemode 처리 까지' (!9) from DEG-125-플레이어-유료-에셋-적용 into main
Reviewed-on: #9
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: heain0122 <heain0122@gmail.com>
|
2025-05-02 02:23:28 +00:00 |
|
Sehyeon
|
e198af6c19
|
DEG-124 [Feat] npc 상호작용 추가
|
2025-05-02 10:32:09 +09:00 |
|
Sehyeon
|
dd076b7dc9
|
DEG-124 [Feat] cat asset 추가
|
2025-05-02 09:27:08 +09:00 |
|
Sehyeon
|
837d4eacc9
|
DEG-124 [Feat] prop 변경
|
2025-05-01 17:54:55 +09:00 |
|
Jay
|
7ca49fe2fc
|
DEG-125 [FEAT] 캐릭터 에셋 대체 및 move, battlemode 처리 까지
|
2025-05-01 16:29:10 +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 |
|
|
|
0b1355f401
|
[del] 불필요한 파일 제거
Work in JIRA ISSUE DEG-100
|
2025-05-01 15:11:26 +09:00 |
|
|
|
13588aa693
|
[feat] 슬로우 디버프 마법 생성
- 몬스터 에셋 적용
- 슬로우 마법 기능 추가
Work in JIRA ISSUE DEG-100
|
2025-05-01 15:03:23 +09:00 |
|
|
|
dfc9b26b95
|
Merge pull request 'DEG-49-클리어-성공-실패-ui-구현' (!7) from DEG-49-클리어-성공-실패-ui-구현 into main
Reviewed-on: #7
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
|
2025-05-01 02:38:24 +00:00 |
|
Lim0_C
|
ba4671f76c
|
Merge branch 'main' into DEG-49-클리어-성공-실패-ui-구현
|
2025-05-01 11:09:35 +09:00 |
|
Lim0_C
|
b49ccd5625
|
DEG-49 [Refactor] 클리어 성공 실패 패널 리팩토링
의미 없는 코루틴 삭제
|
2025-05-01 11:08:30 +09:00 |
|
|
|
10b42cfe15
|
Merge pull request 'DEG-118-엔딩-로직과 대화창 개선' (!6) from DEG-54-엔딩-로직 into main
Reviewed-on: #6
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
|
2025-05-01 00:02:51 +00:00 |
|
HaeinLEE
|
39a726b172
|
[Feat] 일상생활 튜토리얼 아주 일부
|
2025-04-30 23:17:07 +09:00 |
|
