Merge branch 'krazerleo/core/1' of https://gitea.gavt45.ru/gav/real-shooter into krazerleo/core/1

2022-05-05 11:48:32 +07:00
parent e689927b73 351fa8ee12
commit 1cf5776a1b
12 changed files with 883 additions and 663 deletions
--- a/Assets/Scripts/Character/CharacterCondition.cs
+++ b/Assets/Scripts/Character/CharacterCondition.cs
@ -9,12 +9,22 @@ public class CharacterCondition
    public event Action<int> OnChangeAmmunitionEvent;

    private int health;
+<<<<<<< HEAD
    public int HealthPoints
    {
        get
        {
            return health;
        }
+=======
+
+    public int HealthPoints 
+    { 
+        get 
+        { 
+            return health; 
+        } 
+>>>>>>> 351fa8ee12c499a0374be71a192a5f288611f467
        private set
        {
            health = value;