Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/Excel/ExcelReader.cs

@@ -122,6 +122,7 @@ namespace GFGEditor
                         ExcelWorksheet worksheet = Worksheets[j];
                         string[] names = worksheet.Name.Split('_');
                         if (names.Length < 2) continue;
+
                         ExcelWorksheet newWorksheet = null;
                         for (int k = 1; k <= newWorksheets.Count; k++)
                         {
@@ -177,7 +178,7 @@ namespace GFGEditor
                 for (int j = 1; j <= newColumnNum; j++)
                 {
                     string newName = newWorksheet.Cells[3, j].Text.Trim();
-                    string newType = newWorksheet.Cells[2, i].Text.Trim();
+                    string newType = newWorksheet.Cells[2, j].Text.Trim();
                     if (name == newName && type == newType)
                     {
                         needWriteColumn = false;
@@ -212,11 +213,13 @@ namespace GFGEditor
                 for (int j = 1; j <= columnNum; j++)
                 {
                     string title = worksheet.Cells[3, j].Text.Trim();
+                    string type = worksheet.Cells[2, j].Text.Trim();
                     if (string.IsNullOrEmpty(title)) continue;
-                    for (int k = column + 1; k <= newColumnNum; k++)
+                    for (int k = 1; k <= newColumnNum; k++)
                     {
                         string newTitle = newWorksheet.Cells[3, k].Text.Trim();
-                        if (newTitle == title)
+                        string newType = newWorksheet.Cells[2, k].Text.Trim();
+                        if (newTitle == title && newType == type)
                         {
                             column = k;
                             break;