将关卡显示放到能量界面中
Merge remote-tracking branch 'origin/master'