添加了部分效果的接口和逻辑
Merge branch 'master' of https://github.com/opensourceBrown/DR

Conflicts:
	DR/projects/DRGame/Classes/Controller/MainGameController.cpp
	DR/projects/DRGame/Classes/UI/Layer/MainGameGridLayer.cpp