Browse Source

使用导表

main
coffee 5 months ago
parent
commit
24cabe4536
  1. 24
      Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/TypeRegistryUserConfig.asset
  2. 8
      Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/TypeRegistryUserConfig.asset.meta
  3. 8
      Assets/Plugins/Sirenix/Odin Inspector/Config/Resources.meta
  4. 8
      Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix.meta
  5. 22
      Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset
  6. 8
      Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta
  7. 10
      Assets/Unity-Tools/Demo/Unity-Tools.Demo.asmdef
  8. 8
      Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Type.cs
  9. 7
      Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.asset
  10. 6
      Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs
  11. 13
      Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs
  12. 8
      Assets/_Project/ExcelResolver.meta
  13. 8
      Assets/_Project/ExcelResolver/Excel.meta
  14. BIN
      Assets/_Project/ExcelResolver/Excel/hero.xlsx
  15. 7
      Assets/_Project/ExcelResolver/Excel/hero.xlsx.meta
  16. 8
      Assets/_Project/ScriptableObject.meta
  17. 8
      Assets/_Project/ScriptableObject/Excel.meta
  18. 28
      Assets/_Project/ScriptableObject/Excel/Hero_1.asset
  19. 8
      Assets/_Project/ScriptableObject/Excel/Hero_1.asset.meta
  20. 24
      Assets/_Project/ScriptableObject/Excel/Hero_2.asset
  21. 8
      Assets/_Project/ScriptableObject/Excel/Hero_2.asset.meta
  22. 25
      Assets/_Project/ScriptableObject/Excel/Hero_3.asset
  23. 8
      Assets/_Project/ScriptableObject/Excel/Hero_3.asset.meta
  24. 8
      Assets/_Project/Scripts.meta
  25. 8
      Assets/_Project/Scripts/Generator.meta
  26. 8
      Assets/_Project/Scripts/Generator/Excel.meta
  27. 72
      Assets/_Project/Scripts/Generator/Excel/Hero.cs
  28. 2
      Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta
  29. 25
      Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs
  30. 2
      Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta

24
Assets/Plugins/Sirenix/Odin 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: []

8
Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/TypeRegistryUserConfig.asset.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 25e2868b70073ff4e8be4fe3a2fdc290
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Plugins/Sirenix/Odin Inspector/Config/Resources.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 76c4a9ac37c5725429d74e50b3acc481
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c4dd5d6aa7f5a4e46a8d8af3e68ae934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Plugins/Sirenix/Odin 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

8
Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b8030d3f9b93fe54eb0bb57228abeb2c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

10
Assets/Unity-Tools/Demo/Unity-Tools.Demo.asmdef

@ -2,11 +2,11 @@
"name": "Unity-Tools.Demo", "name": "Unity-Tools.Demo",
"rootNamespace": "", "rootNamespace": "",
"references": [ "references": [
"GUID:a1f7e93dbeee5cb41aa91ead2e679308", "Unity-Tools",
"GUID:9e24947de15b9834991c9d8411ea37cf", "Unity.Addressables",
"GUID:84651a3751eca9349aac36a66bba901b", "Unity.ResourceManager",
"GUID:f51ebe6a0ceec4240a699833d6309b23", "UniTask",
"GUID:593a5b492d29ac6448b1ebf7f035ef33" "UniTask.Addressables"
], ],
"includePlatforms": [], "includePlatforms": [],
"excludePlatforms": [], "excludePlatforms": [],

8
Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Type.cs

