zhaoyang 2 years ago
parent
commit
dd0c748796

+ 3 - 2
GameClient/Assets/Editor/Excel/ExcelReader.cs

@@ -182,7 +182,6 @@ namespace GFGEditor
                     if (name == newName && type == newType)
                     {
                         needWriteColumn = false;
-                        break;
                     }
                 }
                 if (needWriteColumn)
@@ -214,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 = 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;

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes