闫鑫:修改血条
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
闫鑫:修改游戏控制层暂停按钮
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
闫鑫:设置pageView
闫鑫:修改pageView部分东西
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
闫鑫:更新版本
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
yax
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy
Merge branch 'master' of https://github.com/yanxin59/CarrotFantasy