修复noAnimation的问题
Merge remote-tracking branch 'origin/liuyang_dev' into liuyang_dev