BugFix: MageAttack Feature: Fighter Knight Skill2 Damage, Stat Alloc, Mage Heal, Hp Mana Regen, Mana Cost
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scripts/Movements.cs
	Assets/prefab assets/Fighter skill3 Particle.prefab
	Assets/prefab assets/Fighter_Skill2Particle.prefab
	Assets/prefab assets/Mage_SKill3Particle.prefab
	Assets/scene files/level1.unity
	CAPSTN2-Blood-Exile-csharp.sln
	CAPSTN2-Blood-Exile.sln
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/43/4387ba1b3c37f37418425a7e471ac330
	Library/metadata/75/7591abc02a8409849b80c81aa588ed29
	Library/metadata/c6/c68405f8ff382ad4ebbe0b2a0d954158
	Library/metadata/e3/e3694dad2e04fe844a6aa40017252f4f
	Library/metadata/e8/e88ec35701d12dc4186df4f4764f8198
	Library/shadercompiler-1.log