From 2715dcf4950431b0c8ad357ef7d1284da77daf01 Mon Sep 17 00:00:00 2001 From: zhengchang <985942825@qq.com> Date: Wed, 12 Feb 2025 14:11:46 +0800 Subject: [PATCH] =?UTF-8?q?TClassAndStruct=E5=AF=BC=E8=A1=A8=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/Core/Types/TClassAndStruct.cs | 14 ++- .../Core/Util/ExcelResolverUtil.Cell.cs | 16 ++- .../ExcelResolverEditorWindow.ReadExcel.cs | 2 +- .../ExcelResolverEditorWindow.WriteDataSO.cs | 4 +- .../ExcelResolverEditorWindow.WriteUtilSO.cs | 4 +- .../Excel/{_com.xlsx => ##com.xlsx} | Bin .../Excel/{_com.xlsx.meta => ##com.xlsx.meta} | 0 .../Excel/{_hero.xlsx => ##hero.xlsx} | Bin .../{_hero.xlsx.meta => ##hero.xlsx.meta} | 0 .../Excel/{_monster.xlsx => ##monster.xlsx} | Bin ..._monster.xlsx.meta => ##monster.xlsx.meta} | 0 .../Excel/{monster2.xlsx => ##monster2.xlsx} | Bin ...onster2.xlsx.meta => ##monster2.xlsx.meta} | 0 .../Excel/{_Test.xlsx => testExcel.xlsx} | Bin 11146 -> 11143 bytes .../{_Test.xlsx.meta => testExcel.xlsx.meta} | 0 .../Excel/monster2/_monster2Util.asset | 71 ------------- .../Excel/monster2/monster2_1_1_1.asset | 84 ---------------- .../Excel/{monster2.meta => testExcel.meta} | 2 +- .../Excel/testExcel/_testExcelUtil.asset | 25 +++++ .../_testExcelUtil.asset.meta} | 2 +- .../Excel/testExcel/testExcel_6.asset | 42 ++++++++ .../testExcel_6.asset.meta} | 2 +- .../Scripts/Generator/Excel/monster2.cs | 93 ------------------ .../Scripts/Generator/Excel/monster2.cs.meta | 2 - .../Generator/Excel/monster2Util.cs.meta | 2 - .../Scripts/Generator/Excel/testExcel.cs | 33 +++++++ .../Scripts/Generator/Excel/testExcel.cs.meta | 2 + .../{monster2Util.cs => testExcelUtil.cs} | 4 +- .../Generator/Excel/testExcelUtil.cs.meta | 2 + 29 files changed, 135 insertions(+), 271 deletions(-) rename Assets/_Project/ExcelResolver/Excel/{_com.xlsx => ##com.xlsx} (100%) rename Assets/_Project/ExcelResolver/Excel/{_com.xlsx.meta => ##com.xlsx.meta} (100%) rename Assets/_Project/ExcelResolver/Excel/{_hero.xlsx => ##hero.xlsx} (100%) rename Assets/_Project/ExcelResolver/Excel/{_hero.xlsx.meta => ##hero.xlsx.meta} (100%) rename Assets/_Project/ExcelResolver/Excel/{_monster.xlsx => ##monster.xlsx} (100%) rename Assets/_Project/ExcelResolver/Excel/{_monster.xlsx.meta => ##monster.xlsx.meta} (100%) rename Assets/_Project/ExcelResolver/Excel/{monster2.xlsx => ##monster2.xlsx} (100%) rename Assets/_Project/ExcelResolver/Excel/{monster2.xlsx.meta => ##monster2.xlsx.meta} (100%) rename Assets/_Project/ExcelResolver/Excel/{_Test.xlsx => testExcel.xlsx} (62%) rename Assets/_Project/ExcelResolver/Excel/{_Test.xlsx.meta => testExcel.xlsx.meta} (100%) delete mode 100644 Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset delete mode 100644 Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset rename Assets/_Project/ScriptableObject/Excel/{monster2.meta => testExcel.meta} (77%) create mode 100644 Assets/_Project/ScriptableObject/Excel/testExcel/_testExcelUtil.asset rename Assets/_Project/ScriptableObject/Excel/{monster2/monster2_1_1_1.asset.meta => testExcel/_testExcelUtil.asset.meta} (79%) create mode 100644 Assets/_Project/ScriptableObject/Excel/testExcel/testExcel_6.asset rename Assets/_Project/ScriptableObject/Excel/{monster2/_monster2Util.asset.meta => testExcel/testExcel_6.asset.meta} (79%) delete mode 100644 Assets/_Project/Scripts/Generator/Excel/monster2.cs delete mode 100644 Assets/_Project/Scripts/Generator/Excel/monster2.cs.meta delete mode 100644 Assets/_Project/Scripts/Generator/Excel/monster2Util.cs.meta create mode 100644 Assets/_Project/Scripts/Generator/Excel/testExcel.cs create mode 100644 Assets/_Project/Scripts/Generator/Excel/testExcel.cs.meta rename Assets/_Project/Scripts/Generator/Excel/{monster2Util.cs => testExcelUtil.cs} (79%) create mode 100644 Assets/_Project/Scripts/Generator/Excel/testExcelUtil.cs.meta diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs index 6afcd2f..51294fb 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs @@ -21,7 +21,7 @@ namespace Tools.ExcelResolver.Editor internal override object DefaultValue => null; internal override string FieldWriteFormat { get; } - private TType[] tType; + private readonly TType[] tType; // 初始化时创建可以减少运行时开销 internal override bool String2TType(string typeText, out TType result) { @@ -34,10 +34,16 @@ namespace Tools.ExcelResolver.Editor throw new NotImplementedException("请使用另一个重载方法"); } - internal object TryParseFrom(int row, int startCol, ExcelWorksheet worksheet) + internal object TryParseFrom(int row, int col, ExcelWorksheet worksheet) { - - return null; + var obj = Activator.CreateInstance(RealType); + var fields = RealType.GetFields(); + for (int i = 0; i < fields.Length; i++) + { + var cellText = worksheet.Cells[row, col + i].Text; + fields[i].SetValue(obj, tType[i].TryParseFrom(cellText)); + } + return obj; } } } \ No newline at end of file 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 cce766f..d3b9f78 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs @@ -55,23 +55,33 @@ namespace Tools.ExcelResolver.Editor /// /// 将TType转换为C#对象 /// - /// + /// + /// + /// /// /// /// /// /// - internal static object ConvertCellValue(ExcelRange cell, T type, string className) + internal static object ConvertCellValue(int row, int col, ExcelWorksheet worksheet, T type, string className) where T : TType { object result; + var cell = worksheet.Cells[row, col]; if (string.IsNullOrEmpty(cell?.Text)) // 如果单元格为空，则返回默认值 { result = type.DefaultValue; } else { - result = type.TryParseFrom(cell.Text.Trim()); + if (type is TClassAndStruct classAndStruct) + { + result = classAndStruct.TryParseFrom(row, col, worksheet); + } + else + { + result = type.TryParseFrom(cell.Text.Trim()); + } } if (result != null) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs index 97a4220..ef541ed 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.ReadExcel.cs @@ -22,7 +22,7 @@ namespace Tools.ExcelResolver.Editor // 获取Excel文件 excelResolverConfig.MakeSureDirectory(); var removeFiles = new DirectoryInfo(excelResolverConfig.SOPathRoot).GetDirectories(); - 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("##")); removeFiles = removeFiles.Where(f => excelFiles.All(ef => ef.Name[..^5] != f.Name)).ToArray(); foreach (var removeFile in removeFiles) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs index eb5b871..195f2cd 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteDataSO.cs @@ -90,9 +90,7 @@ namespace Tools.ExcelResolver.Editor { var col = pair.Key; var fieldData = pair.Value; - - var cell = worksheet.Cells[row, col]; - object convertedValue = ExcelResolverUtil.ConvertCellValue(cell, fieldData.type, classCodeData.className); + object convertedValue = ExcelResolverUtil.ConvertCellValue(row, col, worksheet, fieldData.type, classCodeData.className); 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 8e0a53b..5f1f649 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteUtilSO.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteUtilSO.cs @@ -208,9 +208,7 @@ namespace Tools.ExcelResolver.Editor var row = pair.Key; var fieldData = pair.Value; - var cell = worksheet.Cells[row, 3]; - object convertedValue = - ExcelResolverUtil.ConvertCellValue(cell, fieldData.type, classCodeData.className); + object convertedValue = ExcelResolverUtil.ConvertCellValue(row, 3, worksheet, fieldData.type, classCodeData.className); 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/_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/_hero.xlsx b/Assets/_Project/ExcelResolver/Excel/##hero.xlsx similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/_hero.xlsx rename to Assets/_Project/ExcelResolver/Excel/##hero.xlsx 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/monster2.xlsx b/Assets/_Project/ExcelResolver/Excel/##monster2.xlsx similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/monster2.xlsx rename to Assets/_Project/ExcelResolver/Excel/##monster2.xlsx diff --git a/Assets/_Project/ExcelResolver/Excel/monster2.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/##monster2.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/monster2.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/##monster2.xlsx.meta diff --git a/Assets/_Project/ExcelResolver/Excel/_Test.xlsx b/Assets/_Project/ExcelResolver/Excel/testExcel.xlsx similarity index 62% rename from Assets/_Project/ExcelResolver/Excel/_Test.xlsx rename to Assets/_Project/ExcelResolver/Excel/testExcel.xlsx index 079b167d8b289394d42712d5908a309a593fe7f6..f4f378c971489cd291ded3c4c2afdb66c274fce4 100644 GIT binary patch delta 2001 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 diff --git a/Assets/_Project/ExcelResolver/Excel/_Test.xlsx.meta b/Assets/_Project/ExcelResolver/Excel/testExcel.xlsx.meta similarity index 100% rename from Assets/_Project/ExcelResolver/Excel/_Test.xlsx.meta rename to Assets/_Project/ExcelResolver/Excel/testExcel.xlsx.meta diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset b/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset deleted file mode 100644 index b75bfed..0000000 --- a/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset +++ /dev/null @@ -1,71 +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: dccd381378a062b499ddc03703bfa842, type: 3} - m_Name: _monster2Util - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: - - {fileID: 11400000, guid: 4a8c4100d6943fa4a9dff3024cf251e4, type: 2} - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: - - Name: Data - Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.ValueTuple`3[[System.Int32, - mscorlib],[System.Int32, mscorlib],[System.Int32, mscorlib]], mscorlib],[Tools.ExcelResolver.monster2, - Assembly-CSharp]], mscorlib - - Name: comparer - Entry: 7 - Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.ValueTuple`3[[System.Int32, - mscorlib],[System.Int32, mscorlib],[System.Int32, mscorlib]], mscorlib]], - mscorlib - - Name: - Entry: 8 - Data: - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 7 - Data: System.ValueTuple`3[[System.Int32, mscorlib],[System.Int32, mscorlib],[System.Int32, - mscorlib]], mscorlib - - Name: Item1 - Entry: 3 - Data: 1 - - Name: Item2 - Entry: 3 - Data: 1 - - Name: Item3 - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: $v - Entry: 10 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset b/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset deleted file mode 100644 index 4746aa7..0000000 --- a/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset +++ /dev/null @@ -1,84 +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: 16a0885aa5ee33046af22575907b7409, type: 3} - m_Name: monster2_1_1_1 - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: - - Name: nihao - Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Single, - mscorlib]], mscorlib - - Name: comparer - Entry: 7 - Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.Int32, - mscorlib]], mscorlib - - Name: - Entry: 8 - Data: - - Name: - Entry: 12 - 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: - - Name: - Entry: 8 - Data: - id: 1 - level: 1 - star: 1 - 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: 3 diff --git a/Assets/_Project/ScriptableObject/Excel/monster2.meta b/Assets/_Project/ScriptableObject/Excel/testExcel.meta similarity index 77% rename from Assets/_Project/ScriptableObject/Excel/monster2.meta rename to Assets/_Project/ScriptableObject/Excel/testExcel.meta index 94b870a..b036690 100644 --- a/Assets/_Project/ScriptableObject/Excel/monster2.meta +++ b/Assets/_Project/ScriptableObject/Excel/testExcel.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e20c813407bc0484ab7f3cb8ac70720c +guid: e5c0e3f65d74bde49a58ac6713bd2d2c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Project/ScriptableObject/Excel/testExcel/_testExcelUtil.asset b/Assets/_Project/ScriptableObject/Excel/testExcel/_testExcelUtil.asset new file mode 100644 index 0000000..95cb4e2 --- /dev/null +++ b/Assets/_Project/ScriptableObject/Excel/testExcel/_testExcelUtil.asset @@ -0,0 +1,25 @@ +%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: dfb34a928a8a0354da1a8e018712548f, type: 3} + m_Name: _testExcelUtil + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + Data: + - {fileID: 11400000, guid: 3bbf9021da858e346ad465fac30a4fcf, type: 2} diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset.meta b/Assets/_Project/ScriptableObject/Excel/testExcel/_testExcelUtil.asset.meta similarity index 79% rename from Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset.meta rename to Assets/_Project/ScriptableObject/Excel/testExcel/_testExcelUtil.asset.meta index 1b64185..7d89ecc 100644 --- a/Assets/_Project/ScriptableObject/Excel/monster2/monster2_1_1_1.asset.meta +++ b/Assets/_Project/ScriptableObject/Excel/testExcel/_testExcelUtil.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4a8c4100d6943fa4a9dff3024cf251e4 +guid: 7eaf28151ff5fcd4a87ffbd6994825a0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_Project/ScriptableObject/Excel/testExcel/testExcel_6.asset b/Assets/_Project/ScriptableObject/Excel/testExcel/testExcel_6.asset new file mode 100644 index 0000000..a393ddb --- /dev/null +++ b/Assets/_Project/ScriptableObject/Excel/testExcel/testExcel_6.asset @@ -0,0 +1,42 @@ +%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: 83f98c6ff7089dc4ba08b80c69d1c01f, type: 3} + m_Name: testExcel_6 + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: item + Entry: 7 + Data: 0|Tools.ExcelResolver.Item, Assembly-CSharp + - Name: id + Entry: 3 + Data: 1001 + - Name: refId + Entry: 3 + Data: 1 + - Name: name + Entry: 1 + Data: hero_image_1 + - Name: price + Entry: 3 + Data: 9999 + - Name: + Entry: 8 + Data: + id: 1 diff --git a/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset.meta b/Assets/_Project/ScriptableObject/Excel/testExcel/testExcel_6.asset.meta similarity index 79% rename from Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset.meta rename to Assets/_Project/ScriptableObject/Excel/testExcel/testExcel_6.asset.meta index 0a306e7..7eb09bd 100644 --- a/Assets/_Project/ScriptableObject/Excel/monster2/_monster2Util.asset.meta +++ b/Assets/_Project/ScriptableObject/Excel/testExcel/testExcel_6.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a33d53564060c934aac5da5e287613e8 +guid: 3bbf9021da858e346ad465fac30a4fcf NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_Project/Scripts/Generator/Excel/monster2.cs b/Assets/_Project/Scripts/Generator/Excel/monster2.cs deleted file mode 100644 index 52ff47a..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/monster2.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 monster2 : 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 CustomizeColor color; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/monster2.cs.meta b/Assets/_Project/Scripts/Generator/Excel/monster2.cs.meta deleted file mode 100644 index d73700d..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/monster2.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 16a0885aa5ee33046af22575907b7409 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs.meta b/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs.meta deleted file mode 100644 index 1df34d6..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: dccd381378a062b499ddc03703bfa842 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/testExcel.cs b/Assets/_Project/Scripts/Generator/Excel/testExcel.cs new file mode 100644 index 0000000..fc418dd --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/testExcel.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// 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 testExcel : SerializedScriptableObject, IExcelSOData + { + + /// + /// 英雄 + /// + public int id; + + /// + /// + /// + public Item item; + } +} diff --git a/Assets/_Project/Scripts/Generator/Excel/testExcel.cs.meta b/Assets/_Project/Scripts/Generator/Excel/testExcel.cs.meta new file mode 100644 index 0000000..bbe96fe --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/testExcel.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 83f98c6ff7089dc4ba08b80c69d1c01f \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs b/Assets/_Project/Scripts/Generator/Excel/testExcelUtil.cs similarity index 79% rename from Assets/_Project/Scripts/Generator/Excel/monster2Util.cs rename to Assets/_Project/Scripts/Generator/Excel/testExcelUtil.cs index 6d12712..70716bd 100644 --- a/Assets/_Project/Scripts/Generator/Excel/monster2Util.cs +++ b/Assets/_Project/Scripts/Generator/Excel/testExcelUtil.cs @@ -17,9 +17,9 @@ namespace Tools.ExcelResolver using Sirenix.OdinInspector; - public class monster2Util : SerializedScriptableObject, IExcelSOUtil + public class testExcelUtil : SerializedScriptableObject, IExcelSOUtil { - public Dictionary<(System.Int32, System.Int32, System.Int32), monster2> Data; + public List Data; } } diff --git a/Assets/_Project/Scripts/Generator/Excel/testExcelUtil.cs.meta b/Assets/_Project/Scripts/Generator/Excel/testExcelUtil.cs.meta new file mode 100644 index 0000000..305ccfc --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/testExcelUtil.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dfb34a928a8a0354da1a8e018712548f \ No newline at end of file