From 2b18d39744830a0666a863910029341e2bb6494b Mon Sep 17 00:00:00 2001
From: coffee <985942825@qq.com>
Date: Mon, 27 Jan 2025 03:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BB=8E=E5=AE=9E=E4=BE=8B=E4=B8=AD=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Unity-Tools/Core/Util/ProfilerUtil.cs  |   9 ++
 .../Core/Util/ProfilerUtil.cs.meta            |   3 +
 .../ExcelResolverEditorWindow.WriteDataSO.cs  |  23 ++----
 .../ExcelResolverEditorWindow.WriteUtilSO.cs  |   9 +-
 Assets/_Project/ExcelResolver/Excel/hero.xlsx | Bin 11143 -> 21160 bytes
 .../Excel/Hero/{Hero_6.asset => Hero_4.asset} |  78 +++++++++++++++---
 .../{Hero_6.asset.meta => Hero_4.asset.meta}  |   2 +-
 .../Excel/Hero/_HeroUtil.asset                |   4 +-
 8 files changed, 92 insertions(+), 36 deletions(-)
 create mode 100644 Assets/Unity-Tools/Core/Util/ProfilerUtil.cs
 create mode 100644 Assets/Unity-Tools/Core/Util/ProfilerUtil.cs.meta
 rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_6.asset => Hero_4.asset} (64%)
 rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_6.asset.meta => Hero_4.asset.meta} (79%)

diff --git a/Assets/Unity-Tools/Core/Util/ProfilerUtil.cs b/Assets/Unity-Tools/Core/Util/ProfilerUtil.cs
new file mode 100644
index 0000000..949fcdf
--- /dev/null
+++ b/Assets/Unity-Tools/Core/Util/ProfilerUtil.cs
@@ -0,0 +1,9 @@
+using Unity.Profiling;
+
+namespace Tools
+{
+    public static class ProfilerUtil
+    {
+        public static readonly ProfilerMarker MyMarker = new ProfilerMarker("MyCustomCode");
+    }
+}
\ No newline at end of file
diff --git a/Assets/Unity-Tools/Core/Util/ProfilerUtil.cs.meta b/Assets/Unity-Tools/Core/Util/ProfilerUtil.cs.meta
new file mode 100644
index 0000000..e3ad0d8
--- /dev/null
+++ b/Assets/Unity-Tools/Core/Util/ProfilerUtil.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ab28fc99e92b409aadd67ec27519c3cc
+timeCreated: 1737917311
\ No newline at end of file
diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs
index 058d174..dfc0657 100644
--- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs
@@ -20,16 +20,10 @@ namespace Tools.ExcelResolver.Editor
                 var worksheet = classCodeDataDictPair.Key;
                 var classCodeData = classCodeDataDictPair.Value;
                 
-                Type dataSOType = ExcelResolverUtil.GetOrCacheTypeByName(classCodeData.className);
-            
-                if (dataSOType == null)
-                {
-                    Debug.LogError($"Class '{classCodeData.className}SO' not found. Please generate classes first (or check namespace).");
-                    return;
-                }
+                var dataName = $"{classCodeData.className}";
                 var path = $"{excelResolverConfig.SOPathRoot}/{classCodeData.className}/";
                 
-                string[] assetGuids = AssetDatabase.FindAssets($"t:{dataSOType}", new[] { path });
+                string[] assetGuids = AssetDatabase.FindAssets($"t:{dataName}", new[] { path });
                 Dictionary<string, ScriptableObject> originAssets = new();
                 for (int i = 0; i < assetGuids.Length; i++)
                 {
@@ -50,7 +44,7 @@ namespace Tools.ExcelResolver.Editor
 
                     if (originAssets.ContainsKey(assetName))
                     {
-                        set(originAssets[assetName], dataSOType, worksheet, row, classCodeData);
+                        set(originAssets[assetName], worksheet, row, classCodeData);
                         EditorUtility.SetDirty(originAssets[assetName]);
                         Debug.Log($"刷新：{assetName}", originAssets[assetName]);
                         result.Add(originAssets[assetName]);
@@ -58,8 +52,8 @@ namespace Tools.ExcelResolver.Editor
                     }
                     else
                     {
-                        ScriptableObject instance = ScriptableObject.CreateInstance(dataSOType);
-                        set(instance, dataSOType, worksheet, row, classCodeData);
+                        ScriptableObject instance = ScriptableObject.CreateInstance(dataName);
+                        set(instance, worksheet, row, classCodeData);
                         AssetDatabase.CreateAsset(instance, fullPath);
                         Debug.Log($"创建：{assetName}", instance);
                         result.Add(instance);
@@ -72,13 +66,14 @@ namespace Tools.ExcelResolver.Editor
                     AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(value));
                 }
                 
-                WriteUtilSO(path, dataSOType, result, classCodeData);
+                WriteUtilSO(path, result, classCodeData);
             }
+            
             AssetDatabase.SaveAssets();
             GC.Collect();
             GC.WaitForPendingFinalizers();
 
-            void set(ScriptableObject instance, Type dataSOType, ExcelWorksheet worksheet, int row, ClassCodeData classCodeData)
+            void set(ScriptableObject instance, ExcelWorksheet worksheet, int row, ClassCodeData classCodeData)
             {
                 foreach (var pair in classCodeData.fields)
                 {
@@ -87,7 +82,7 @@ namespace Tools.ExcelResolver.Editor
                         
                     var cell = worksheet.Cells[row, col];
                     object convertedValue = ExcelResolverUtil.ConvertCellValue(cell, fieldData.type, classCodeData.className);
-                    FieldInfo fieldInfo = dataSOType.GetField(fieldData.varName);
+                    FieldInfo fieldInfo = instance.GetType().GetField(fieldData.varName);
                     if (fieldInfo == null) throw new Exception($"{classCodeData.className}中不存在字段：{fieldData.varName}");
                     fieldInfo.SetValue(instance, convertedValue);
                 }
diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteUtilSO.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteUtilSO.cs
index 6a8ea69..8340afd 100644
--- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteUtilSO.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteUtilSO.cs
@@ -8,13 +8,11 @@ namespace Tools.ExcelResolver.Editor
 {
     public sealed partial class ExcelResolverEditorWindow
     {
-        private void WriteUtilSO(string path, Type dataSOType, List<ScriptableObject> assets, ClassCodeData classCodeData)
+        private void WriteUtilSO(string path, List<ScriptableObject> assets, ClassCodeData classCodeData)
         {
             var utilName = $"{classCodeData.className}Util";
             var utilPath = $"{path}/_{utilName}.asset";
             
-            Type utilType = ExcelResolverUtil.GetOrCacheTypeByName(utilName);
-            
             var instance = AssetDatabase.LoadAssetAtPath<ScriptableObject>(utilPath);
             if (instance == null)
             {
@@ -26,12 +24,11 @@ namespace Tools.ExcelResolver.Editor
             {
                 case TableType.SingleKeyTable:
                     var keyField = classCodeData.keyField[0];
-                    var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>).MakeGenericType(keyField.type.RealType, dataSOType));
+                    var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>).MakeGenericType(keyField.type.RealType, assets[0].GetType()));
                     
-                    var keyFieldInfo = dataSOType.GetField(keyField.varName);
                     foreach (var asset in assets)
                     {
-                        var key = keyFieldInfo.GetValue(asset);
+                        var key = asset.GetType().GetField(keyField.varName).GetValue(asset);
                         dict[key] = asset;
                     }
                     instance.GetType().GetField("Data").SetValue(instance, dict);
diff --git a/Assets/_Project/ExcelResolver/Excel/hero.xlsx b/Assets/_Project/ExcelResolver/Excel/hero.xlsx
index b3cf3bf748a9655ade50134e1b8f9f75a246c034..475ac0e3c94b143eeec012b3c3985a8513865287 100644
GIT binary patch
delta 12486
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
A%>V!Z

delta 2408
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
a7EntC1^@s6022Tc0Fwj&0Ny450002fT2sLQ

diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_6.asset b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_4.asset
similarity index 64%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_6.asset
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_4.asset
index 5b99bd0..65e2853 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_6.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_4.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e8aa3c1560079b84cafbabe4bc0d2c8d, type: 3}
-  m_Name: Hero_6
+  m_Name: Hero_4
   m_EditorClassIdentifier: 
   serializationData:
     SerializedFormat: 2
@@ -34,7 +34,31 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 0
+      Data: 2
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 3
+      Data: 2
+    - Name: $v
+      Entry: 4
+      Data: 2.3
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 3
+      Data: 5
+    - Name: $v
+      Entry: 4
+      Data: 4.6
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 
@@ -60,21 +84,49 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
+      Data: 2
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 3
       Data: 0
+    - Name: $v
+      Entry: 3
+      Data: 500
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 3
+      Data: 1
+    - Name: $v
+      Entry: 3
+      Data: 300
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 
     - Name: 
       Entry: 8
       Data: 
-  id: 6
-  name: 
-  icon: hero_6
-  has: 0
-  hp: 0
-  atk: 0
-  speed: 0
-  pos: {x: 0, y: 0, z: 0}
-  ches: {x: 0, y: 0}
-  attack_target: []
-  color: 0
+  id: 4
+  name: "\u9053\u58EB"
+  icon: hero_1
+  has: 1
+  hp: 100
+  atk: 20
+  speed: 1.2
+  pos: {x: 0, y: 1, z: 9}
+  ches: {x: 0, y: 1}
+  attack_target:
+  - {x: 1, y: 2}
+  - {x: 1, y: 2}
+  - {x: 1, y: 2}
+  - {x: 1, y: 2}
+  color: 1
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_6.asset.meta b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_4.asset.meta
similarity index 79%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_6.asset.meta
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_4.asset.meta
index ff9650f..767008d 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_6.asset.meta
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_4.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fd4758da888e8054b897780d3fa8f13a
+guid: 4f9da86093404c6449ad6f21e1207cb0
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset b/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset
index bf8a38d..9b22469 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset
@@ -19,7 +19,7 @@ MonoBehaviour:
     - {fileID: 11400000, guid: 3b98756cd197195498b14b5e67935cbe, type: 2}
     - {fileID: 11400000, guid: cdde19489f16dce429041c1d6e207864, type: 2}
     - {fileID: 11400000, guid: 934bc10c06f0592419baf474987cc0a7, type: 2}
-    - {fileID: 11400000, guid: fd4758da888e8054b897780d3fa8f13a, type: 2}
+    - {fileID: 11400000, guid: 4f9da86093404c6449ad6f21e1207cb0, type: 2}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -80,7 +80,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 3
-      Data: 6
+      Data: 4
     - Name: $v
       Entry: 10
       Data: 3