主页动画OK 累死了
Merge branch '修改主页动画' into wangkun_branch

Conflicts:

MobileNJU/MobileNJU.xcodeproj/project.xcworkspace/xcuserdata/luck-mac.xc
userdatad/UserInterfaceState.xcuserstate

MobileNJU/MobileNJU.xcodeproj/xcuserdata/luck-mac.xcuserdatad/xcdebugger
/Breakpoints_v2.xcbkptlist