diff --git a/Assets/Prefabs/Enemies/ZomBoss.prefab b/Assets/Prefabs/Enemies/ZomBoss.prefab index c5c68b29df0d1658bd4ee365aa0e71ee3b6a6340..ffa13cce750179ba96f07164474882b86bfca343 100644 --- a/Assets/Prefabs/Enemies/ZomBoss.prefab +++ b/Assets/Prefabs/Enemies/ZomBoss.prefab @@ -16921,6 +16921,7 @@ MonoBehaviour: sinkSpeed: 2.5 scoreValue: 10 deathClip: {fileID: 8300000, guid: 7d156b8a5b340cd46bcf0a76557dd2dd, type: 3} + DropLootPrefab: {fileID: 2456408812728333572, guid: 2a0d87a75ce834a47abbb5148568bc96, type: 3} --- !u!114 &7705408523259788631 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index 289458d0c7deb8efec6fd0df14c7fb12e12ba005..d8c5923c1ab4c087834214c697d7ca269a779842 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -15061,6 +15061,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1df3c9e3c99fce14cb9c1f900f8859cc, type: 3} +--- !u!1001 &1820271942 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 100000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_Name + value: ZomBear + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ea3c2728ef33e3a4d99527a86cda6465, type: 3} --- !u!1 &1834817269 GameObject: m_ObjectHideFlags: 0 @@ -17414,3 +17471,4 @@ SceneRoots: - {fileID: 307935225} - {fileID: 840882477} - {fileID: 1043811713} + - {fileID: 1820271942} diff --git a/Assets/Scripts/Enemy/EnemyRadiusAttack.cs b/Assets/Scripts/Enemy/EnemyRadiusAttack.cs index ee3e5c782db921d22f49affb5e9949f143fb0d26..0435049b7d4f7f4e718502d6051aa3b4878f58e5 100644 --- a/Assets/Scripts/Enemy/EnemyRadiusAttack.cs +++ b/Assets/Scripts/Enemy/EnemyRadiusAttack.cs @@ -26,7 +26,7 @@ namespace Nightmare playerHealth = player.GetComponent<PlayerHealth>(); playerMovement = player.GetComponent<PlayerMovement>(); - initialSpeed = playerMovement.speed; + initialSpeed = playerMovement.GetCurrentSpeed(); enemyHealth = GetComponent<EnemyHealth>(); anim = GetComponent<Animator>(); @@ -50,14 +50,13 @@ namespace Nightmare // Adjust player components based on playerInRange flag if (playerInRange) { - playerMovement.speed = initialSpeed * speedMultiplier; + playerMovement.SetCurrentSpeed(initialSpeed * speedMultiplier); CurrentStateData.SetMultiplier(damageMultiplier); - UnityEngine.Debug.Log(playerMovement.speed); } else { // Restore initial values - playerMovement.speed = initialSpeed; + playerMovement.SetCurrentSpeed(initialSpeed); CurrentStateData.SetMultiplier(1f); } diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index 9be5a92c44083da8b125747567bcc10e85056ff4..09bdbfa4616f9dedec0e86eb10d9eb081dc30a0c 100644 --- a/Assets/Scripts/Player/PlayerMovement.cs +++ b/Assets/Scripts/Player/PlayerMovement.cs @@ -121,5 +121,15 @@ namespace Nightmare // Tell the animator whether or not the player is walking. anim.SetBool("IsWalking", walking); } + + public float GetCurrentSpeed() + { + return speed; + } + + public void SetCurrentSpeed(float newSpeed) + { + speed = newSpeed; + } } }