diff --git a/Assets/Animations/Bones/Bones.controller b/Assets/Animations/Bones/Bones.controller index ae53451..b62067e 100644 --- a/Assets/Animations/Bones/Bones.controller +++ b/Assets/Animations/Bones/Bones.controller @@ -665,7 +665,7 @@ AnimatorStateTransition: m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 --- !u!1101 &7801668757208663834 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Healthbar.prefab b/Assets/Prefabs/Healthbar.prefab index 7cb411e..d8b8790 100644 --- a/Assets/Prefabs/Healthbar.prefab +++ b/Assets/Prefabs/Healthbar.prefab @@ -223,8 +223,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c83fdf078a8b34ef7bb2829a58c1a545, type: 3} m_Name: m_EditorClassIdentifier: - fullHealthColor: {r: 0.21915412, g: 1, b: 0, a: 1} - fullDeathColor: {r: 1, g: 0, b: 0, a: 1} + fullHealthColor: {r: 0.19843106, g: 0.9056604, b: 0, a: 1} + fullDeathColor: {r: 0.9528302, g: 0, b: 0, a: 1} subtractionColor: {r: 1, g: 1, b: 1, a: 1} healthVisual: {fileID: 210773656934484425} actualHealthVisual: {fileID: 904379579236604940} diff --git a/Assets/Scripts/HealthBarManager.cs b/Assets/Scripts/HealthBarManager.cs index 356eda1..a97b961 100644 --- a/Assets/Scripts/HealthBarManager.cs +++ b/Assets/Scripts/HealthBarManager.cs @@ -24,7 +24,7 @@ public class HealthBarManager : MonoBehaviour { GameObject player = kvp.Key; GameObject healthBar = kvp.Value; - healthBar.GetComponent().fullHealthColor = GameManager.playerColors[GameManager.players.IndexOf(player)]; + //healthBar.GetComponent().fullHealthColor = GameManager.playerColors[GameManager.players.IndexOf(player)]; // Color health bars healthBar.transform.SetPositionAndRotation(new Vector3(player.transform.position.x, player.transform.position.y + 1.5f, player.transform.position.z), Quaternion.identity); } }