Merge branch 'master' into leonard

client_Wu Xijin

2018-10-21 6f8ed2e37f8762fb3501a671d0dca40bcd68edae

 Assets/Editor/Tool/AssetsVersionMaker.cs

@@ -21,6 +21,12 @@
            {

                continue;

            }



            if (fileInfo.FullName.Contains("DS_Store") || fileInfo.FullName.Contains("ds_store"))

            {

                continue;

            }



            relativePath = FileExtersion.GetFileRelativePath(_path, fileInfo.FullName);

            extersion = fileInfo.Extension;

            fileSize = fileInfo.Length;