@ -56,12 +56,12 @@ namespace Tools.ExcelResolver.Editor
foreach (var assembly in assemblies) foreach (var assembly in assemblies)
{ {
var type = assembly.GetType(fullTypeName); var type = assembly.GetType(fullTypeName);
if (assembly.GetName().Name is "Assembly-CSharp-Editor" or "Assembly-CSharp-Editor-firstpass")
{
throw new ArgumentException($"不支持Editor目录下的'{fullTypeName}'类型");
}
if (type != null) if (type != null)
{ {
if (assembly.GetName().Name is "Assembly-CSharp-Editor" or "Assembly-CSharp-Editor-firstpass")
{
throw new ArgumentException($"不支持Editor目录下的'{fullTypeName}'类型");
}
TypeCache[fullTypeName] = type; TypeCache[fullTypeName] = type;
return type; return type;
} }

7
Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.asset

@ -12,8 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9247b1b02271436ca893eadb1fa8bdce, type: 3} m_Script: {fileID: 11500000, guid: 9247b1b02271436ca893eadb1fa8bdce, type: 3}
m_Name: ExcelResolverEditorConfig m_Name: ExcelResolverEditorConfig
m_EditorClassIdentifier: m_EditorClassIdentifier:
ExcelPathRoot: Assets/ExcelResolver/Excel ExcelPathRoot: Assets/_Project/ExcelResolver/Excel
JsonPathRoot: Assets/ExcelResolver/Json CodePathRoot: Assets/_Project/Scripts/Generator/Excel
CodePathRoot: Assets/Scripts/Generator/Excel SOPathRoot: Assets/_Project/ScriptableObject/Excel
GenerateDataClassNameSpace: Tools.ExcelResolver GenerateDataClassNameSpace: Tools.ExcelResolver
isInit: 0

6
Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorConfig.cs

@ -8,11 +8,11 @@ namespace Tools.ExcelResolver.Editor
public sealed class ExcelResolverEditorConfig : ScriptableObject public sealed class ExcelResolverEditorConfig : ScriptableObject
{ {
[LabelText("Excel路径"), FolderPath] [LabelText("Excel路径"), FolderPath]
public string ExcelPathRoot = "Assets/ExcelResolver/Excel"; public string ExcelPathRoot = "Assets/_Project/ExcelResolver/Excel";
[LabelText("C#代码路径"), ValueDropdown("@Tools.Editor.DirectoryUtil.GetFilePaths()")] [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()")] [LabelText("SO存放路径"), ValueDropdown("@Tools.Editor.DirectoryUtil.GetFilePaths()")]
public string SOPathRoot = "Assets/ScriptableObject/Excel"; public string SOPathRoot = "Assets/_Project/ScriptableObject/Excel";
[LabelText("生成代码命名空间")] [LabelText("生成代码命名空间")]
public string GenerateDataClassNameSpace = "Tools.ExcelResolver"; public string GenerateDataClassNameSpace = "Tools.ExcelResolver";

13
Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.cs

@ -25,8 +25,17 @@ namespace Tools.ExcelResolver.Editor
if (excelResolverConfig == null) if (excelResolverConfig == null)
{ {
string[] assetGuids = AssetDatabase.FindAssets($"ExcelResolverEditorConfig t:ExcelResolverEditorConfig"); string[] assetGuids = AssetDatabase.FindAssets($"ExcelResolverEditorConfig t:ExcelResolverEditorConfig");
string assetPath = AssetDatabase.GUIDToAssetPath(assetGuids[0]); if (assetGuids.Length > 0)
excelResolverConfig = AssetDatabase.LoadAssetAtPath<ExcelResolverEditorConfig>(assetPath); {
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();
}
} }
} }

8
Assets/_Project/ExcelResolver.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 46522688344b9244693521456a7deb41
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_Project/ExcelResolver/Excel.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f1554c02a4e515b4b8953edbfa311896
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/_Project/ExcelResolver/Excel/hero.xlsx

Binary file not shown.

7
Assets/_Project/ExcelResolver/Excel/hero.xlsx.meta

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d158d305a64ac74428b71f7a8f6ae16c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_Project/ScriptableObject.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 238b5e359150ae04fa915c27485e3708
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_Project/ScriptableObject/Excel.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7263635733ca40c48b9c2cb5a11cd653
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

28
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

8
Assets/_Project/ScriptableObject/Excel/Hero_1.asset.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4f581fc84b82a7f4da23f932e6ed3d38
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

24
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: []

8
Assets/_Project/ScriptableObject/Excel/Hero_2.asset.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7a59ffde55e89f148be41e4d40255f16
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

25
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

8
Assets/_Project/ScriptableObject/Excel/Hero_3.asset.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 226d036514514d14c8566a97edac7c9e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_Project/Scripts.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 68764e3ec69209448b59cc4903d361f9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_Project/Scripts/Generator.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eb473f9b25d86d6449c922ea70ff3338
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_Project/Scripts/Generator/Excel.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7acf5756494783c4e9c6d7a6f73b3f2f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

72
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;
}
}

2
Assets/_Project/Scripts/Generator/Excel/Hero.cs.meta

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: e8aa3c1560079b84cafbabe4bc0d2c8d

25
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;
}
}

2
Assets/_Project/Scripts/Generator/Excel/HeroUtil.cs.meta

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 0b8ec7437f31db141b138472f0c2a3aa
Loading…
Cancel
Save