Merge branch 'master' into leonard

client_Wu Xijin

2018-08-14 31c2cebbccba45a00a755981dd6d0cdd0a0459e9

 Assets/Editor/Tool/AssetsVersionMaker.cs

@@ -14,8 +14,6 @@
        var md5 = string.Empty;

        var lines = new List<string>();
        lines.Add(DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"));

        for (int i = 0; i < _fileInfos.Count; i++)
        {
            var fileInfo = _fileInfos[i];