From 745f69633ffd929d0662923e9c44a907aeeffca5 Mon Sep 17 00:00:00 2001
From: coffee <985942825@qq.com>
Date: Mon, 20 Jan 2025 00:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/Core/Data/FieldData.cs             | 36 ++++++++++---------
 .../ExcelResolver/Editor/Core/Types/TList.cs  | 15 ++++++++
 .../Editor/Core/Types/TList.cs.meta           |  3 ++
 .../Editor/Core/Types/TVector2.cs             |  2 +-
 .../Editor/Core/Types/TVector3.cs             |  2 +-
 ...ExcelResolverEditorWindow.WriteDataCode.cs | 16 +--------
 6 files changed, 40 insertions(+), 34 deletions(-)
 create mode 100644 Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs
 create mode 100644 Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs.meta

diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Data/FieldData.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Data/FieldData.cs
index b75c730..4538110 100644
--- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Data/FieldData.cs
+++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Data/FieldData.cs
@@ -15,31 +15,33 @@ namespace Tools.ExcelResolver.Editor
         public string description;
         public string path;
         
-        public void Dispose()
-        {
-            varName = null;
-            type = null;
-            info = null;
-            description = null;
-            path = null;
-        }
-    }
-
-    internal static class FieldDataExtension
-    {
-        internal static CodeMemberField GetCodeField(this FieldData field)
+        internal CodeMemberField GetCodeField()
         {
             CodeMemberField codeField = new CodeMemberField
             {
                 Attributes = MemberAttributes.Public,
-                Name = field.varName,
-                Type = new CodeTypeReference(field.type.RealType),
-                CustomAttributes = new CodeAttributeDeclarationCollection()
+                Name = varName,
+                Type = new CodeTypeReference(type.RealType),
+                Comments =
                 {
-                    new CodeAttributeDeclaration("SerializeField")
+                    new CodeCommentStatement("<summary>", true),
+                    new CodeCommentStatement(info, true),
                 },
             };
+            if (!string.IsNullOrEmpty(description)) 
+                codeField.Comments.Add(new CodeCommentStatement($"<c>{description}</c>", true));
+            codeField.Comments.Add(new CodeCommentStatement("</summary>", true));
+            
             return codeField;
         }
+        
+        internal void Dispose()
+        {
+            varName = null;
+            type = null;
+            info = null;
+            description = null;
+            path = null;
+        }
     }
 }
\ No newline at end of file
diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs
new file mode 100644
index 0000000..2c0c4f9
--- /dev/null
+++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace Tools.ExcelResolver.Editor
+{
+    internal class TList : TType
+    {
+        internal override string TypeName => "list";
+        internal override Type RealType => typeof(List<>);
+        internal override object TryParseFrom(string s)
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs.meta b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs.meta
new file mode 100644
index 0000000..f89ef50
--- /dev/null
+++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TList.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 72125f85fbca4265998a4d0ea2b6b041
+timeCreated: 1737301711
\ No newline at end of file
diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector2.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector2.cs
index f9123e7..e1c705a 100644
--- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector2.cs
+++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector2.cs
@@ -5,7 +5,7 @@ namespace Tools.ExcelResolver.Editor
 {
     internal class TVector2 : TType
     {
-        internal override string TypeName => "Vector2";
+        internal override string TypeName => "vector2";
 
         internal override Type RealType => typeof(Vector2);
 
diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector3.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector3.cs
index 6f59d35..24245c3 100644
--- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector3.cs
+++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TVector3.cs
@@ -5,7 +5,7 @@ namespace Tools.ExcelResolver.Editor
 {
     internal class TVector3 : TType
     {
-        internal override string TypeName => "UnityEngine.Vector3";
+        internal override string TypeName => "vector3";
 
         internal override Type RealType => typeof(Vector3);
 
diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataCode.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataCode.cs
index 533dd34..b01df57 100644
--- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataCode.cs
+++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataCode.cs
@@ -62,21 +62,7 @@ namespace Tools.ExcelResolver.Editor
 
             foreach (var field in classCodeData.fields.Values)
             {
-                CodeMemberField codeField = new CodeMemberField
-                {
-                    Attributes = MemberAttributes.Public,
-                    Name = field.varName,
-                    Type = new CodeTypeReference(field.type.RealType),
-                    Comments =
-                    {
-                        new CodeCommentStatement("<summary>", true),
-                        new CodeCommentStatement(field.info, true),
-                    },
-                };
-                if (!string.IsNullOrEmpty(field.description)) 
-                    codeField.Comments.Add(new CodeCommentStatement($"<c>{field.description}</c>", true));
-                codeField.Comments.Add(new CodeCommentStatement("</summary>", true));
-                classType.Members.Add(codeField);
+                classType.Members.Add(field.GetCodeField());
             }
             
             #endregion