合并2
Merge branch 'master' of https://github.com/pzhifeng/client-main

Conflicts:
	client-main/Classes/views/SceneFight.cpp