优化素材文件类型判断
Merge remote-tracking branch 'origin/master'