diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs index f8fad1276b270ec54bd0d89ae09341697ed734d4..ded60e8fd892620751caba3bed7d107cd9437678 100644 --- a/MrBigsock/Assets/Code/PlayerController.cs +++ b/MrBigsock/Assets/Code/PlayerController.cs @@ -104,7 +104,17 @@ namespace BigSock { } } + private bool TryMove(Vector2 direction) { + if(direction != Vector2.zero) { + rb.AddForce(direction * (float) MovementSpeed * Time.fixedDeltaTime, ForceMode2D.Impulse); + return true; + } + return false; + } + + + private bool TryMove_OLD(Vector2 direction) { if(direction != Vector2.zero) { // Check for potential collisions int count = rb.Cast( @@ -123,7 +133,8 @@ namespace BigSock { // Can't move if there's no direction to move in return false; } - + + // } void OnMove(InputValue movementValue) { diff --git a/MrBigsock/Assets/Code/attack/AttackMovement.cs b/MrBigsock/Assets/Code/attack/AttackMovement.cs index f8cc663fb3e7ef4f8d49bf1d9cf361e12d9baf4d..4768aed3df61a8e6f88499b42378da4fd421d130 100644 --- a/MrBigsock/Assets/Code/attack/AttackMovement.cs +++ b/MrBigsock/Assets/Code/attack/AttackMovement.cs @@ -19,7 +19,7 @@ namespace BigSock { public float baseDamage = 1; public float KnockbackForce => knockbackForce; - public float knockbackForce = 50; + public float knockbackForce = 1; // Start is called before the first frame update @@ -50,7 +50,7 @@ namespace BigSock { void OnCollisionEnter2D(Collision2D collision) { print($"[AttackMovement.OnCollisionEnter2D()] {collision.transform.position}"); - var target = collision.gameObject.GetComponent<EnemyController>(); + var target = collision.gameObject.GetComponent<Character>(); if(target != null) { diff --git a/MrBigsock/Assets/Code/orc/EnemyController.cs b/MrBigsock/Assets/Code/orc/EnemyController.cs index ed68aac6a524df55e0e0f8a0fa9e9d495eeb5490..02dbc762456227f5c5d611e608ae3ebc39ed41eb 100644 --- a/MrBigsock/Assets/Code/orc/EnemyController.cs +++ b/MrBigsock/Assets/Code/orc/EnemyController.cs @@ -38,7 +38,7 @@ namespace BigSock { followCollider.OnColliderStay2D_Action += Move_OnColliderStay2D; followCollider.OnColliderExit2D_Action += Move_OnColliderExit2D; - attackCollider = transform.Find("AttackCollider").GetComponent<EmptyCollider>(); + attackCollider = transform.Find("MeleeCollider").GetComponent<EmptyCollider>(); attackCollider.OnColliderEnter2D_Action += Attack_OnColliderEnter2D; attackCollider.OnColliderStay2D_Action += Attack_OnColliderStay2D; attackCollider.OnColliderExit2D_Action += Attack_OnColliderExit2D; @@ -79,6 +79,14 @@ namespace BigSock { } private bool TryMove(Vector2 direction) { + if(direction != Vector2.zero) { + rb.AddForce(direction * (float) MovementSpeed * Time.fixedDeltaTime, ForceMode2D.Impulse); + return true; + } + return false; + } + + private bool TryMove_OLD(Vector2 direction) { if(direction != Vector2.zero) { diff --git a/MrBigsock/Assets/Prefabs/BigSock.prefab b/MrBigsock/Assets/Prefabs/BigSock.prefab index 4377491706318209a491ee3f5fc607363ec1dae6..b1a26ff4fa27dc27317c8594f2b09b0a0e4ab9df 100644 --- a/MrBigsock/Assets/Prefabs/BigSock.prefab +++ b/MrBigsock/Assets/Prefabs/BigSock.prefab @@ -132,11 +132,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: baseAttackSpeed: 4 - baseMovementSpeed: 3 + baseMovementSpeed: 10 baseDamage: 1 - KnockbackForce: 150 + knockbackForce: 150 baseHP: 10 baseMaxHP: 10 + hpBar: {fileID: 0} collisionOffset: 0.05 movementFilter: useTriggers: 0 @@ -166,7 +167,7 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1 - m_LinearDrag: 1 + m_LinearDrag: 2 m_AngularDrag: 0.05 m_GravityScale: 0 m_Material: {fileID: 0} diff --git a/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab b/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab index 55991571520c7f059ed2cfc2f492e769ac1e6334..04d11513cb46763931cecbb50a8f93ee3a8a0377 100644 --- a/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab +++ b/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab @@ -103,7 +103,7 @@ Rigidbody2D: m_UseFullKinematicContacts: 1 m_UseAutoMass: 1 m_Mass: 0.6243647 - m_LinearDrag: 2.5 + m_LinearDrag: 2 m_AngularDrag: 0 m_GravityScale: 0 m_Material: {fileID: 0} diff --git a/MrBigsock/Assets/Prefabs/attack.prefab b/MrBigsock/Assets/Prefabs/attack.prefab index 22ddb3611f09dea88044c02f546a8a856e5a7087..7e3c9698a64f16c903baa30033231844a16bddb8 100644 --- a/MrBigsock/Assets/Prefabs/attack.prefab +++ b/MrBigsock/Assets/Prefabs/attack.prefab @@ -161,3 +161,4 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 10 baseDamage: 1 + knockbackForce: 1 diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab index 9df14e8df38d288bfa3b48089d173fe7f8ef47d7..d4d25a7d434d93c2912dfb32744943378d505c31 100644 --- a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab +++ b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab @@ -103,7 +103,7 @@ Rigidbody2D: m_UseFullKinematicContacts: 1 m_UseAutoMass: 1 m_Mass: 0.6243647 - m_LinearDrag: 2.5 + m_LinearDrag: 2 m_AngularDrag: 0 m_GravityScale: 0 m_Material: {fileID: 0} @@ -144,9 +144,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: baseAttackSpeed: 1 - baseMovementSpeed: 2 + baseMovementSpeed: 4 baseDamage: 1 - KnockbackForce: 150 + knockbackForce: 3 baseHP: 10 baseMaxHP: 10 collisionOffset: 0.05 @@ -248,7 +248,7 @@ MonoBehaviour: m_GameObject: {fileID: 7539630614846898202} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b1aeda8fe8f5c1f4fa7a8f47e2864211, type: 3} + m_Script: {fileID: 11500000, guid: 02e1a714e20472c46a1f156e232741cd, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &8620845285361089561 @@ -309,6 +309,6 @@ MonoBehaviour: m_GameObject: {fileID: 8620845285361089561} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b1aeda8fe8f5c1f4fa7a8f47e2864211, type: 3} + m_Script: {fileID: 11500000, guid: 02e1a714e20472c46a1f156e232741cd, type: 3} m_Name: m_EditorClassIdentifier: