Merge remote-tracking branch 'origin/NewStory' into NewStory

# Conflicts:
#	Assets/Scenes/Fight_Arena/Fight_Arena.unity
This commit is contained in:
Szymon Miś
2025-09-09 02:45:19 +02:00
22 changed files with 2573 additions and 962 deletions

View File

@@ -339,13 +339,12 @@ namespace DemonBoss.Magic
Gizmos.DrawWireCube(transform.position + Vector3.up * 2f, Vector3.one * 0.5f);
// HP text in Scene View
#if UNITY_EDITOR
if (Application.isPlaying)
{
UnityEditor.Handles.Label(transform.position + Vector3.up * 2.5f, $"HP: {currentHealth}/{maxHealth}");
}
#endif
}
#endif
public void AddHealth(int value)
{
@@ -362,6 +361,5 @@ namespace DemonBoss.Magic
throw new System.NotImplementedException();
}
#endif
}
}