Merge branch 'master' of https://github.com/qg351605753/colorhit

Conflicts:
ProjectSettings/ProjectSettings.asset
change bug