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 4fd9ae5..15c61f5 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs +++ b/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; } diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs index 2830ee6..f8d9037 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs +++ b/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 classCodeDataDict; [SerializeField] internal Dictionary md5Dict = new(); diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs index 5849b12..5e8e686 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs +++ b/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(); + classCodeDataDict = new Dictionary(); // 获取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) - { - Debug.LogError($"Excel:{excelFile.Name} don't have Sheet1 !!"); - continue; - } + Assert.IsTrue(worksheet != null, $"Excel:{excelFile.Name} don't have Sheet1 !!"); var classCodeData = new ClassCodeData(excelFile.Name[..^5]); classCodeData.fields = GetFieldData(worksheet, classCodeData); classCodeData.tableType = CheckTableTypeAndSetKeyField(worksheet, classCodeData); - WriteDataCode(classCodeData); - WriteUtilCode(classCodeData); - excelResolverConfig.classCodeDataDict.Add(worksheet, classCodeData); + if (needWriteCode) + { + 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); + } } } } diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs index 60879fd..eb5b871 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs +++ b/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; diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs index b73a3db..fd66105 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs +++ b/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 classCodeDataDict; [MenuItem("\u272dExcelResolver\u272d/ExcelResolverEditorWindow")] private static void OpenWindow() diff --git a/Assets/_Project/ExcelResolver/Excel/com.xlsx b/Assets/_Project/ExcelResolver/Excel/_com.xlsx similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/com.xlsx rename to Assets/_Project/ExcelResolver/Excel/_com.xlsx diff --git a/Assets/_Project/ExcelResolver/Excel/com.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/_com.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/com.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/_com.xlsx.meta diff --git a/Assets/_Project/ExcelResolver/Excel/_enum.xlsx b/Assets/_Project/ExcelResolver/Excel/_enum.xlsx deleted file mode 100644 index 046976d..0000000 Binary files a/Assets/_Project/ExcelResolver/Excel/_enum.xlsx and /dev/null differ diff --git a/Assets/_Project/ExcelResolver/Excel/_enum.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/_enum.xlsx.meta deleted file mode 100644 index ce90bec..0000000 --- a/Assets/_Project/ExcelResolver/Excel/_enum.xlsx.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d52f28019cc15b5489a82e4ce4ecc34d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ExcelResolver/Excel/_hero.xlsx b/Assets/_Project/ExcelResolver/Excel/_hero.xlsx new file mode 100644 index 0000000..d3104f1 Binary files /dev/null and b/Assets/_Project/ExcelResolver/Excel/_hero.xlsx differ diff --git a/Assets/_Project/ExcelResolver/Excel/hero.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/_hero.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/hero.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/_hero.xlsx.meta diff --git a/Assets/_Project/ExcelResolver/Excel/monster.xlsx b/Assets/_Project/ExcelResolver/Excel/_monster.xlsx similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/monster.xlsx rename to Assets/_Project/ExcelResolver/Excel/_monster.xlsx diff --git a/Assets/_Project/ExcelResolver/Excel/monster.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/_monster.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/monster.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/_monster.xlsx.meta diff --git a/Assets/_Project/ExcelResolver/Excel/monster3.xlsx b/Assets/_Project/ExcelResolver/Excel/_monster3.xlsx similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/monster3.xlsx rename to Assets/_Project/ExcelResolver/Excel/_monster3.xlsx diff --git a/Assets/_Project/ExcelResolver/Excel/monster3.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/_monster3.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/monster3.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/_monster3.xlsx.meta diff --git a/Assets/_Project/ExcelResolver/Excel/hero.xlsx b/Assets/_Project/ExcelResolver/Excel/hero.xlsx deleted file mode 100644 index f69216c..0000000 Binary files a/Assets/_Project/ExcelResolver/Excel/hero.xlsx and /dev/null differ diff --git a/Assets/_Project/ScriptableObject/Excel/Com.meta b/Assets/_Project/ScriptableObject/Excel/Com.meta deleted file mode 100644 index 1826f9d..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Com.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5d697dbce85032d4dba2a90d7bb50290 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset b/Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset deleted file mode 100644 index 7886603..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset +++ /dev/null @@ -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 diff --git a/Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset.meta b/Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset.meta deleted file mode 100644 index 8a6c35f..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Com/_ComUtil.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ee0eb7708acae845ae0445697042da4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Hero.meta b/Assets/_Project/ScriptableObject/Excel/Hero.meta deleted file mode 100644 index 5c7854d..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Hero.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 44b4794a46829ab458d412a9acd71eba -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset b/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset deleted file mode 100644 index ec9c9e3..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset +++ /dev/null @@ -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: diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset.meta b/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset.meta deleted file mode 100644 index 9fd9511..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Hero/_HeroUtil.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05ad337119e018146aff00aa4e9e09b5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster.meta b/Assets/_Project/ScriptableObject/Excel/Monster.meta deleted file mode 100644 index 2fa8a5f..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fe1113ebe4d26c6418661c6993c778d5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset b/Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset deleted file mode 100644 index 093b571..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset +++ /dev/null @@ -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: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset.meta b/Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset.meta deleted file mode 100644 index 519638d..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster/_MonsterUtil.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8506a93b0f3975940bafb97c6bc3b4bb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster3.meta b/Assets/_Project/ScriptableObject/Excel/Monster3.meta deleted file mode 100644 index 6be9a0b..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster3.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f681dec3cba786f4ba476100c5a6f29e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset b/Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset deleted file mode 100644 index ba30aa3..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset +++ /dev/null @@ -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: [] diff --git a/Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset.meta b/Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset.meta deleted file mode 100644 index 9264955..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster3/_Monster3Util.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3648edb4f0c677a4485b6b4c2deef683 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/Scripts/Generator/Excel/ComUtil.cs b/Assets/_Project/Scripts/Generator/Excel/ComUtil.cs deleted file mode 100644 index 9d6fd43..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/ComUtil.cs +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class ComUtil : SerializedScriptableObject, IExcelSOUtil - { - - /// - /// 初始仓库空位数 - /// - public int cangku_chushi; - - /// - /// 防御系数 - /// - public int des_xishu; - - /// - /// 初始解锁的塔 - /// - public List ta_chushi_unlock; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/ComUtil.cs.meta b/Assets/_Project/Scripts/Generator/Excel/ComUtil.cs.meta deleted file mode 100644 index 0090571..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/ComUtil.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 65d0d896e6a9aba4c86524d1ead223f2 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/Hero.cs b/Assets/_Project/Scripts/Generator/Excel/Hero.cs deleted file mode 100644 index 3695fac..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Hero.cs +++ /dev/null @@ -1,88 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class Hero : SerializedScriptableObject, IExcelSOData - { - - /// - /// 英雄 - /// - public int id; - - /// - /// 名称 - /// - public string name; - - /// - /// icon - /// - public string icon; - - /// - /// 有宠物 - /// - public bool has; - - /// - /// 血量 - /// - public int hp; - - /// - /// 攻击力 - /// - public int atk; - - /// - /// 移速 - /// - public float speed; - - /// - /// 位置 - /// - public Vector3 pos; - - /// - /// 位置 - /// - public Vector2 ches; - - /// - /// 攻击优先级 - /// - public List attack_target; - - /// - /// 你好 - /// - public Dictionary nihao; - - /// - /// - /// - public Dictionary attribute; - - /// - /// - /// - public CustomizeColor color; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta deleted file mode 100644 index 1f1b4bc..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: e8aa3c1560079b84cafbabe4bc0d2c8d \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs b/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs deleted file mode 100644 index a2b4b98..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class HeroUtil : SerializedScriptableObject, IExcelSOUtil - { - - public Dictionary Data; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta b/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta deleted file mode 100644 index 9ae8108..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 0b8ec7437f31db141b138472f0c2a3aa \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster.cs b/Assets/_Project/Scripts/Generator/Excel/Monster.cs deleted file mode 100644 index 7fd8343..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster.cs +++ /dev/null @@ -1,93 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class Monster : SerializedScriptableObject, IExcelSOData - { - - /// - /// 英雄 - /// - public int id; - - /// - /// 等级 - /// - public int level; - - /// - /// 名称 - /// - public string name; - - /// - /// icon - /// - public string icon; - - /// - /// 有宠物 - /// - public bool has; - - /// - /// 血量 - /// - public int hp; - - /// - /// 攻击力 - /// - public int atk; - - /// - /// 移速 - /// - public float speed; - - /// - /// 位置 - /// - public Vector3 pos; - - /// - /// 位置 - /// - public Vector2 ches; - - /// - /// 攻击优先级 - /// - public List attack_target; - - /// - /// 你好 - /// - public Dictionary nihao; - - /// - /// - /// - public Dictionary attribute; - - /// - /// - /// - public CustomizeColor color; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Monster.cs.meta deleted file mode 100644 index 6baf8d9..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 07476013186559f459c8b934922db079 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster3.cs b/Assets/_Project/Scripts/Generator/Excel/Monster3.cs deleted file mode 100644 index 2da1903..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster3.cs +++ /dev/null @@ -1,98 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class Monster3 : SerializedScriptableObject, IExcelSOData - { - - /// - /// 英雄 - /// - public int id; - - /// - /// 等级 - /// - public int level; - - /// - /// 星级 - /// - public int star; - - /// - /// 名称 - /// - public string name; - - /// - /// icon - /// - public string icon; - - /// - /// 有宠物 - /// - public bool has; - - /// - /// 血量 - /// - public int hp; - - /// - /// 攻击力 - /// - public int atk; - - /// - /// 移速 - /// - public float speed; - - /// - /// 位置 - /// - public Vector3 pos; - - /// - /// 位置 - /// - public Vector2 ches; - - /// - /// 攻击优先级 - /// - public List attack_target; - - /// - /// 你好 - /// - public Dictionary nihao; - - /// - /// - /// - public Dictionary attribute; - - /// - /// - /// - public CustomizeColor color; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster3.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Monster3.cs.meta deleted file mode 100644 index 61a1cf0..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster3.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 916e0a5dbd451394bb4ac42b142bbb9d \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs b/Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs deleted file mode 100644 index cc31a3b..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class Monster3Util : SerializedScriptableObject, IExcelSOUtil - { - - public List Data; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs.meta deleted file mode 100644 index 9bee5c4..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster3Util.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 352ae4160560b684498c8ef06a908f94 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs b/Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs deleted file mode 100644 index 6004c0f..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs +++ /dev/null @@ -1,25 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -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; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs.meta b/Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs.meta deleted file mode 100644 index c3a8768..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/MonsterUtil.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 597b3ca9edd08af4290f8bdc398d04a1 \ No newline at end of file