From f3185f7fe41f6fe13f97386bf25b7fa49457189a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 29 Mar 2021 10:47:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AF=BC=E8=A1=A8=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2=E8=A1=A8=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=A1=A8=E5=88=A0=E9=99=A4=EF=BC=8C=E9=9C=80=E8=A6=81=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E5=AF=BC=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExcelTool/DataConfig/DataConfigWindow.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs b/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs index af6199b22e..d3f2a5a550 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs +++ b/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs @@ -267,6 +267,7 @@ namespace GameEditor.Core.DataConfig for (int i = 0; i < files.Length; i++) { var item = files[i]; + var itemName = Path.GetFileName(item); ThreadPool.QueueUserWorkItem(q => { if (IsFileInUse(item)) @@ -274,10 +275,10 @@ namespace GameEditor.Core.DataConfig UnityEngine.Debug.LogError("该表正在编辑,无法导出!:" + item); lock (lockObj) { - if (record.ContainsKey(item)) + if (record.ContainsKey(itemName)) { - newRecord[item] = record[item]; - record.Remove(item); + newRecord[itemName] = record[itemName]; + record.Remove(itemName); } count++; } @@ -285,7 +286,7 @@ namespace GameEditor.Core.DataConfig } string crc = FileToCRC32.GetFileCRC32(item); - bool isChanged = !record.ContainsKey(item) || record[item] != crc; + bool isChanged = !record.ContainsKey(itemName) || record[itemName] != crc; if (!isIncrement || (isIncrement && isChanged)) { lock (lockObj) @@ -296,10 +297,10 @@ namespace GameEditor.Core.DataConfig } lock (lockObj) { - newRecord[item] = crc; - if (record.ContainsKey(item)) + newRecord[itemName] = crc; + if (record.ContainsKey(itemName)) { - record.Remove(item); + record.Remove(itemName); } count++; }