diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs
index 6a1d0e2..5f660a4 100644
--- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs
@@ -41,10 +41,11 @@ namespace Tools.ExcelResolver.Editor
for (int row = 1; row <= worksheet.Dimension.End.Row; row++)
{
- var assetName = $"{classCodeData.className}_{row}";
- var fullPath = $"{path}{assetName}.asset";
// 跳过注释行
if (worksheet.Cells[row, 1].Text.StartsWith("##")) continue;
+
+ var assetName = getAssetName(worksheet, row, classCodeData);
+ var fullPath = $"{path}{assetName}.asset";
if (assets.ContainsKey(assetName))
{
@@ -86,6 +87,32 @@ namespace Tools.ExcelResolver.Editor
fieldInfo.SetValue(instance, convertedValue);
}
}
+
+ string getAssetName(ExcelWorksheet worksheet, int row, ClassCodeData classCodeData)
+ {
+ switch (classCodeData.tableType)
+ {
+ case TableType.SingleKeyTable:
+ var keyColIndex = classCodeData.keyField[0].colIndex;
+ var key = worksheet.Cells[row, keyColIndex].Text;
+ if (!string.IsNullOrEmpty(key))
+ return $"{classCodeData.className}_{key}";
+ break;
+ // case TableType.UnionMultiKeyTable:
+ // return $"{classCodeData.className}_{classCodeData.keyField[0].varName}";
+ // case TableType.MultiKeyTable:
+ // return $"{classCodeData.className}_{classCodeData.keyField[0].varName}";
+ // case TableType.NotKetTable:
+ // return classCodeData.className;
+ // case TableType.ColumnTable:
+ // return $"{classCodeData.className}_{classCodeData.fields[2].Value.varName}";
+ }
+
+
+ throw new Exception($"无法定义资产名称 " +
+ $"className: '{classCodeData.className}' " +
+ $"FullAddress: {row} ");
+ }
}
}
}
\ No newline at end of file
diff --git a/Assets/_Project/ExcelResolver/Excel/hero.xlsx b/Assets/_Project/ExcelResolver/Excel/hero.xlsx
index 2a6aa5b..07deefe 100644
Binary files a/Assets/_Project/ExcelResolver/Excel/hero.xlsx and b/Assets/_Project/ExcelResolver/Excel/hero.xlsx differ
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_7.asset b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_1.asset
similarity index 99%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_7.asset
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_1.asset
index 25782c3..2146935 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_7.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_1.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8aa3c1560079b84cafbabe4bc0d2c8d, type: 3}
- m_Name: Hero_7
+ m_Name: Hero_1
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_9.asset.meta b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_1.asset.meta
similarity index 79%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_9.asset.meta
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_1.asset.meta
index 329f449..9a1d5e9 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_9.asset.meta
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_1.asset.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: acae57c5032fca54685e664fb60872d6
+guid: 3b98756cd197195498b14b5e67935cbe
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_8.asset b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_2.asset
similarity index 99%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_8.asset
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_2.asset
index e21dc37..a305662 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_8.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_2.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8aa3c1560079b84cafbabe4bc0d2c8d, type: 3}
- m_Name: Hero_8
+ m_Name: Hero_2
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_7.asset.meta b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_2.asset.meta
similarity index 79%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_7.asset.meta
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_2.asset.meta
index 7ed5095..ae9867b 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_7.asset.meta
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_2.asset.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 031f6bc6b7884a54da49033ea61073a7
+guid: cdde19489f16dce429041c1d6e207864
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_9.asset b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_3.asset
similarity index 98%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_9.asset
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_3.asset
index db27787..975cf2c 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_9.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_3.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e8aa3c1560079b84cafbabe4bc0d2c8d, type: 3}
- m_Name: Hero_9
+ m_Name: Hero_3
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
@@ -79,7 +79,7 @@ MonoBehaviour:
- Name:
Entry: 8
Data:
- id: 2
+ id: 3
name: "\u5973\u5DEB"
icon: hero_3
has: 0
diff --git a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_8.asset.meta b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_3.asset.meta
similarity index 79%
rename from Assets/_Project/ScriptableObject/Excel/Hero/Hero_8.asset.meta
rename to Assets/_Project/ScriptableObject/Excel/Hero/Hero_3.asset.meta
index 214565e..4353dcc 100644
--- a/Assets/_Project/ScriptableObject/Excel/Hero/Hero_8.asset.meta
+++ b/Assets/_Project/ScriptableObject/Excel/Hero/Hero_3.asset.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: f68d13699cf81a14a8e10092094b0f8d
+guid: 934bc10c06f0592419baf474987cc0a7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000