买了没考虑
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024

Conflicts:
	Classes/GuideLayer.cpp
	Classes/HomeLayer.cpp
good
新农村vn
OK
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024
rank
Merge branch 'master' of https://github.com/Multimillionaires/Merge1024
ok