Compare commits

...

13 Commits

Author SHA1 Message Date
728856e969 Merge pull request 'DEG-181-마무리-작업' (!73) from DEG-181-마무리-작업 into main
Reviewed-on: #73
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-15 08:11:59 +00:00
Sehyeon
ae9c12a109 DEG-181 [Fix] 추가 오류 해결 2025-05-15 16:41:50 +09:00
Sehyeon
72e3455eb9 DEG-181 [Fix] 디버그 로그 삭제 2025-05-15 16:13:31 +09:00
Sehyeon
280a591f3e DEG-181 [Fix] 체력 최대 8까지만 회복 가능 2025-05-15 16:06:31 +09:00
Sehyeon
4d0167f45b DEG-181 [Fix] 자잘한 버그 수정 2025-05-15 15:57:54 +09:00
Sehyeon
e7da3fb9fb DEG-181 [Style] 파일 정리 2025-05-15 14:33:59 +09:00
469523ac95 Merge pull request 'DEG-167-탈진-충돌-충돌' (!72) from DEG-167-탈진-연출-충돌-충돌 into main
Reviewed-on: #72
2025-05-15 04:37:42 +00:00
Parkillhwan
b1dd559bc0 DEG-167-탈진-충돌-충돌 2025-05-15 13:35:49 +09:00
Sehyeon
d3c3bed909 git conflict resolve 2025-05-15 13:03:00 +09:00
Sehyeon
545df9f6d7 DEG-179 [Fix] 스테이지 제한 2025-05-15 11:36:37 +09:00
cc804ae625 Merge pull request 'DEG-180 [feat] 튜토리얼 실행 제어' (!69) from DEG-180-튜토리얼-실행-제어 into main
Reviewed-on: #69
Reviewed-by: 99jamin <rhwk341@naver.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-15 02:29:43 +00:00
Lim0_C
9a74078b34 DEG-180 [feat] 튜토리얼 실행 제어 2025-05-15 11:12:27 +09:00
41e047be40 Merge pull request '[Fix] 돌발 이벤트 발생 패널 버그 수정 재작업' (!68) from DEG-178-돌발이벤트패널-재작 into main
Reviewed-on: #68
2025-05-15 01:31:16 +00:00
789 changed files with 248 additions and 140162 deletions

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a0ba1963fb7ce5041be57eb9074619f8
guid: 319ea561ecf14f24a8c397dcf3384433
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a9e0606fbb9eff542926cf31a71db1ec
guid: 22739671240a4e8489ad2f1f4395a48b
folderAsset: yes
DefaultImporter:
externalObjects: {}

Some files were not shown because too many files have changed in this diff Show More