From 0de874ec6b504b193e203cd624b2e82e476273b1 Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Thu, 8 May 2025 18:10:04 +0900 Subject: [PATCH] =?UTF-8?q?DEG-61=20[FEAT]=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/JAY/Animation/CustomAttack01.anim | 4 ++-- Assets/JAY/Animation/CustomAttack02.anim | 4 ++-- Assets/JAY/Scripts/PlayerController.cs | 2 -- .../stylizedLittleHero/Prefabs/Warrior_M.prefab | 3 --- .../stylizedLittleHero/Prefabs/Warrior_M.prefab.meta | 7 ------- 5 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab delete mode 100644 Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab.meta diff --git a/Assets/JAY/Animation/CustomAttack01.anim b/Assets/JAY/Animation/CustomAttack01.anim index ca27d523..87ed2397 100644 --- a/Assets/JAY/Animation/CustomAttack01.anim +++ b/Assets/JAY/Animation/CustomAttack01.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2a59366427bf07c6545f503a037b7a019c230af1d8e3ffac3b7f3558aebc98b -size 68749 +oid sha256:51c6f4c4d0aa53532545f61a997fbe42e2de2395443bbc0437546b93cb259037 +size 68742 diff --git a/Assets/JAY/Animation/CustomAttack02.anim b/Assets/JAY/Animation/CustomAttack02.anim index c5f51d71..db82e99a 100644 --- a/Assets/JAY/Animation/CustomAttack02.anim +++ b/Assets/JAY/Animation/CustomAttack02.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f0b5d12c569a248877e28d26270d6c197cb9b86ca9682e0b5d53f923b8bb98b -size 64424 +oid sha256:6840d07e637f812131e19cdb5d3f853f96ce3a07cf94d648b4ccc7335ff31522 +size 64417 diff --git a/Assets/JAY/Scripts/PlayerController.cs b/Assets/JAY/Scripts/PlayerController.cs index c90e9d2f..14b2319b 100644 --- a/Assets/JAY/Scripts/PlayerController.cs +++ b/Assets/JAY/Scripts/PlayerController.cs @@ -294,7 +294,6 @@ public class PlayerController : CharacterBase, IObserver if (_weaponController.IsAttacking) return; // 이미 공격 중이면 실행 안함 if (_currentAction == _attackAction) { - Debug.Log("공격 시작!"); _attackAction.EnableCombo(); _weaponController.AttackStart(); } @@ -303,7 +302,6 @@ public class PlayerController : CharacterBase, IObserver public void SetAttackComboFalse() { if (_currentAction == _attackAction) { - Debug.Log("공격 종료@"); // 이벤트 중복 호출? 공격 종료 시 SetAttackComboFalse가 아니라 ~True로 끝나서 오류 발생. (공격 안하는 상태여도 공격으로 판정됨) _attackAction.DisableCombo(); _weaponController.AttackEnd(); // IsAttacking = false로 변경 diff --git a/Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab b/Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab deleted file mode 100644 index 57ecccde..00000000 --- a/Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9de1f5de51a0a93a03f9af61493f254c986709f6a377a7163070afad440c4ee -size 57133 diff --git a/Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab.meta b/Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab.meta deleted file mode 100644 index ba572dc9..00000000 --- a/Assets/StoreAssets/stylizedLittleHero/Prefabs/Warrior_M.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 87a82613235610c42b7f6f68c6049083 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: