闫鑫:修改障碍
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
闫鑫:删除多余文件