From 068d75a3ac1f0fa1c91a758139fc178f65c5a166 Mon Sep 17 00:00:00 2001 From: coffee <985942825@qq.com> Date: Sun, 19 Jan 2025 01:50:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=95=B4=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E5=A4=96=E7=95=8C=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE?= =?UTF-8?q?TType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/ExcelResolver/Editor/Core/DataVisitors.meta | 3 --- .../Core/DataVisitors/ExcelStreamDataCreator.cs | 7 ------- .../Core/DataVisitors/ExcelStreamDataCreator.cs.meta | 3 --- .../Core/ExcelResolver/Editor/Core/Types/TBool.cs | 8 ++++---- .../Core/ExcelResolver/Editor/Core/Types/TFloat.cs | 8 ++++---- .../Core/ExcelResolver/Editor/Core/Types/TInt.cs | 8 ++++---- .../Core/ExcelResolver/Editor/Core/Types/TString.cs | 8 ++++---- .../Core/ExcelResolver/Editor/Core/Types/TType.cs | 8 ++++---- .../Core/ExcelResolver/Editor/Core/Util.meta | 3 +++ .../{ => ExcelResolver/Editor/Core}/Util/TypeUtil.cs | 11 +++++------ .../Editor/Core}/Util/TypeUtil.cs.meta | 0 11 files changed, 28 insertions(+), 39 deletions(-) delete mode 100644 Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors.meta delete mode 100644 Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs delete mode 100644 Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs.meta create mode 100644 Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util.meta rename Assets/Unity-Tools/Core/{ => ExcelResolver/Editor/Core}/Util/TypeUtil.cs (93%) rename Assets/Unity-Tools/Core/{ => ExcelResolver/Editor/Core}/Util/TypeUtil.cs.meta (100%) diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors.meta b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors.meta deleted file mode 100644 index 287113e..0000000 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e2fd51fb4a2e4c9295c832372c69badb -timeCreated: 1736086194 \ No newline at end of file diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs deleted file mode 100644 index 0dd0875..0000000 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Tools.ExcelResolver.Editor.Core.DataVisitors -{ - public class ExcelStreamDataCreator - { - - } -} \ No newline at end of file diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs.meta b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs.meta deleted file mode 100644 index 279647e..0000000 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/DataVisitors/ExcelStreamDataCreator.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a4c1ffa2921644ac84e4b21f34f77766 -timeCreated: 1736086204 \ No newline at end of file diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TBool.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TBool.cs index 3dce5cd..217a832 100644 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TBool.cs +++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TBool.cs @@ -2,13 +2,13 @@ namespace Tools.ExcelResolver.Editor { - public class TBool : TType + internal class TBool : TType { - public override string TypeName => "bool"; + internal override string TypeName => "bool"; - public override Type RealType => typeof(bool); + internal override Type RealType => typeof(bool); - public override bool TryParseFrom(string s, out object o) + internal override bool TryParseFrom(string s, out object o) { if (bool.TryParse(s, out var b)) { diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TFloat.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TFloat.cs index 4becdcc..4fb3ba5 100644 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TFloat.cs +++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TFloat.cs @@ -2,13 +2,13 @@ namespace Tools.ExcelResolver.Editor { - public class TFloat : TType + internal class TFloat : TType { - public override string TypeName => "float"; + internal override string TypeName => "float"; - public override Type RealType => typeof(float); + internal override Type RealType => typeof(float); - public override bool TryParseFrom(string s, out object o) + internal override bool TryParseFrom(string s, out object o) { if (float.TryParse(s, out float f)) { diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TInt.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TInt.cs index 9d3528e..28fa533 100644 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TInt.cs +++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TInt.cs @@ -2,13 +2,13 @@ namespace Tools.ExcelResolver.Editor { - public class TInt : TType + internal class TInt : TType { - public override string TypeName => "int"; + internal override string TypeName => "int"; - public override Type RealType => typeof(int); + internal override Type RealType => typeof(int); - public override bool TryParseFrom(string s, out object o) + internal override bool TryParseFrom(string s, out object o) { var b = int.TryParse(s, out var i); o = i; diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TString.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TString.cs index 074aa39..a20502f 100644 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TString.cs +++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TString.cs @@ -2,13 +2,13 @@ namespace Tools.ExcelResolver.Editor { - public class TString : TType + internal class TString : TType { - public override string TypeName => "string"; + internal override string TypeName => "string"; - public override Type RealType => typeof(string); + internal override Type RealType => typeof(string); - public override bool TryParseFrom(string s, out object o) + internal override bool TryParseFrom(string s, out object o) { o = s; return true; diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TType.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TType.cs index 4f80bc6..1972cb7 100644 --- a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TType.cs +++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Types/TType.cs @@ -2,12 +2,12 @@ namespace Tools.ExcelResolver.Editor { - public abstract class TType + internal abstract class TType { - public abstract string TypeName { get; } + internal abstract string TypeName { get; } - public abstract Type RealType { get; } + internal abstract Type RealType { get; } - public abstract bool TryParseFrom(string s, out object o); + internal abstract bool TryParseFrom(string s, out object o); } } \ No newline at end of file diff --git a/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util.meta b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util.meta new file mode 100644 index 0000000..24eceb7 --- /dev/null +++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 276e7b8c8b2a430ebce24a139bc3918a +timeCreated: 1737222561 \ No newline at end of file diff --git a/Assets/Unity-Tools/Core/Util/TypeUtil.cs b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util/TypeUtil.cs similarity index 93% rename from Assets/Unity-Tools/Core/Util/TypeUtil.cs rename to Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util/TypeUtil.cs index 82887f0..b53bd54 100644 --- a/Assets/Unity-Tools/Core/Util/TypeUtil.cs +++ b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util/TypeUtil.cs @@ -1,14 +1,13 @@ using System; using System.Collections.Generic; -using Tools.ExcelResolver.Editor; using UnityEngine; -namespace Tools +namespace Tools.ExcelResolver.Editor { - public static class TypeUtil + internal static class TypeUtil { - public static TType GetTTypeByString(string typeText) + internal static TType GetTTypeByString(string typeText) { return typeText switch { @@ -39,7 +38,7 @@ namespace Tools }; } - public static Type GetTypeByString(string typeText) + internal static Type GetTypeByString(string typeText) { return typeText switch { @@ -76,7 +75,7 @@ namespace Tools /// /// /// - public static Type GetType(string typeText) + internal static Type GetType(string typeText) { // 首先尝试使用Type.GetType Type type = Type.GetType($"System.{typeText}", false, true); diff --git a/Assets/Unity-Tools/Core/Util/TypeUtil.cs.meta b/Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util/TypeUtil.cs.meta similarity index 100% rename from Assets/Unity-Tools/Core/Util/TypeUtil.cs.meta rename to Assets/Unity-Tools/Core/ExcelResolver/Editor/Core/Util/TypeUtil.cs.meta