Changes

Truly-Depressed-Developers · Oct 29, 2023 · 7001543 · 7001543
1 parent 5b0e186
commit 7001543
Show file tree

Hide file tree

Showing 26 changed files with 2,250 additions and 5 deletions.
diff --git a/Assets/Animations/Player/BasicAttackDown.anim.meta b/Assets/Animations/Player/BasicAttackDown.anim.meta
diff --git a/Assets/Animations/Player/BasicAttackUp.anim.meta b/Assets/Animations/Player/BasicAttackUp.anim.meta
diff --git a/Assets/Animations/Player/DashDown.anim.meta b/Assets/Animations/Player/DashDown.anim.meta
diff --git a/Assets/Animations/Player/DashUp.anim.meta b/Assets/Animations/Player/DashUp.anim.meta
diff --git a/Assets/Animations/Player/DownRun.anim.meta b/Assets/Animations/Player/DownRun.anim.meta
diff --git a/Assets/Animations/Player/SpecialAttackLeft.anim.meta b/Assets/Animations/Player/SpecialAttackLeft.anim.meta
diff --git a/Assets/Animations/Player/SpecialAttackRight.anim.meta b/Assets/Animations/Player/SpecialAttackRight.anim.meta
diff --git a/Assets/Animations/Player/UpRun.anim.meta b/Assets/Animations/Player/UpRun.anim.meta
diff --git a/Assets/DamageSystem/Weapons/MeleeWeapon/MeleeWeapon.cs b/Assets/DamageSystem/Weapons/MeleeWeapon/MeleeWeapon.cs
@@ -18,13 +18,13 @@ public override float GetDamage() {
         }
 
         private void Awake() {
-            collider = GetComponentInChildren<PolygonCollider2D>();
+            //collider = GetComponentInChildren<PolygonCollider2D>();
             animator = GetComponent<Animator>();
             inner = transform.GetChild(0);
         }
 
         public override void Attack() {
-            collider.enabled = true;
+            //collider.enabled = true;
             //Debug.Log("atck");
             if (!isActiveAndEnabled) return;
             if (playerAnim.GetCurrentAnimatorStateInfo(0).IsName("BasicAttackTree")) return;
@@ -36,7 +36,7 @@ public override void Attack() {
 
         private void _OnAttackEnd() {
             OnAttackEnd.Invoke();
-            collider.enabled = false;
+            //collider.enabled = false;
         }
 
         private void OnDrawGizmos() {

diff --git a/Assets/Media/Player/Player_attack_down.png b/Assets/Media/Player/Player_attack_down.png
diff --git a/Assets/Media/Player/Player_attack_down.png.meta b/Assets/Media/Player/Player_attack_down.png.meta
diff --git a/Assets/Media/Player/Player_attack_up.png b/Assets/Media/Player/Player_attack_up.png