Commit Graph

30 Commits

Author SHA1 Message Date
2e93f447dc D 2026-02-03 23:41:49 +09:00
d49c61827c Merge branch 'main' of http://59.19.179.48:3300/playm/Projext
# Conflicts:
#	Assets/1.myPrefab/MyMonster/Monster_1.prefab
2026-02-03 00:04:54 +09:00
0a056d1072 버그 수정 2026-02-03 00:02:12 +09:00
fe9e89ad52 혹시 모르니.... 2026-02-02 20:39:23 +09:00
72971841d8 xz 2026-02-02 19:56:06 +09:00
81b694b6af 카드 중복 2026-02-02 19:51:54 +09:00
1f33b11f66 ..1 2026-02-02 19:48:45 +09:00
88536069ee Merge branch 'main' of http://59.19.179.48:3300/playm/Projext
# Conflicts:
2026-02-02 17:50:19 +09:00
695da14c6a . 2026-02-02 17:39:05 +09:00
cbf49d4c2f 수정본2 2026-02-02 17:30:23 +09:00
620b0e47e9 수정본
카드 ui, 대쉬 , 플레이어 공격 범위 .
2026-02-02 00:49:12 +09:00
4164e01d6a 플레이어 공격범위 수정 2026-01-31 22:07:35 +09:00
357c5da693 Merge branch 'main' of http://59.19.179.48:3300/playm/Projext 2026-01-30 18:31:17 +09:00
9640e0503f Merge branch 'main' of http://59.19.179.48:3300/playm/Projext 2026-01-30 18:27:49 +09:00
473a304f35 Test 2026-01-30 18:27:44 +09:00
bb94393a3c Merge branch 'main' of http://59.19.179.48:3300/playm/Projext 2026-01-30 18:20:48 +09:00
18330db7b2 test1 2026-01-30 18:20:07 +09:00
6efcca22d8 Merge branch 'main' of http://59.19.179.48:3300/playm/Projext 2026-01-30 17:53:21 +09:00
2e401f1042 .. 2026-01-30 17:53:18 +09:00
5bbba202e0 Merge branch 'main' of http://59.19.179.48:3300/playm/Projext 2026-01-30 16:46:19 +09:00
7967bfb405 콤보 어택 구현 2026-01-30 16:45:11 +09:00
6b2bddc1be Merge branch 'main' of http://59.19.179.48:3300/playm/Projext 2026-01-30 15:32:26 +09:00
5e4e9dc6bf 카메라 흔들림 2026-01-30 15:30:27 +09:00
7edf4a36c9 Merge branch 'main' of http://59.19.179.48:3300/playm/Projext 2026-01-30 12:53:02 +09:00
91e4208f00 .. 2026-01-30 12:52:54 +09:00
75462cab9b Merge branch 'main' of http://59.19.179.48:3300/playm/Projext
# Conflicts:
#	Assets/7.Other Code/NormalMonster.cs
#	Assets/BitGem/Ghoul-Crew-Hand-Painted-Series/Ghoul-Boss/Animations/Monster_Walk.anim
2026-01-30 12:42:43 +09:00
a67ee1fc65 내 작업 2026-01-30 12:24:13 +09:00
d50e6f7a7d 프로젝트 수정
UI크기, 배치, 이미지, 카드 능력치에 +-붙는 문제 해결
2026-01-30 11:46:55 +09:00
6e02e36997 기능 수정 본
회복 기능,적 아이템 드랍,등등
2026-01-30 01:11:10 +09:00
7fc5571229 기능들 2026-01-29 15:58:38 +09:00