diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs new file mode 100644 index 0000000..e0ac202 --- /dev/null +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs @@ -0,0 +1,35 @@ +using System; +using OfficeOpenXml; + +namespace Tools.ExcelResolver.Editor +{ + internal class TClassAndStruct : TType + { + public TClassAndStruct() { } + public TClassAndStruct(string typeText, Type classType) : base(typeText) + { + RealType = classType; + FieldWriteFormat = RealType.Name; + } + internal override Type RealType { get; } + internal override object DefaultValue => null; + internal override string FieldWriteFormat { get; } + + internal override bool String2TType(string typeText, out TType result) + { + result = null; + return false; + } + + internal override object TryParseFrom(string cellText) + { + throw new NotImplementedException("请使用另一个重载方法"); + } + + internal object TryParseFrom(int row, int startCol, ExcelWorksheet worksheet) + { + + return null; + } + } +} \ No newline at end of file diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs.meta b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs.meta new file mode 100644 index 0000000..ba3eb3d --- /dev/null +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Types/TClassAndStruct.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 350f4d6f292f4cb9ab7cdbad130f1e57 +timeCreated: 1738651506 \ No newline at end of file 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 15c61f5..cce766f 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.Cell.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; using OfficeOpenXml; -using UnityEngine; namespace Tools.ExcelResolver.Editor { 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 faf6d5b..5052885 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/Core/Util/ExcelResolverUtil.TType.cs @@ -9,6 +9,7 @@ namespace Tools.ExcelResolver.Editor { private static TType[] _allTTypes; private static Type[] _enumTypes; + private static Type[] _classAndStructTypes; private static ExcelRange _currentCell; private static string _currentClassName; @@ -31,7 +32,21 @@ namespace Tools.ExcelResolver.Editor // or "Assembly-CSharp-Editor" // or "Assembly-CSharp-Editor-firstpass") .SelectMany(a => a.GetTypes()) - .Where(t => t.IsEnum) + .Where(t => t.IsEnum && string.Equals(t.Namespace, "Tools.ExcelResolver", StringComparison.Ordinal)) + .ToArray(); + } + + internal static Type[] GetAllClassAndStruct() + { + return AppDomain.CurrentDomain.GetAssemblies() + .Where(a => a.GetName().Name + // is "UnityEngine" + is "Assembly-CSharp") + // or "Assembly-CSharp-firstpass" + // or "Assembly-CSharp-Editor" + // or "Assembly-CSharp-Editor-firstpass") + .SelectMany(a => a.GetTypes()) + .Where(t => (t.IsClass || (t.IsValueType && !t.IsPrimitive && !t.IsEnum)) && string.Equals(t.Namespace, "Tools.ExcelResolver", StringComparison.Ordinal)) // IsPrimitive为基本类型如float,int等 .ToArray(); } @@ -54,6 +69,7 @@ namespace Tools.ExcelResolver.Editor return result; } } + _enumTypes ??= GetAllEnumTypes(); foreach (var enumType in _enumTypes) { @@ -62,6 +78,8 @@ namespace Tools.ExcelResolver.Editor return Activator.CreateInstance(typeof(TEnum), targetText, enumType) as TType; } } + + _classAndStructTypes ??= GetAllClassAndStruct(); throw new Exception($"type定义错误 " + $"className: '{_currentClassName}' " + diff --git a/Assets/_Project/ExcelResolver/Excel/Test.xlsx b/Assets/_Project/ExcelResolver/Excel/Test.xlsx index 1956a18..c1909aa 100644 Binary files a/Assets/_Project/ExcelResolver/Excel/Test.xlsx and b/Assets/_Project/ExcelResolver/Excel/Test.xlsx differ diff --git a/Assets/_Project/Scenes/SampleScene.unity b/Assets/_Project/Scenes/SampleScene.unity index 1c63aa8..08fac26 100644 --- a/Assets/_Project/Scenes/SampleScene.unity +++ b/Assets/_Project/Scenes/SampleScene.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -250,12 +250,12 @@ MonoBehaviour: m_RequiresColorTexture: 0 m_Version: 2 m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -336,6 +336,9 @@ Light: m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &410087041 Transform: m_ObjectHideFlags: 0 @@ -423,6 +426,50 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1798497130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1798497132} + - component: {fileID: 1798497131} + m_Layer: 0 + m_Name: Test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1798497131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798497130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0612f54544cdb1841a14e836c052db63, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1798497132 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798497130} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -430,3 +477,4 @@ SceneRoots: - {fileID: 330585546} - {fileID: 410087041} - {fileID: 832575519} + - {fileID: 1798497132} diff --git a/Assets/_Project/ScriptableObject/Excel/Monster2/Monster2_1_1_1.asset b/Assets/_Project/ScriptableObject/Excel/Monster2/Monster2_1_1_1.asset deleted file mode 100644 index ea2567c..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster2/Monster2_1_1_1.asset +++ /dev/null @@ -1,84 +0,0 @@ -%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: a576b35de94d3344d8fbd0763d6dd001, type: 3} - m_Name: monster2_1_1_1 - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - 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: 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 - level: 1 - star: 1 - name: "\u9053\u58EB" - icon: hero_1 - has: 1 - hp: 100 - atk: 20 - speed: 1.2 - pos: {x: 0, y: 1, z: 9} - ches: {x: 0, y: 1} - attack_target: - - {x: 1, y: 2} - - {x: 1, y: 2} - - {x: 1, y: 2} - - {x: 1, y: 2} - color: 3 diff --git a/Assets/_Project/ScriptableObject/Excel/Monster2/Monster2_1_1_1.asset.meta b/Assets/_Project/ScriptableObject/Excel/Monster2/Monster2_1_1_1.asset.meta deleted file mode 100644 index 449dee6..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster2/Monster2_1_1_1.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1d616e671540a5e45a2e9bbc397473cd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster2/_Monster2Util.asset b/Assets/_Project/ScriptableObject/Excel/Monster2/_Monster2Util.asset deleted file mode 100644 index 6aa2880..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster2/_Monster2Util.asset +++ /dev/null @@ -1,71 +0,0 @@ -%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: 7198c6febd43b3e4e9bc3d03adee7ca6, type: 3} - m_Name: _monster2Util - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: - - {fileID: 11400000, guid: 1d616e671540a5e45a2e9bbc397473cd, type: 2} - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: - - Name: Data - Entry: 7 - Data: 0|System.Collections.Generic.Dictionary`2[[System.ValueTuple`3[[System.Int32, - mscorlib],[System.Int32, mscorlib],[System.Int32, mscorlib]], mscorlib],[Tools.ExcelResolver.monster2, - Assembly-CSharp]], mscorlib - - Name: comparer - Entry: 7 - Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.ValueTuple`3[[System.Int32, - mscorlib],[System.Int32, mscorlib],[System.Int32, mscorlib]], mscorlib]], - mscorlib - - Name: - Entry: 8 - Data: - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 7 - Data: System.ValueTuple`3[[System.Int32, mscorlib],[System.Int32, mscorlib],[System.Int32, - mscorlib]], mscorlib - - Name: Item1 - Entry: 3 - Data: 1 - - Name: Item2 - Entry: 3 - Data: 1 - - Name: Item3 - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: $v - Entry: 10 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster2/_Monster2Util.asset.meta b/Assets/_Project/ScriptableObject/Excel/Monster2/_Monster2Util.asset.meta deleted file mode 100644 index d5da683..0000000 --- a/Assets/_Project/ScriptableObject/Excel/Monster2/_Monster2Util.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 917fe978c60c5cb49b2b3907a9ca328d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/Monster2.meta b/Assets/_Project/ScriptableObject/Excel/Test.meta similarity index 77% rename from Assets/_Project/ScriptableObject/Excel/Monster2.meta rename to Assets/_Project/ScriptableObject/Excel/Test.meta index 6382964..be8d2a9 100644 --- a/Assets/_Project/ScriptableObject/Excel/Monster2.meta +++ b/Assets/_Project/ScriptableObject/Excel/Test.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3a52cf4c5b05234bb6bc5e68daf29f9 +guid: b73bb5af007b45341964af83ae76e1e9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Project/ScriptableObject/Excel/com.meta b/Assets/_Project/ScriptableObject/Excel/com.meta deleted file mode 100644 index 1826f9d..0000000 --- a/Assets/_Project/ScriptableObject/Excel/com.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5d697dbce85032d4dba2a90d7bb50290 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/com/_comUtil.asset b/Assets/_Project/ScriptableObject/Excel/com/_comUtil.asset deleted file mode 100644 index 4a52389..0000000 --- a/Assets/_Project/ScriptableObject/Excel/com/_comUtil.asset +++ /dev/null @@ -1,26 +0,0 @@ -%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: 65d0d896e6a9aba4c86524d1ead223f2, type: 3} - m_Name: _comUtil - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - cangku_chushi: 3 - des_xishu: 2 - ta_chushi_unlock: 01000000cc00000091010000cb000000 diff --git a/Assets/_Project/ScriptableObject/Excel/com/_comUtil.asset.meta b/Assets/_Project/ScriptableObject/Excel/com/_comUtil.asset.meta deleted file mode 100644 index 8a6c35f..0000000 --- a/Assets/_Project/ScriptableObject/Excel/com/_comUtil.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7ee0eb7708acae845ae0445697042da4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/monster3.meta b/Assets/_Project/ScriptableObject/Excel/monster3.meta deleted file mode 100644 index 6be9a0b..0000000 --- a/Assets/_Project/ScriptableObject/Excel/monster3.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f681dec3cba786f4ba476100c5a6f29e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/ScriptableObject/Excel/monster3/_monster3Util.asset b/Assets/_Project/ScriptableObject/Excel/monster3/_monster3Util.asset deleted file mode 100644 index b576193..0000000 --- a/Assets/_Project/ScriptableObject/Excel/monster3/_monster3Util.asset +++ /dev/null @@ -1,24 +0,0 @@ -%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: 352ae4160560b684498c8ef06a908f94, type: 3} - m_Name: _monster3Util - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - Data: [] diff --git a/Assets/_Project/ScriptableObject/Excel/monster3/_monster3Util.asset.meta b/Assets/_Project/ScriptableObject/Excel/monster3/_monster3Util.asset.meta deleted file mode 100644 index 9264955..0000000 --- a/Assets/_Project/ScriptableObject/Excel/monster3/_monster3Util.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3648edb4f0c677a4485b6b4c2deef683 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Project/Scripts/ExcelResolverClass.cs b/Assets/_Project/Scripts/ExcelResolverClass.cs new file mode 100644 index 0000000..6243b21 --- /dev/null +++ b/Assets/_Project/Scripts/ExcelResolverClass.cs @@ -0,0 +1,17 @@ +namespace Tools.ExcelResolver +{ + public class Item + { + public int id; + public int refId; + public string name; + public int price; + } + public struct ItemStruct + { + public int id; + public int refId; + public string name; + public int price; + } +} \ No newline at end of file diff --git a/Assets/_Project/Scripts/ExcelResolverClass.cs.meta b/Assets/_Project/Scripts/ExcelResolverClass.cs.meta new file mode 100644 index 0000000..1c6af01 --- /dev/null +++ b/Assets/_Project/Scripts/ExcelResolverClass.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 44468ff6f4f44332a951837539234633 +timeCreated: 1738650601 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster2.cs b/Assets/_Project/Scripts/Generator/Excel/Monster2.cs deleted file mode 100644 index 52ff47a..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster2.cs +++ /dev/null @@ -1,93 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class monster2 : SerializedScriptableObject, IExcelSOData - { - - /// - /// 英雄 - /// - public int id; - - /// - /// 等级 - /// - public int level; - - /// - /// 星级 - /// - public int star; - - /// - /// 名称 - /// - public string name; - - /// - /// icon - /// - public string icon; - - /// - /// 有宠物 - /// - public bool has; - - /// - /// 血量 - /// - public int hp; - - /// - /// 攻击力 - /// - public int atk; - - /// - /// 移速 - /// - public float speed; - - /// - /// 位置 - /// - public Vector3 pos; - - /// - /// 位置 - /// - public Vector2 ches; - - /// - /// 攻击优先级 - /// - public List attack_target; - - /// - /// 你好 - /// - public Dictionary nihao; - - /// - /// - /// - public CustomizeColor color; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster2.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Monster2.cs.meta deleted file mode 100644 index fe1cc60..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster2.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: a576b35de94d3344d8fbd0763d6dd001 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster2Util.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Monster2Util.cs.meta deleted file mode 100644 index 36ccb4d..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/Monster2Util.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 7198c6febd43b3e4e9bc3d03adee7ca6 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/Monster2Util.cs b/Assets/_Project/Scripts/Generator/Excel/Test.cs similarity index 71% rename from Assets/_Project/Scripts/Generator/Excel/Monster2Util.cs rename to Assets/_Project/Scripts/Generator/Excel/Test.cs index 6d12712..3aa368f 100644 --- a/Assets/_Project/Scripts/Generator/Excel/Monster2Util.cs +++ b/Assets/_Project/Scripts/Generator/Excel/Test.cs @@ -17,9 +17,17 @@ namespace Tools.ExcelResolver using Sirenix.OdinInspector; - public class monster2Util : SerializedScriptableObject, IExcelSOUtil + public class Test : SerializedScriptableObject, IExcelSOData { - public Dictionary<(System.Int32, System.Int32, System.Int32), monster2> Data; + /// + /// 英雄 + /// + public int id; + + /// + /// + /// + public int item; } } diff --git a/Assets/_Project/Scripts/Generator/Excel/Test.cs.meta b/Assets/_Project/Scripts/Generator/Excel/Test.cs.meta new file mode 100644 index 0000000..ee20f99 --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/Test.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1c45734ab68bc9b4d9e31e53f3f360e2 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/monster3Util.cs b/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs similarity index 84% rename from Assets/_Project/Scripts/Generator/Excel/monster3Util.cs rename to Assets/_Project/Scripts/Generator/Excel/TestUtil.cs index 4fffffd..6889e1e 100644 --- a/Assets/_Project/Scripts/Generator/Excel/monster3Util.cs +++ b/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs @@ -17,9 +17,9 @@ namespace Tools.ExcelResolver using Sirenix.OdinInspector; - public class monster3Util : SerializedScriptableObject, IExcelSOUtil + public class TestUtil : SerializedScriptableObject, IExcelSOUtil { - public List Data; + public List Data; } } diff --git a/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs.meta b/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs.meta new file mode 100644 index 0000000..965ec37 --- /dev/null +++ b/Assets/_Project/Scripts/Generator/Excel/TestUtil.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ab74c9c14b1a72b438c93e10a5c51397 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/comUtil.cs b/Assets/_Project/Scripts/Generator/Excel/comUtil.cs deleted file mode 100644 index 0183be7..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/comUtil.cs +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class comUtil : SerializedScriptableObject, IExcelSOUtil - { - - /// - /// 初始仓库空位数 - /// - public int cangku_chushi; - - /// - /// 防御系数 - /// - public int des_xishu; - - /// - /// 初始解锁的塔 - /// - public List ta_chushi_unlock; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/comUtil.cs.meta b/Assets/_Project/Scripts/Generator/Excel/comUtil.cs.meta deleted file mode 100644 index 0090571..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/comUtil.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 65d0d896e6a9aba4c86524d1ead223f2 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/monster3.cs b/Assets/_Project/Scripts/Generator/Excel/monster3.cs deleted file mode 100644 index 8b0bf5b..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/monster3.cs +++ /dev/null @@ -1,98 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -namespace Tools.ExcelResolver -{ - using System; - using System.Collections; - using System.Collections.Generic; - using UnityEngine; - using Sirenix.OdinInspector; - - - public class monster3 : SerializedScriptableObject, IExcelSOData - { - - /// - /// 英雄 - /// - public int id; - - /// - /// 等级 - /// - public int level; - - /// - /// 星级 - /// - public int star; - - /// - /// 名称 - /// - public string name; - - /// - /// icon - /// - public string icon; - - /// - /// 有宠物 - /// - public bool has; - - /// - /// 血量 - /// - public int hp; - - /// - /// 攻击力 - /// - public int atk; - - /// - /// 移速 - /// - public float speed; - - /// - /// 位置 - /// - public Vector3 pos; - - /// - /// 位置 - /// - public Vector2 ches; - - /// - /// 攻击优先级 - /// - public List attack_target; - - /// - /// 你好 - /// - public Dictionary nihao; - - /// - /// - /// - public Dictionary attribute; - - /// - /// - /// - public CustomizeColor color; - } -} diff --git a/Assets/_Project/Scripts/Generator/Excel/monster3.cs.meta b/Assets/_Project/Scripts/Generator/Excel/monster3.cs.meta deleted file mode 100644 index 61a1cf0..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/monster3.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 916e0a5dbd451394bb4ac42b142bbb9d \ No newline at end of file diff --git a/Assets/_Project/Scripts/Generator/Excel/monster3Util.cs.meta b/Assets/_Project/Scripts/Generator/Excel/monster3Util.cs.meta deleted file mode 100644 index 9bee5c4..0000000 --- a/Assets/_Project/Scripts/Generator/Excel/monster3Util.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 352ae4160560b684498c8ef06a908f94 \ No newline at end of file diff --git a/Assets/_Project/Scripts/Test.cs b/Assets/_Project/Scripts/Test.cs new file mode 100644 index 0000000..66c8f33 --- /dev/null +++ b/Assets/_Project/Scripts/Test.cs @@ -0,0 +1,23 @@ +using System; +using System.Linq; +using Sirenix.OdinInspector; +using UnityEngine; + +public class Test : MonoBehaviour +{ + [Button] + private void TestButton() + { + var a = AppDomain.CurrentDomain.GetAssemblies() + .Where(a => a.GetName().Name + // is "UnityEngine" + is "Assembly-CSharp") + // or "Assembly-CSharp-firstpass" + // or "Assembly-CSharp-Editor" + // or "Assembly-CSharp-Editor-firstpass") + .SelectMany(a => a.GetTypes()) + .Where(t => (t.IsClass || (t.IsValueType && !t.IsPrimitive && !t.IsEnum)) && string.Equals(t.Namespace, "Tools.ExcelResolver", StringComparison.Ordinal)) // IsPrimitive为基本类型如float,int等 + .ToArray(); + Debug.Log(a.Length); + } +} diff --git a/Assets/_Project/Scripts/Test.cs.meta b/Assets/_Project/Scripts/Test.cs.meta new file mode 100644 index 0000000..4707d01 --- /dev/null +++ b/Assets/_Project/Scripts/Test.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0612f54544cdb1841a14e836c052db63 \ No newline at end of file diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..ede5887 --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file