From 40b0b92e175892d0043ae8763fb8c97dfdd27668 Mon Sep 17 00:00:00 2001 From: coffee <985942825@qq.com> Date: Sun, 26 Jan 2025 01:04:52 +0800 Subject: [PATCH] dict tag --- .../ExcelResolver/Editor/Core/Types/TBool.cs | 2 +- .../ExcelResolver/Editor/Core/Types/TDict.cs | 5 +- .../ExcelResolver/Editor/Core/Types/TFloat.cs | 2 +- .../ExcelResolver/Editor/Core/Types/TInt.cs | 2 +- .../ExcelResolver/Editor/Core/Types/TList.cs | 2 +- .../Editor/Core/Types/TString.cs | 2 +- .../Editor/Core/Types/TVector2.cs | 4 +- .../Editor/Core/Types/TVector3.cs | 4 +- .../Core/Util/ExcelResolverUtil.Cell.cs | 2 +- .../Core/Util/ExcelResolverUtil.TType.cs | 1 + Assets/_Project/ExcelResolver/Excel/hero.xlsx | Bin 11060 -> 11076 bytes .../ScriptableObject/Excel/Hero_1.asset | 56 +++++++++--------- .../ScriptableObject/Excel/Hero_2.asset | 32 +++++----- .../ScriptableObject/Excel/Hero_3.asset | 44 +++++++------- .../_Project/Scripts/Generator/Excel/Hero.cs | 8 +-- 15 files changed, 84 insertions(+), 82 deletions(-) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TBool.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TBool.cs index d2e2c90..c68882a 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TBool.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TBool.cs @@ -12,7 +12,7 @@ namespace Tools.ExcelResolver.Editor internal override bool String2TType(string typeText) { - return string.Equals(typeText.Trim(), "bool", StringComparison.OrdinalIgnoreCase); + return string.Equals(typeText, "bool", StringComparison.OrdinalIgnoreCase); } internal override object TryParseFrom(string cellText) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TDict.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TDict.cs index 618ed1b..aeb489c 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TDict.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TDict.cs @@ -22,7 +22,7 @@ namespace Tools.ExcelResolver.Editor internal override bool String2TType(string typeText) { var split = typeText.Split(',', StringSplitOptions.RemoveEmptyEntries); - if (split.Length != 3 || !string.Equals(split[0].Trim(), "dict", StringComparison.OrdinalIgnoreCase)) + if (split.Length < 3 || !split[0].StartsWith("dict", StringComparison.OrdinalIgnoreCase)) { return false; } @@ -42,7 +42,8 @@ namespace Tools.ExcelResolver.Editor } var dict = (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>).MakeGenericType(KeyType.RealType, ValueType.RealType)); - var entries = cellText.Split('|'); // 假定每个键值对用 "|" 分隔 + var splitChar = GetTagByDefault("spe", "|"); + var entries = cellText.Split(splitChar, StringSplitOptions.RemoveEmptyEntries); foreach (var entry in entries) { diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TFloat.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TFloat.cs index b7c03b7..7f4a0f0 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TFloat.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TFloat.cs @@ -12,7 +12,7 @@ namespace Tools.ExcelResolver.Editor internal override bool String2TType(string typeText) { - return string.Equals(typeText.Trim(), "float", StringComparison.OrdinalIgnoreCase); + return string.Equals(typeText, "float", StringComparison.OrdinalIgnoreCase); } diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TInt.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TInt.cs index 9ed617c..3cd9168 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TInt.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TInt.cs @@ -12,7 +12,7 @@ namespace Tools.ExcelResolver.Editor internal override bool String2TType(string typeText) { - return string.Equals(typeText.Trim(), "int", StringComparison.OrdinalIgnoreCase); + return string.Equals(typeText, "int", StringComparison.OrdinalIgnoreCase); } internal override object TryParseFrom(string cellText) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TList.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TList.cs index afb7282..fab5805 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TList.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TList.cs @@ -33,7 +33,7 @@ namespace Tools.ExcelResolver.Editor internal override object TryParseFrom(string cellText) { var splitChar = GetTagByDefault("spe", "|"); - var split = cellText.Split(splitChar); + var split = cellText.Split(splitChar, StringSplitOptions.RemoveEmptyEntries); if (split.Length > 0) { var list = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(InnerType.RealType)); diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TString.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TString.cs index 8073857..57c8558 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TString.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TString.cs @@ -12,7 +12,7 @@ namespace Tools.ExcelResolver.Editor internal override bool String2TType(string typeText) { - return string.Equals(typeText.Trim(), "string", StringComparison.OrdinalIgnoreCase); + return string.Equals(typeText, "string", StringComparison.OrdinalIgnoreCase); } internal override object TryParseFrom(string cellText) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector2.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector2.cs index 38fe22e..90a5b08 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector2.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector2.cs @@ -13,13 +13,13 @@ namespace Tools.ExcelResolver.Editor internal override bool String2TType(string typeText) { - return string.Equals(typeText.Trim(), "vector2", StringComparison.OrdinalIgnoreCase); + return string.Equals(typeText, "vector2", StringComparison.OrdinalIgnoreCase); } internal override object TryParseFrom(string cellText) { cellText = cellText[1..^1]; - var split = cellText.Split(','); + var split = cellText.Split(',', StringSplitOptions.RemoveEmptyEntries); if (split.Length != 2) { return null; diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector3.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector3.cs index dc01f74..d003ed7 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector3.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector3.cs @@ -13,13 +13,13 @@ namespace Tools.ExcelResolver.Editor internal override bool String2TType(string typeText) { - return string.Equals(typeText.Trim(), "vector3", StringComparison.OrdinalIgnoreCase); + return string.Equals(typeText, "vector3", StringComparison.OrdinalIgnoreCase); } internal override object TryParseFrom(string cellText) { cellText = cellText[1..^1]; - var split = cellText.Split(','); + var split = cellText.Split(',', StringSplitOptions.RemoveEmptyEntries); if (split.Length != 3) { return null; 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 bc4b390..5c5fb20 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs @@ -56,7 +56,7 @@ namespace Tools.ExcelResolver.Editor } else { - result = type.TryParseFrom(cell.Text); + result = type.TryParseFrom(cell.Text.Trim()); } if (result != null) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs index 287c4d3..ff607eb 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs @@ -45,6 +45,7 @@ namespace Tools.ExcelResolver.Editor _currentCell = cell ?? _currentCell; _currentClassName = className ?? _currentClassName; _allTTypes ??= GetAllTTypes(); + targetText = targetText.Trim(); foreach (var tType in _allTTypes) { diff --git a/Assets/_Project/ExcelResolver/Excel/hero.xlsx b/Assets/_Project/ExcelResolver/Excel/hero.xlsx index 97641349ccf420f8d06c75bc6e26c205c8ec5390..e04fe511c62932d6878665189d12924082266689 100644 GIT binary patch delta 2292 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 OlNl=&2Ad`T0002~sUs5r delta 2267 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 diff --git a/Assets/_Project/ScriptableObject/Excel/Hero_1.asset b/Assets/_Project/ScriptableObject/Excel/Hero_1.asset index 5fdab6e..ec8f7f8 100644 --- a/Assets/_Project/ScriptableObject/Excel/Hero_1.asset +++ b/Assets/_Project/ScriptableObject/Excel/Hero_1.asset @@ -21,20 +21,14 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: - - Name: attribute + - Name: nihao Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[Tools.ExcelResolver.Attribute, - Assembly-CSharp],[System.Int32, mscorlib]], mscorlib + Data: 0|System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Single, + mscorlib]], mscorlib - Name: comparer Entry: 7 - Data: 1|System.Collections.Generic.EnumEqualityComparer`1[[Tools.ExcelResolver.Attribute, - Assembly-CSharp]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.Int32, + mscorlib]], mscorlib - Name: Entry: 8 Data: @@ -46,10 +40,10 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 0 + Data: 2 - Name: $v - Entry: 3 - Data: 500 + Entry: 4 + Data: 2.3 - Name: Entry: 8 Data: @@ -58,10 +52,10 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 1 + Data: 5 - Name: $v - Entry: 3 - Data: 300 + Entry: 4 + Data: 4.6 - Name: Entry: 8 Data: @@ -71,14 +65,20 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: nihao + - Name: attribute Entry: 7 - Data: 2|System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Single, - mscorlib]], mscorlib + Data: 2|System.Collections.Generic.Dictionary`2[[Tools.ExcelResolver.Attribute, + Assembly-CSharp],[System.Int32, mscorlib]], mscorlib - Name: comparer Entry: 7 - Data: 3|System.Collections.Generic.GenericEqualityComparer`1[[System.Int32, - mscorlib]], mscorlib + Data: 3|System.Collections.Generic.EnumEqualityComparer`1[[Tools.ExcelResolver.Attribute, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: - Name: Entry: 8 Data: @@ -90,10 +90,10 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 2 + Data: 0 - Name: $v - Entry: 4 - Data: 2.3 + Entry: 3 + Data: 500 - Name: Entry: 8 Data: @@ -102,10 +102,10 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 5 + Data: 1 - Name: $v - Entry: 4 - Data: 4.6 + Entry: 3 + Data: 300 - Name: Entry: 8 Data: diff --git a/Assets/_Project/ScriptableObject/Excel/Hero_2.asset b/Assets/_Project/ScriptableObject/Excel/Hero_2.asset index 5a31fc8..a305662 100644 --- a/Assets/_Project/ScriptableObject/Excel/Hero_2.asset +++ b/Assets/_Project/ScriptableObject/Excel/Hero_2.asset @@ -21,20 +21,14 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: - - Name: attribute + - Name: nihao Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[Tools.ExcelResolver.Attribute, - Assembly-CSharp],[System.Int32, mscorlib]], mscorlib + Data: 0|System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Single, + mscorlib]], mscorlib - Name: comparer Entry: 7 - Data: 1|System.Collections.Generic.EnumEqualityComparer`1[[Tools.ExcelResolver.Attribute, - Assembly-CSharp]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.Int32, + mscorlib]], mscorlib - Name: Entry: 8 Data: @@ -47,14 +41,20 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: nihao + - Name: attribute Entry: 7 - Data: 2|System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Single, - mscorlib]], mscorlib + Data: 2|System.Collections.Generic.Dictionary`2[[Tools.ExcelResolver.Attribute, + Assembly-CSharp],[System.Int32, mscorlib]], mscorlib - Name: comparer Entry: 7 - Data: 3|System.Collections.Generic.GenericEqualityComparer`1[[System.Int32, - mscorlib]], mscorlib + Data: 3|System.Collections.Generic.EnumEqualityComparer`1[[Tools.ExcelResolver.Attribute, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: - Name: Entry: 8 Data: diff --git a/Assets/_Project/ScriptableObject/Excel/Hero_3.asset b/Assets/_Project/ScriptableObject/Excel/Hero_3.asset index 48718c7..c104b61 100644 --- a/Assets/_Project/ScriptableObject/Excel/Hero_3.asset +++ b/Assets/_Project/ScriptableObject/Excel/Hero_3.asset @@ -21,13 +21,33 @@ MonoBehaviour: 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: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: - Name: attribute Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[Tools.ExcelResolver.Attribute, + Data: 2|System.Collections.Generic.Dictionary`2[[Tools.ExcelResolver.Attribute, Assembly-CSharp],[System.Int32, mscorlib]], mscorlib - Name: comparer Entry: 7 - Data: 1|System.Collections.Generic.EnumEqualityComparer`1[[Tools.ExcelResolver.Attribute, + Data: 3|System.Collections.Generic.EnumEqualityComparer`1[[Tools.ExcelResolver.Attribute, Assembly-CSharp]], mscorlib - Name: Entry: 12 @@ -59,26 +79,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: nihao - Entry: 7 - Data: 2|System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Single, - mscorlib]], mscorlib - - Name: comparer - Entry: 7 - Data: 3|System.Collections.Generic.GenericEqualityComparer`1[[System.Int32, - mscorlib]], mscorlib - - Name: - Entry: 8 - Data: - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: id: 2 name: "\u5973\u5DEB" icon: hero_3 diff --git a/Assets/_Project/Scripts/Generator/Excel/Hero.cs b/Assets/_Project/Scripts/Generator/Excel/Hero.cs index 601cc38..3695fac 100644 --- a/Assets/_Project/Scripts/Generator/Excel/Hero.cs +++ b/Assets/_Project/Scripts/Generator/Excel/Hero.cs @@ -71,14 +71,14 @@ namespace Tools.ExcelResolver public List attack_target; ///

- /// + /// 你好 /// - public Dictionary attribute; + public Dictionary nihao; /// - /// 你好 + /// /// - public Dictionary nihao; + public Dictionary attribute; /// ///