Changes to fight mechanics in CharacterBase.cs
Merge branch 'new_master' of https://github.com/Azzzmo/PaybackTime into new_master

Conflicts:
	Assets/Prefabs/_Chic_Guevara.prefab
	Assets/Scenes/Level1.unity
	Assets/Scripts/CharacterBase.cs
Merge branch 'new_master' of https://github.com/Azzzmo/PaybackTime into new_master
Merge branch 'new_master' of https://github.com/Azzzmo/PaybackTime into new_master
push new enemy.cs