refactor
fix font issue
Merge branch 'master' of github.com:qg351605753/colorhit

Conflicts:
	ProjectSettings/ProjectSettings.asset