使用导表

5 months ago · 24cabe4536
30 changed files with 369 additions and 18 deletions
--- a/Inspector/Config/Editor/TypeRegistryUserConfig.asset
+++ b/Inspector/Config/Editor/TypeRegistryUserConfig.asset
@ -0,0 +1,24 @@
+%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: 2050440665, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
+  m_Name: TypeRegistryUserConfig
+  m_EditorClassIdentifier: 
+  shownTypes:
+    serializedCollection: []
+  hiddenTypes:
+    serializedCollection: []
+  addedIllegalTypes:
+    serializedCollection: []
+  typeSettings:
+    serializedDictionary: []
+  typePriorities:
+    serializedDictionary: []
--- a/Inspector/Config/Editor/TypeRegistryUserConfig.asset.meta
+++ b/Inspector/Config/Editor/TypeRegistryUserConfig.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 25e2868b70073ff4e8be4fe3a2fdc290
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Inspector/Config/Resources.meta
+++ b/Inspector/Config/Resources.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76c4a9ac37c5725429d74e50b3acc481
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Inspector/Config/Resources/Sirenix.meta
+++ b/Inspector/Config/Resources/Sirenix.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c4dd5d6aa7f5a4e46a8d8af3e68ae934
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset
+++ b/Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset
@ -0,0 +1,22 @@
+%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: 1549551891, guid: 74721b9f0af448f5ae2e91102a1a5edd, type: 3}
+  m_Name: GlobalSerializationConfig
+  m_EditorClassIdentifier: 
+  HideSerializationCautionaryMessage: 0
+  HidePrefabCautionaryMessage: 0
+  HideOdinSerializeAttributeWarningMessages: 0
+  HideNonSerializedShowInInspectorWarningMessages: 0
+  buildSerializationFormat: 0
+  editorSerializationFormat: 2
+  loggingPolicy: 0
+  errorHandlingPolicy: 0
--- a/Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta
+++ b/Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b8030d3f9b93fe54eb0bb57228abeb2c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Unity-Tools/Demo/Unity-Tools.Demo.asmdef
+++ b/Assets/Unity-Tools/Demo/Unity-Tools.Demo.asmdef
@ -2,11 +2,11 @@
    "name": "Unity-Tools.Demo",
    "rootNamespace": "",
    "references": [
-        "GUID:a1f7e93dbeee5cb41aa91ead2e679308",
-        "GUID:9e24947de15b9834991c9d8411ea37cf",
-        "GUID:84651a3751eca9349aac36a66bba901b",
-        "GUID:f51ebe6a0ceec4240a699833d6309b23",
-        "GUID:593a5b492d29ac6448b1ebf7f035ef33"
+        "Unity-Tools",
+        "Unity.Addressables",
+        "Unity.ResourceManager",
+        "UniTask",
+        "UniTask.Addressables"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Type.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Type.cs
@ -56,12 +56,12 @@ namespace Tools.ExcelResolver.Editor
            foreach (var assembly in assemblies)
            {
                var type = assembly.GetType(fullTypeName);
+                if (type != null)
+                {
                    if (assembly.GetName().Name is "Assembly-CSharp-Editor" or "Assembly-CSharp-Editor-firstpass")
                    {
                        throw new ArgumentException($"不支持Editor目录下的'{fullTypeName}'类型");
                    }
-                if (type != null)
-                {
                    TypeCache[fullTypeName] = type;
                    return type;
                }
--- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.asset
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.asset
@ -12,8 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9247b1b02271436ca893eadb1fa8bdce, type: 3}
  m_Name: ExcelResolverEditorConfig
  m_EditorClassIdentifier: 
-  ExcelPathRoot: Assets/ExcelResolver/Excel
-  JsonPathRoot: Assets/ExcelResolver/Json
-  CodePathRoot: Assets/Scripts/Generator/Excel
+  ExcelPathRoot: Assets/_Project/ExcelResolver/Excel
+  CodePathRoot: Assets/_Project/Scripts/Generator/Excel
+  SOPathRoot: Assets/_Project/ScriptableObject/Excel
  GenerateDataClassNameSpace: Tools.ExcelResolver
-  isInit: 0
--- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs
@ -8,11 +8,11 @@ namespace Tools.ExcelResolver.Editor
    public sealed class ExcelResolverEditorConfig : ScriptableObject
    {
        [LabelText("Excel路径"), FolderPath]
-        public string ExcelPathRoot = "Assets/ExcelResolver/Excel";
+        public string ExcelPathRoot = "Assets/_Project/ExcelResolver/Excel";
        [LabelText("C#代码路径"), ValueDropdown("@Tools.Editor.DirectoryUtil.GetFilePaths()")]
-        public string CodePathRoot = "Assets/Scripts/Generator/Excel";
+        public string CodePathRoot = "Assets/_Project/Scripts/Generator/Excel";
        [LabelText("SO存放路径"), ValueDropdown("@Tools.Editor.DirectoryUtil.GetFilePaths()")]
-        public string SOPathRoot = "Assets/ScriptableObject/Excel";
+        public string SOPathRoot = "Assets/_Project/ScriptableObject/Excel";
        [LabelText("生成代码命名空间")]
        public string GenerateDataClassNameSpace = "Tools.ExcelResolver";
        
--- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs
+++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs
@ -25,9 +25,18 @@ namespace Tools.ExcelResolver.Editor
            if (excelResolverConfig == null)
            {
                string[] assetGuids = AssetDatabase.FindAssets($"ExcelResolverEditorConfig t:ExcelResolverEditorConfig");
+                if (assetGuids.Length > 0)
+                {
                    string assetPath = AssetDatabase.GUIDToAssetPath(assetGuids[0]);
                    excelResolverConfig = AssetDatabase.LoadAssetAtPath<ExcelResolverEditorConfig>(assetPath);
                }
+                else
+                {
+                    excelResolverConfig = CreateInstance<ExcelResolverEditorConfig>();
+                    AssetDatabase.CreateAsset(excelResolverConfig, "Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.asset");
+                    AssetDatabase.SaveAssets();
+                }
+            }
        }

        [FoldoutGroup("Hide Setting")]
--- a/Assets/_Project/ExcelResolver.meta
+++ b/Assets/_Project/ExcelResolver.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 46522688344b9244693521456a7deb41
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/ExcelResolver/Excel.meta
+++ b/Assets/_Project/ExcelResolver/Excel.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f1554c02a4e515b4b8953edbfa311896
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/ExcelResolver/Excel/hero.xlsx
+++ b/Assets/_Project/ExcelResolver/Excel/hero.xlsx
--- a/Assets/_Project/ExcelResolver/Excel/hero.xlsx.meta
+++ b/Assets/_Project/ExcelResolver/Excel/hero.xlsx.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d158d305a64ac74428b71f7a8f6ae16c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/ScriptableObject.meta
+++ b/Assets/_Project/ScriptableObject.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 238b5e359150ae04fa915c27485e3708
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/ScriptableObject/Excel.meta
+++ b/Assets/_Project/ScriptableObject/Excel.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7263635733ca40c48b9c2cb5a11cd653
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/ScriptableObject/Excel/Hero_1.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_1.asset
@ -0,0 +1,28 @@
+%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: e8aa3c1560079b84cafbabe4bc0d2c8d, type: 3}
+  m_Name: Hero_1
+  m_EditorClassIdentifier: 
+  id: 1
+  name: "\u9053\u58EB"
+  icon: hero_1
+  has: 0
+  hp: 100
+  atk: 20
+  speed: 1.2
+  pos: {x: 0, y: 1, z: 4}
+  ches: {x: 0, y: 1}
+  attack_target:
+  - 0.5
+  - -2.6
+  - 3
+  - 4.5
--- a/Assets/_Project/ScriptableObject/Excel/Hero_1.asset.meta
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_1.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f581fc84b82a7f4da23f932e6ed3d38
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/ScriptableObject/Excel/Hero_2.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_2.asset
@ -0,0 +1,24 @@
+%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: e8aa3c1560079b84cafbabe4bc0d2c8d, type: 3}
+  m_Name: Hero_2
+  m_EditorClassIdentifier: 
+  id: 2
+  name: 
+  icon: hero_2
+  has: 1
+  hp: 150
+  atk: 0
+  speed: 0
+  pos: {x: 0, y: 0, z: 0}
+  ches: {x: 0, y: 0}
+  attack_target: []
--- a/Assets/_Project/ScriptableObject/Excel/Hero_2.asset.meta
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_2.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7a59ffde55e89f148be41e4d40255f16
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/ScriptableObject/Excel/Hero_3.asset
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_3.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: e8aa3c1560079b84cafbabe4bc0d2c8d, type: 3}
+  m_Name: Hero_3
+  m_EditorClassIdentifier: 
+  id: 2
+  name: "\u5973\u5DEB"
+  icon: hero_3
+  has: 0
+  hp: 80
+  atk: 8
+  speed: 1.1
+  pos: {x: 3, y: 2, z: 4}
+  ches: {x: 5, y: 12}
+  attack_target:
+  - 2.5
--- a/Assets/_Project/ScriptableObject/Excel/Hero_3.asset.meta
+++ b/Assets/_Project/ScriptableObject/Excel/Hero_3.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 226d036514514d14c8566a97edac7c9e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/Scripts.meta
+++ b/Assets/_Project/Scripts.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 68764e3ec69209448b59cc4903d361f9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/Scripts/Generator.meta
+++ b/Assets/_Project/Scripts/Generator.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb473f9b25d86d6449c922ea70ff3338
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/Scripts/Generator/Excel.meta
+++ b/Assets/_Project/Scripts/Generator/Excel.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7acf5756494783c4e9c6d7a6f73b3f2f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Project/Scripts/Generator/Excel/Hero.cs
+++ b/Assets/_Project/Scripts/Generator/Excel/Hero.cs
@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     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.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tools.ExcelResolver
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using UnityEngine;
+    
+    
+    public class Hero : ScriptableObject, IExcelData
+    {
+        
+        /// <summary>
+        /// 英雄
+        /// </summary>
+        public int id;
+        
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string name;
+        
+        /// <summary>
+        /// icon
+        /// </summary>
+        public string icon;
+        
+        /// <summary>
+        /// 有宠物
+        /// </summary>
+        public bool has;
+        
+        /// <summary>
+        /// 血量
+        /// </summary>
+        public int hp;
+        
+        /// <summary>
+        /// 攻击力
+        /// </summary>
+        public int atk;
+        
+        /// <summary>
+        /// 移速
+        /// </summary>
+        public float speed;
+        
+        /// <summary>
+        /// 位置
+        /// </summary>
+        public Vector3 pos;
+        
+        /// <summary>
+        /// 位置
+        /// </summary>
+        public Vector2 ches;
+        
+        /// <summary>
+        /// 攻击优先级
+        /// </summary>
+        public List<Single> attack_target;
+    }
+}
--- a/Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta
+++ b/Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e8aa3c1560079b84cafbabe4bc0d2c8d
--- a/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs
+++ b/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs
@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     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.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tools.ExcelResolver
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using UnityEngine;
+    using Sirenix.OdinInspector;
+    
+    
+    public class HeroUtil : SerializedScriptableObject, IExcelSO
+    {
+        
+        public Dictionary<int, Hero> Data;
+    }
+}
--- a/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta
+++ b/Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 0b8ec7437f31db141b138472f0c2a3aa