Update Game
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Class/Attak.js
	Assets/Scripts/Class/Type.js
	Assets/Scripts/MonoBehaviour/Fight.js