diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs index 1a5048d..bc4b390 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs @@ -65,10 +65,10 @@ namespace Tools.ExcelResolver.Editor } throw new Exception($"单元格转换失败 " + - $"className: '{className}' " + - $"FullAddress: {cell.FullAddress} " + - $"Type: '{type.FieldWriteFormat}' " + - $"Text: '{cell.Text}' "); + $"className: '{className}' " + + $"FullAddress: {cell.FullAddress} " + + $"Type: '{type.FieldWriteFormat}' " + + $"Text: '{cell.Text}' "); } /// diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs index d945961..25cb18b 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs @@ -1,12 +1,15 @@ using System; using System.Linq; using System.Reflection; +using OfficeOpenXml; namespace Tools.ExcelResolver.Editor { internal static partial class ExcelResolverUtil { private static TType[] _allTTypes; + private static ExcelRange _currentCell; + private static string _currentClassName; internal static TType[] GetAllTTypes() { @@ -20,23 +23,28 @@ namespace Tools.ExcelResolver.Editor /// /// 更具类型字符串获取 TType /// - /// + /// /// - internal static TType GetTTypeByString(string typeText) + internal static TType GetTTypeByString(string targetText, ExcelRange cell = null, string className = null) { - - typeText = typeText.ToLower(); + _currentCell = cell ?? _currentCell; + _currentClassName = className ?? _currentClassName; + targetText = targetText.ToLower(); _allTTypes ??= GetAllTTypes(); foreach (var tType in _allTTypes) { - if (tType.String2TType(typeText)) + if (tType.String2TType(targetText)) { return tType; } } - throw new Exception($"未找到类型 {typeText}"); + throw new Exception($"type定义错误 " + + $"className: '{_currentClassName}' " + + $"FullAddress: {_currentCell.FullAddress} " + + $"Text: '{_currentCell.Text}' " + + $"targetText: '{targetText}'"); } } } \ No newline at end of file diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs index 54e1bc1..7893f82 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs @@ -127,7 +127,7 @@ namespace Tools.ExcelResolver.Editor colIndex = col, varName = cellText, typeString = worksheet.Cells[3, col].Text, - type = ExcelResolverUtil.GetTTypeByString(worksheet.Cells[3, col].Text), + type = ExcelResolverUtil.GetTTypeByString(worksheet.Cells[3, col].Text, worksheet.Cells[3, col], classCodeData.className), info = worksheet.Cells[4, col].Text, description = worksheet.Cells[5, col].Text, path = worksheet.Cells[6, col].Text,