闫鑫:修改资源配置
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy