代码整理

Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs

@@ -67,7 +67,7 @@ namespace Tools.ExcelResolver.Editor
             where T : TType
         {
             object result;
-            if (string.IsNullOrEmpty(cell.Text))    // 如果单元格为空，则返回默认值
+            if (string.IsNullOrEmpty(cell?.Text))    // 如果单元格为空，则返回默认值
             {
                 result = type.DefaultValue;
             }

Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs

@@ -22,9 +22,6 @@ namespace Tools.ExcelResolver.Editor
         [SerializeField] internal bool isClearConsole = true;
         [LabelText("使用MD5跳过未修改的表格")]
         [SerializeField] internal bool useMD5 = true;
-
-        
-        [SerializeField] internal Dictionary<ExcelWorksheet, ClassCodeData> classCodeDataDict;
         
         [SerializeField] internal Dictionary<string, string> md5Dict = new();
         

Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs

@@ -13,13 +13,14 @@ namespace Tools.ExcelResolver.Editor
 {
     public sealed partial class ExcelResolverEditorWindow
     {
-        private void ReadExcel()
+        private void ReadExcel(bool needWriteCode = true)
         {
-            excelResolverConfig.classCodeDataDict = new Dictionary<ExcelWorksheet, ClassCodeData>();
+            classCodeDataDict = new Dictionary<ExcelWorksheet, ClassCodeData>();
             
             // 获取Excel文件
             excelResolverConfig.MakeSureDirectory();
-            var excelFiles = new DirectoryInfo(excelResolverConfig.ExcelPathRoot).GetFiles("*.xlsx").Where(f => !f.Name.StartsWith("~$") && !f.Name.StartsWith("_"));
+            var excelFiles = new DirectoryInfo(excelResolverConfig.ExcelPathRoot).GetFiles("*.xlsx")
+                .Where(f => !f.Name.StartsWith("~$") && !f.Name.StartsWith("_"));
             if (excelFiles.Count() == 0)
             {
                 Debug.LogError("未检测到Excel文件，请检查路径");
@@ -41,24 +42,23 @@ namespace Tools.ExcelResolver.Editor
                 
                 using ExcelPackage package = new ExcelPackage(stream);
                 ExcelWorksheet worksheet = package.Workbook.Worksheets["Sheet1"];
-                if (null == worksheet)
+                Assert.IsTrue(worksheet != null, $"Excel:{excelFile.Name} don't have Sheet1 ！！");
-                {
-                    Debug.LogError($"Excel:{excelFile.Name} don't have Sheet1 ！！");
-                    continue;
-                }
                 
                 var classCodeData = new ClassCodeData(excelFile.Name[..^5]);
                 
                 classCodeData.fields = GetFieldData(worksheet, classCodeData);
                 classCodeData.tableType = CheckTableTypeAndSetKeyField(worksheet, classCodeData);
 
-                WriteDataCode(classCodeData);
+                if (needWriteCode)
-                WriteUtilCode(classCodeData);
+                {
-                excelResolverConfig.classCodeDataDict.Add(worksheet, classCodeData);
+                    WriteDataCode(classCodeData);
+                    WriteUtilCode(classCodeData);
+                }
+                classCodeDataDict.Add(worksheet, classCodeData);
                 Debug.Log($"读取Excel文件：'{excelFile.Name}'，并生成代码");
             }
 
-            if (excelResolverConfig.classCodeDataDict.Count == 0)
+            if (classCodeDataDict.Count == 0)
             {
                 Debug.LogError("未检测到Excel文件改动，如需重新生成，请清空md5Dict");
                 return;
@@ -94,7 +94,10 @@ namespace Tools.ExcelResolver.Editor
                 {
                     isCompilationFinished = false;
                     Debug.Log("Assembly-CSharp加载完成，开始写入SO数据");
-                    WriteDataSO();
+                    if (classCodeDataDict == null)
+                    {
+                        ReadExcel(false);
+                    }
                 }
             }
         }

Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs

@@ -13,7 +13,7 @@ namespace Tools.ExcelResolver.Editor
     {
         private void WriteDataSO()
         {
-            foreach (var classCodeDataDictPair in excelResolverConfig.classCodeDataDict)
+            foreach (var classCodeDataDictPair in classCodeDataDict)
             {
                 var worksheet = classCodeDataDictPair.Key;
                 var classCodeData = classCodeDataDictPair.Value;

Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using OfficeOpenXml;
 using Sirenix.OdinInspector;
 using Sirenix.OdinInspector.Editor;
 using Sirenix.Utilities;
@@ -11,6 +13,9 @@ namespace Tools.ExcelResolver.Editor
     public sealed partial class ExcelResolverEditorWindow : OdinEditorWindow
     {
         [SerializeField] private ExcelResolverEditorConfig excelResolverConfig;
+
+        
+        [ShowInInspector] private Dictionary<ExcelWorksheet, ClassCodeData> classCodeDataDict;
         
         [MenuItem("\u272dExcelResolver\u272d/ExcelResolverEditorWindow")]
         private static void OpenWindow()

Assets/_Project/ExcelResolver/Excel/_enum.xlsx.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d52f28019cc15b5489a82e4ce4ecc34d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Com.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5d697dbce85032d4dba2a90d7bb50290
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset

@@ -1,26 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 65d0d896e6a9aba4c86524d1ead223f2, type: 3}
-  m_Name: _ComUtil
-  m_EditorClassIdentifier: 
-  serializationData:
-    SerializedFormat: 2
-    SerializedBytes: 
-    ReferencedUnityObjects: []
-    SerializedBytesString: 
-    Prefab: {fileID: 0}
-    PrefabModificationsReferencedUnityObjects: []
-    PrefabModifications: []
-    SerializationNodes: []
-  cangku_chushi: 3
-  des_xishu: 2
-  ta_chushi_unlock: 01000000cc00000091010000cb000000

Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7ee0eb7708acae845ae0445697042da4
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Hero.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 44b4794a46829ab458d412a9acd71eba
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset

@@ -1,26 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0b8ec7437f31db141b138472f0c2a3aa, type: 3}
-  m_Name: _HeroUtil
-  m_EditorClassIdentifier: 
-  serializationData:
-    SerializedFormat: 2
-    SerializedBytes: 
-    ReferencedUnityObjects: []
-    SerializedBytesString: 
-    Prefab: {fileID: 0}
-    PrefabModificationsReferencedUnityObjects: []
-    PrefabModifications: []
-    SerializationNodes:
-    - Name: Data
-      Entry: 6
-      Data: 

Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 05ad337119e018146aff00aa4e9e09b5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Monster.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fe1113ebe4d26c6418661c6993c778d5
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset

@@ -1,26 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 597b3ca9edd08af4290f8bdc398d04a1, type: 3}
-  m_Name: _MonsterUtil
-  m_EditorClassIdentifier: 
-  serializationData:
-    SerializedFormat: 2
-    SerializedBytes: 
-    ReferencedUnityObjects: []
-    SerializedBytesString: 
-    Prefab: {fileID: 0}
-    PrefabModificationsReferencedUnityObjects: []
-    PrefabModifications: []
-    SerializationNodes:
-    - Name: Data
-      Entry: 6
-      Data: 

Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8506a93b0f3975940bafb97c6bc3b4bb
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Monster3.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f681dec3cba786f4ba476100c5a6f29e
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset

@@ -1,24 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 352ae4160560b684498c8ef06a908f94, type: 3}
-  m_Name: _Monster3Util
-  m_EditorClassIdentifier: 
-  serializationData:
-    SerializedFormat: 2
-    SerializedBytes: 
-    ReferencedUnityObjects: []
-    SerializedBytesString: 
-    Prefab: {fileID: 0}
-    PrefabModificationsReferencedUnityObjects: []
-    PrefabModifications: []
-    SerializationNodes: []
-  Data: []

Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3648edb4f0c677a4485b6b4c2deef683
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Project/Scripts/Generator/Excel/ComUtil.cs

@@ -1,38 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tools.ExcelResolver
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Sirenix.OdinInspector;
-    
-    
-    public class ComUtil : SerializedScriptableObject, IExcelSOUtil
-    {
-        
-        /// <summary>
-        /// 初始仓库空位数
-        /// </summary>
-        public int cangku_chushi;
-        
-        /// <summary>
-        /// 防御系数
-        /// </summary>
-        public int des_xishu;
-        
-        /// <summary>
-        /// 初始解锁的塔
-        /// </summary>
-        public List<Int32> ta_chushi_unlock;
-    }
-}

Assets/_Project/Scripts/Generator/Excel/ComUtil.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 65d0d896e6a9aba4c86524d1ead223f2

Assets/_Project/Scripts/Generator/Excel/Hero.cs

@@ -1,88 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tools.ExcelResolver
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Sirenix.OdinInspector;
-    
-    
-    public class Hero : SerializedScriptableObject, IExcelSOData
-    {
-        
-        /// <summary>
-        /// 英雄
-        /// </summary>
-        public int id;
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string name;
-        
-        /// <summary>
-        /// icon
-        /// </summary>
-        public string icon;
-        
-        /// <summary>
-        /// 有宠物
-        /// </summary>
-        public bool has;
-        
-        /// <summary>
-        /// 血量
-        /// </summary>
-        public int hp;
-        
-        /// <summary>
-        /// 攻击力
-        /// </summary>
-        public int atk;
-        
-        /// <summary>
-        /// 移速
-        /// </summary>
-        public float speed;
-        
-        /// <summary>
-        /// 位置
-        /// </summary>
-        public Vector3 pos;
-        
-        /// <summary>
-        /// 位置
-        /// </summary>
-        public Vector2 ches;
-        
-        /// <summary>
-        /// 攻击优先级
-        /// </summary>
-        public List<Vector2> attack_target;
-        
-        /// <summary>
-        /// 你好
-        /// </summary>
-        public Dictionary<Int32, Single> nihao;
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        public Dictionary<Attribute, Int32> attribute;
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        public CustomizeColor color;
-    }
-}

Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: e8aa3c1560079b84cafbabe4bc0d2c8d

Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tools.ExcelResolver
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Sirenix.OdinInspector;
-    
-    
-    public class HeroUtil : SerializedScriptableObject, IExcelSOUtil
-    {
-        
-        public Dictionary<System.Int32, Hero> Data;
-    }
-}

Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 0b8ec7437f31db141b138472f0c2a3aa

Assets/_Project/Scripts/Generator/Excel/Monster.cs

@@ -1,93 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tools.ExcelResolver
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Sirenix.OdinInspector;
-    
-    
-    public class Monster : SerializedScriptableObject, IExcelSOData
-    {
-        
-        /// <summary>
-        /// 英雄
-        /// </summary>
-        public int id;
-        
-        /// <summary>
-        /// 等级
-        /// </summary>
-        public int level;
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string name;
-        
-        /// <summary>
-        /// icon
-        /// </summary>
-        public string icon;
-        
-        /// <summary>
-        /// 有宠物
-        /// </summary>
-        public bool has;
-        
-        /// <summary>
-        /// 血量
-        /// </summary>
-        public int hp;
-        
-        /// <summary>
-        /// 攻击力
-        /// </summary>
-        public int atk;
-        
-        /// <summary>
-        /// 移速
-        /// </summary>
-        public float speed;
-        
-        /// <summary>
-        /// 位置
-        /// </summary>
-        public Vector3 pos;
-        
-        /// <summary>
-        /// 位置
-        /// </summary>
-        public Vector2 ches;
-        
-        /// <summary>
-        /// 攻击优先级
-        /// </summary>
-        public List<Vector2> attack_target;
-        
-        /// <summary>
-        /// 你好
-        /// </summary>
-        public Dictionary<Int32, Single> nihao;
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        public Dictionary<Attribute, Int32> attribute;
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        public CustomizeColor color;
-    }
-}

Assets/_Project/Scripts/Generator/Excel/Monster.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 07476013186559f459c8b934922db079

Assets/_Project/Scripts/Generator/Excel/Monster3.cs

@@ -1,98 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tools.ExcelResolver
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Sirenix.OdinInspector;
-    
-    
-    public class Monster3 : SerializedScriptableObject, IExcelSOData
-    {
-        
-        /// <summary>
-        /// 英雄
-        /// </summary>
-        public int id;
-        
-        /// <summary>
-        /// 等级
-        /// </summary>
-        public int level;
-        
-        /// <summary>
-        /// 星级
-        /// </summary>
-        public int star;
-        
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string name;
-        
-        /// <summary>
-        /// icon
-        /// </summary>
-        public string icon;
-        
-        /// <summary>
-        /// 有宠物
-        /// </summary>
-        public bool has;
-        
-        /// <summary>
-        /// 血量
-        /// </summary>
-        public int hp;
-        
-        /// <summary>
-        /// 攻击力
-        /// </summary>
-        public int atk;
-        
-        /// <summary>
-        /// 移速
-        /// </summary>
-        public float speed;
-        
-        /// <summary>
-        /// 位置
-        /// </summary>
-        public Vector3 pos;
-        
-        /// <summary>
-        /// 位置
-        /// </summary>
-        public Vector2 ches;
-        
-        /// <summary>
-        /// 攻击优先级
-        /// </summary>
-        public List<Vector2> attack_target;
-        
-        /// <summary>
-        /// 你好
-        /// </summary>
-        public Dictionary<Int32, Single> nihao;
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        public Dictionary<Attribute, Int32> attribute;
-        
-        /// <summary>
-        /// 
-        /// </summary>
-        public CustomizeColor color;
-    }
-}

Assets/_Project/Scripts/Generator/Excel/Monster3.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 916e0a5dbd451394bb4ac42b142bbb9d

Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tools.ExcelResolver
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Sirenix.OdinInspector;
-    
-    
-    public class Monster3Util : SerializedScriptableObject, IExcelSOUtil
-    {
-        
-        public List<Monster3> Data;
-    }
-}

Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 352ae4160560b684498c8ef06a908f94

Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs

@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Tools.ExcelResolver
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using UnityEngine;
-    using Sirenix.OdinInspector;
-    
-    
-    public class MonsterUtil : SerializedScriptableObject, IExcelSOUtil
-    {
-        
-        public Dictionary<(System.Int32, System.Int32), Monster> Data;
-    }
-}

Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 597b3ca9edd08af4290f8bdc398d04a1