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 079b167..f4f378c 100644
Binary files a/Assets/_Project/ExcelResolver/Excel/_Test.xlsx and b/Assets/_Project/ExcelResolver/Excel/testExcel.xlsx differ
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