设置type配置

5 months ago · 828c1a069f
21 changed files with 334 additions and 5 deletions
--- a/Inspector/Config/Editor/AOTGenerationConfig.asset
+++ b/Inspector/Config/Editor/AOTGenerationConfig.asset
@ -0,0 +1,19 @@
+%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: 1726182683, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
+  m_Name: AOTGenerationConfig
+  m_EditorClassIdentifier: 
+  automateBeforeBuilds: 0
+  deleteDllAfterBuilds: 1
+  AutomateForAllAOTPlatforms: 1
+  automateForPlatforms: 0900000014000000
+  supportSerializedTypes: []
--- a/Inspector/Config/Editor/AOTGenerationConfig.asset.meta
+++ b/Inspector/Config/Editor/AOTGenerationConfig.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b62dc7eee015bd745b66f9ea397cead5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Inspector/Config/Editor/ColorPaletteManager.asset
+++ b/Inspector/Config/Editor/ColorPaletteManager.asset
@ -0,0 +1,136 @@
+%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: 772478971, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
+  m_Name: ColorPaletteManager
+  m_EditorClassIdentifier: 
+  colorPalettes:
+  - name: Country
+    showAlpha: 0
+    colors:
+    - {r: 0.776, g: 0.651, b: 0.349, a: 1}
+    - {r: 0.863, g: 0.761, b: 0.631, a: 1}
+    - {r: 0.91, g: 0.831, b: 0.686, a: 1}
+    - {r: 0.961, g: 0.902, b: 0.788, a: 1}
+    - {r: 0.753, g: 0.714, b: 0.667, a: 1}
+    - {r: 0.478, g: 0.573, b: 0.431, a: 1}
+    - {r: 0.314, g: 0.427, b: 0.31, a: 1}
+    - {r: 0.596, g: 0.345, b: 0.235, a: 1}
+    - {r: 0.545, g: 0.329, b: 0.318, a: 1}
+    - {r: 0.647, g: 0.204, b: 0.227, a: 1}
+    - {r: 0.435, g: 0.161, b: 0.063, a: 1}
+    - {r: 0.357, g: 0.333, b: 0.278, a: 1}
+    - {r: 0.976, g: 0.98, b: 0.961, a: 1}
+    - {r: 0.165, g: 0.271, b: 0.11, a: 1}
+  - name: Beach
+    showAlpha: 0
+    colors:
+    - {r: 0.996, g: 0.906, b: 0.459, a: 1}
+    - {r: 0.314, g: 0.592, b: 0.035, a: 1}
+    - {r: 0.486, g: 0.953, b: 0.875, a: 1}
+    - {r: 0.996, g: 0.82, b: 0.212, a: 1}
+    - {r: 1, g: 0.769, b: 0.165, a: 1}
+    - {r: 0.804, g: 0.835, b: 0.753, a: 1}
+    - {r: 1, g: 0.769, b: 0.165, a: 1}
+    - {r: 1, g: 0.702, b: 0.063, a: 1}
+    - {r: 1, g: 0.898, b: 0.569, a: 1}
+  - name: Fall
+    showAlpha: 0
+    colors:
+    - {r: 0.82, g: 0.722, b: 0.318, a: 1}
+    - {r: 0.537, g: 0.192, b: 0.153, a: 1}
+    - {r: 0.996, g: 0.812, b: 0.012, a: 1}
+    - {r: 1, g: 0.431, b: 0.02, a: 1}
+    - {r: 0.937, g: 0.267, b: 0.094, a: 1}
+    - {r: 0.42, g: 0.212, b: 0.18, a: 1}
+    - {r: 0.992, g: 0.651, b: 0.004, a: 1}
+    - {r: 0.89, g: 0.353, b: 0.086, a: 1}
+    - {r: 1, g: 0.443, b: 0.004, a: 1}
+    - {r: 0.682, g: 0.275, b: 0.137, a: 1}
+    - {r: 0.306, g: 0.231, b: 0.114, a: 1}
+    - {r: 0.384, g: 0.416, b: 0.082, a: 1}
+    - {r: 0.165, g: 0.157, b: 0.008, a: 1}
+    - {r: 0.906, g: 0.635, b: 0.227, a: 1}
+    - {r: 0.82, g: 0.722, b: 0.318, a: 1}
+    - {r: 0.745, g: 0.435, b: 0.031, a: 1}
+    - {r: 0.765, g: 0.682, b: 0.569, a: 1}
+    - {r: 0.18, g: 0.149, b: 0.075, a: 1}
+    - {r: 0.702, g: 0.451, b: 0.059, a: 1}
+  - name: Passion
+    showAlpha: 0
+    colors:
+    - {r: 0.925, g: 0.682, b: 0.624, a: 1}
+    - {r: 0.188, g: 0.114, b: 0.224, a: 1}
+    - {r: 0.349, g: 0.11, b: 0.231, a: 1}
+    - {r: 0.435, g: 0.267, b: 0.357, a: 1}
+  - name: Sepia
+    showAlpha: 0
+    colors:
+    - {r: 0.353, g: 0.098, b: 0.02, a: 1}
+    - {r: 0.663, g: 0.188, b: 0.114, a: 1}
+    - {r: 0.906, g: 0.643, b: 0.082, a: 1}
+    - {r: 0.996, g: 0.839, b: 0.322, a: 1}
+    - {r: 0.486, g: 0.392, b: 0.02, a: 1}
+    - {r: 0.294, g: 0.235, b: 0.012, a: 1}
+  - name: Floral
+    showAlpha: 0
+    colors:
+    - {r: 0.855, g: 0.518, b: 0.412, a: 1}
+    - {r: 0.827, g: 0.294, b: 0.333, a: 1}
+    - {r: 0.737, g: 0.118, b: 0.208, a: 1}
+    - {r: 0.549, g: 0.149, b: 0.235, a: 1}
+    - {r: 0.949, g: 0.925, b: 0.784, a: 1}
+    - {r: 0.945, g: 0.882, b: 0.69, a: 1}
+    - {r: 0.871, g: 0.812, b: 0.698, a: 1}
+    - {r: 0.4, g: 0.196, b: 0.243, a: 1}
+    - {r: 0.271, g: 0.157, b: 0.227, a: 1}
+  - name: Underwater
+    showAlpha: 0
+    colors:
+    - {r: 0.663, g: 0.416, b: 0.733, a: 1}
+    - {r: 0.2, g: 0.6, b: 0.698, a: 1}
+    - {r: 0.11, g: 0.49, b: 0.698, a: 1}
+    - {r: 0.439, g: 0.627, b: 0.227, a: 1}
+    - {r: 0, g: 0.357, b: 0.604, a: 1}
+    - {r: 0.067, g: 0.271, b: 0.353, a: 1}
+  - name: Breeze
+    showAlpha: 0
+    colors:
+    - {r: 0.706, g: 1, b: 0, a: 1}
+    - {r: 0.651, g: 1, b: 0.404, a: 1}
+    - {r: 0.122, g: 1, b: 0.514, a: 1}
+    - {r: 0.216, g: 0.894, b: 0.961, a: 1}
+    - {r: 0.4, g: 1, b: 0.882, a: 1}
+    - {r: 0.027, g: 0.792, b: 0.8, a: 1}
+  - name: Clovers
+    showAlpha: 0
+    colors:
+    - {r: 0.431, g: 0.549, b: 0.102, a: 1}
+    - {r: 0.671, g: 0.714, b: 0.071, a: 1}
+    - {r: 0.969, g: 0.949, b: 0.831, a: 1}
+    - {r: 0.886, g: 0.902, b: 0.702, a: 1}
+    - {r: 0.753, g: 0.824, b: 0.627, a: 1}
+    - {r: 0.404, g: 0.6, b: 0.4, a: 1}
+  - name: Tropical
+    showAlpha: 0
+    colors:
+    - {r: 0.953, g: 0.647, b: 0.804, a: 1}
+    - {r: 0.965, g: 0.741, b: 0.871, a: 1}
+    - {r: 0.949, g: 0.549, b: 0.643, a: 1}
+    - {r: 0.992, g: 0.659, b: 0.498, a: 1}
+    - {r: 0.976, g: 0.792, b: 0.729, a: 1}
+    - {r: 0.984, g: 0.855, b: 0.725, a: 1}
+    - {r: 0.259, g: 0.882, b: 0.663, a: 1}
+    - {r: 0.349, g: 0.753, b: 0.78, a: 1}
+    - {r: 0.725, g: 0.976, b: 0.91, a: 1}
+    - {r: 0.647, g: 0.745, b: 0.957, a: 1}
+    - {r: 0.725, g: 0.863, b: 0.973, a: 1}
+    - {r: 0.89, g: 0.945, b: 0.996, a: 1}
--- a/Inspector/Config/Editor/ColorPaletteManager.asset.meta
+++ b/Inspector/Config/Editor/ColorPaletteManager.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dd99579d474568645a1973d4f4aff87c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Inspector/Config/Editor/ImportSettingsConfig.asset
+++ b/Inspector/Config/Editor/ImportSettingsConfig.asset
@ -0,0 +1,15 @@
+%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: 188390376, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
+  m_Name: ImportSettingsConfig
+  m_EditorClassIdentifier: 
+  automateBeforeBuild: 1
--- a/Inspector/Config/Editor/ImportSettingsConfig.asset.meta
+++ b/Inspector/Config/Editor/ImportSettingsConfig.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ceffa53b428a64741bb1944750a6ae63
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TBool.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TBool.cs
@ -4,6 +4,7 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TBool : TType
    {
+        public TBool(string typeText) : base(typeText) { }
        internal override Type RealType => typeof(bool);
        internal override object DefaultValue => false;
        internal override string FieldWriteFormat => "System.Boolean";
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TDict.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TDict.cs
@ -6,6 +6,10 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TDict : TType
    {
+        public TDict(string typeText) : base(typeText)
+        {
+            String2TType(typeText);
+        }
        internal override Type RealType => typeof(Dictionary<,>).MakeGenericType(KeyType?.RealType ?? typeof(object), ValueType?.RealType ?? typeof(object));
        internal override string FieldWriteFormat => $"Dictionary<{KeyType?.RealType.Name ?? "object"}, {ValueType?.RealType.Name ?? "object"}>";
        internal override object DefaultValue => Activator.CreateInstance(typeof(Dictionary<,>).MakeGenericType(KeyType?.RealType ?? typeof(object), ValueType?.RealType ?? typeof(object)));
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TFloat.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TFloat.cs
@ -4,6 +4,7 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TFloat : TType
    {
+        public TFloat(string typeText) : base(typeText) { }
        internal override Type RealType => typeof(float);
        internal override object DefaultValue => 0.0f;
        internal override string FieldWriteFormat => "System.Single";
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TInt.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TInt.cs
@ -4,6 +4,7 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TInt : TType
    {
+        public TInt(string typeText) : base(typeText) { }
        internal override Type RealType => typeof(int);
        internal override object DefaultValue => 0;
        internal override string FieldWriteFormat => "System.Int32";
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TList.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TList.cs
@ -6,6 +6,10 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TList : TType
    {
+        public TList(string typeText) : base(typeText)
+        {
+            String2TType(typeText);
+        }
        internal override Type RealType => typeof(List<>).MakeGenericType(InnerType.RealType);
        internal override string FieldWriteFormat => $"List<{InnerType.RealType.Name}>";
        internal override object DefaultValue => Activator.CreateInstance(typeof(List<>).MakeGenericType(InnerType.RealType));
@ -15,7 +19,7 @@ namespace Tools.ExcelResolver.Editor
        internal override bool String2TType(string typeText)
        {
            var split = typeText.Split(',');
-            if (split.Length < 2 || !string.Equals(split[0], "list", StringComparison.OrdinalIgnoreCase))
+            if (split.Length < 2 || !split[0].StartsWith("list"))
            {
                return false;
            }
@ -27,7 +31,8 @@ namespace Tools.ExcelResolver.Editor

        internal override object TryParseFrom(string cellText)
        {
-            var split = cellText.Split('|');
+            var splitChar = GetTagByDefault("spe", "|");
+            var split = cellText.Split(splitChar);
            if (split.Length > 0)
            {
                var list = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(InnerType.RealType));
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TString.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TString.cs
@ -4,6 +4,7 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TString : TType
    {
+        public TString(string typeText) : base(typeText) { }
        internal override Type RealType => typeof(string);
        internal override object DefaultValue => string.Empty;
        internal override string FieldWriteFormat => "System.string";
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TType.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TType.cs
@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;

 namespace Tools.ExcelResolver.Editor
 {
@ -26,5 +27,47 @@ namespace Tools.ExcelResolver.Editor
        /// <param name="cellText"></param>
        /// <returns></returns>
        internal abstract object TryParseFrom(string cellText);
+
+
+        internal TType(string typeText = null)
+        {
+            var type = typeText?.Split(',', StringSplitOptions.RemoveEmptyEntries);
+            if (type?.Length >= 1)
+            {
+                var split = type[0].Split(new []{'(', ')'}, StringSplitOptions.RemoveEmptyEntries);
+                if (split?.Length >= 2)
+                {
+                    var configs = split[1].Split('#', StringSplitOptions.RemoveEmptyEntries);
+                    foreach (var config in configs)
+                    {
+                        var c = config.Split('=', StringSplitOptions.RemoveEmptyEntries);
+                        if (c.Length == 2)
+                        {
+                            tag ??= new Dictionary<string, string>();
+                            tag[c[0]] = c[1];
+                        }
+                    }
+                }
+            }
+        }
+        
+        private readonly Dictionary<string, string> tag;
+
+        protected string GetTag(string key)
+        {
+            if (tag == null)
+            {
+                return null;
+            }
+            return tag.GetValueOrDefault(key);
+        }
+        protected string GetTagByDefault(string key, string defaultValue)
+        {
+            if (tag == null)
+            {
+                return defaultValue;
+            }
+            return tag.GetValueOrDefault(key, defaultValue);
+        }
    }
 }
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector2.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector2.cs
@ -5,6 +5,7 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TVector2 : TType
    {
+        public TVector2(string typeText) : base(typeText) { }
        internal override Type RealType => typeof(Vector2);
        internal override object DefaultValue => Vector2.zero;
        internal override string FieldWriteFormat => "Vector2";
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector3.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TVector3.cs
@ -5,6 +5,7 @@ namespace Tools.ExcelResolver.Editor
 {
    internal class TVector3 : TType
    {
+        public TVector3(string typeText) : base(typeText) { }
        internal override Type RealType => typeof(Vector3);
        internal override object DefaultValue => Vector3.zero;
        internal override string FieldWriteFormat => "Vector3";
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs
@ -16,12 +16,12 @@ namespace Tools.ExcelResolver.Editor
            return Assembly.GetAssembly(typeof(TType))
                .GetTypes()
                .Where(t => t.IsSubclassOf(typeof(TType)) && !t.IsAbstract)
-                .Select(t => Activator.CreateInstance(t) as TType)
+                .Select(t => Activator.CreateInstance(t, string.Empty) as TType)
                .ToArray();
        }
        
        /// <summary>
-        /// 更具类型字符串获取 TType
+        /// 根据类型字符串获取TType
        /// </summary>
        /// <param name="targetText"></param>
        /// <returns></returns>
@ -36,7 +36,7 @@ namespace Tools.ExcelResolver.Editor
            {
                if (tType.String2TType(targetText))
                {
-                    return tType;
+                    return Activator.CreateInstance(tType.GetType(), targetText) as TType;
                }
            }

--- a/Assets/_Project/ExcelResolver/Excel/hero.xlsx
+++ b/Assets/_Project/ExcelResolver/Excel/hero.xlsx
--- a/Assets/_Project/ScriptableObject/Excel/Hero_1.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_1.asset
@ -65,6 +65,46 @@ 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: 9
+      Data: 1
+    - 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
  name: "\u9053\u58EB"
  icon: hero_1
--- a/Assets/_Project/ScriptableObject/Excel/Hero_2.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_2.asset
@ -41,6 +41,22 @@ 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: 9
+      Data: 1
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
  id: 2
  name: 
  icon: hero_2
--- a/Assets/_Project/ScriptableObject/Excel/Hero_3.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_3.asset
@ -53,6 +53,22 @@ 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: 9
+      Data: 1
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
  id: 2
  name: "\u5973\u5DEB"
  icon: hero_3
--- a/Assets/_Project/Scripts/Generator/Excel/Hero.cs
+++ b/Assets/_Project/Scripts/Generator/Excel/Hero.cs
@ -74,5 +74,10 @@ namespace Tools.ExcelResolver
        /// 
        /// </summary>
        public Dictionary<Int32, Int32> attribute;
+        
+        /// <summary>
+        /// 你好
+        /// </summary>
+        public Dictionary<Int32, Single> nihao;
    }
 }