From 912cde91c4e026aec31541affa1e1e4b3c13eb8e Mon Sep 17 00:00:00 2001
From: coffee <985942825@qq.com>
Date: Sat, 25 Jan 2025 20:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8type=E8=BD=AC=E6=8D=A2=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E8=BE=93=E5=87=BA=E8=AF=A6=E7=BB=86Debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Core/Util/ExcelResolverUtil.Cell.cs       |  8 ++++----
 .../Core/Util/ExcelResolverUtil.TType.cs      | 20 +++++++++++++------
 .../ExcelResolverEditorWindow.ReadExcel.cs    |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)

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: '<color=darkblue>{className}</color>'  " +
-                                $"FullAddress: <color=darkblue>{cell.FullAddress}</color>  " +
-                                $"Type: '<color=darkblue>{type.FieldWriteFormat}</color>'  " +
-                                $"Text: '<color=darkblue>{cell.Text}</color>'  ");
+                                $"className: '<color=cyan>{className}</color>'  " +
+                                $"FullAddress: <color=cyan>{cell.FullAddress}</color>  " +
+                                $"Type: '<color=cyan>{type.FieldWriteFormat}</color>'  " +
+                                $"Text: '<color=cyan>{cell.Text}</color>'  ");
         }
         
         /// <summary>
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
         /// <summary>
         /// 更具类型字符串获取 TType
         /// </summary>
-        /// <param name="typeText"></param>
+        /// <param name="targetText"></param>
         /// <returns></returns>
-        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: '<color=cyan>{_currentClassName}</color>'  " +
+                                $"FullAddress: <color=cyan>{_currentCell.FullAddress}</color>  " +
+                                $"Text: '<color=cyan>{_currentCell.Text}</color>'  " +
+                                $"targetText: '<color=cyan>{targetText}</color>'");
         }
     }
 }
\ 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,