Merge branch 'anyTime+char_branch' into anyTime_modifyBug

Conflicts:

Time-Line.xcworkspace/xcuserdata/IF.xcuserdatad/UserInterfaceState.xcuse
rstate
修改登陆转场动画+修改登陆
提交代码
Merge branch 'anyTime_modifyBug'修改登陆动画等

Conflicts:

Time-Line.xcworkspace/xcuserdata/IF.xcuserdatad/UserInterfaceState.xcuse
rstate