Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 fdb2bd928c43e8efa39586b4309ae2b9a892ceef

 Assets/Editor/Tool/TableTool.cs

@@ -178,15 +178,19 @@
        MessageBox.Show("导出成功！");

    }



    public static void ReadAllTxtToBytes(string _outPath)

    public static void CopyConfigsToOutPutPath(string _outPath)

    {

        configOutPutPath = _outPath;

        var rootPath = UnityEngine.Application.dataPath + "/ResourcesOut/Refdata/Config";

        var configFiles = FileExtersion.GetFileInfos(rootPath, new string[] { "*.txt", "*.TXT" });

        var root1 = UnityEngine.Application.dataPath + "/ResourcesOut/Refdata/Config";

        var configFiles = new List<FileInfo>();

        configFiles.AddRange(FileExtersion.GetFileInfos(root1, new string[] { "*.txt", "*.TXT" }));

        var root2 = UnityEngine.Application.dataPath + "/Resources/Config";

        configFiles.AddRange(FileExtersion.GetFileInfos(root2, new string[] { "*.txt", "*.TXT" }));



        foreach (var file in configFiles)

        {

            var fileInfo = new System.IO.FileInfo(file.FullName);

            ReadTxtToBytes(fileInfo);

            var fileInfo = new FileInfo(file.FullName);

            CopyTxt(fileInfo);

        }

    }



@@ -211,11 +215,11 @@
            {

                continue;

            }

            ReadTxtToBytes(_tableNameLst[i].fileInfo);

            CopyTxt(_tableNameLst[i].fileInfo);

        }

    }



    private static void ReadTxtToBytes(FileInfo fileInfo)

    private static void CopyTxt(FileInfo fileInfo)

    {

        string fileName = fileInfo.Name.Split('.')[0];



@@ -230,7 +234,7 @@
            File.Delete(filePath);

        }



        File.Copy(fileInfo.FullName,filePath);

        File.Copy(fileInfo.FullName, filePath);

    }



    /// <summary>