闫鑫:增加暂停功能
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
修改bug
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
闫鑫:解决冲突