From 18678059f4fb31db89140ae6581ed37a670d4488 Mon Sep 17 00:00:00 2001 From: walon Date: Mon, 25 Oct 2021 22:03:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DLuban=E9=87=8D=E6=9E=84=E5=AF=BC=E8=87=B4LubanAssistan?= =?UTF-8?q?t=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Datas/DText.cs | 4 ++ src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs | 2 +- .../Source/Utils/ValidatorUtil.cs | 10 ++-- .../Source/Validators/RangeValidator.cs | 2 +- src/LubanAssistant/LubanAssistant.csproj | 29 +++++++--- src/LubanAssistant/Source/Datas/DText.cs | 54 ------------------- src/LubanAssistant/Source/Datas/DType.cs | 33 ------------ 7 files changed, 33 insertions(+), 101 deletions(-) delete mode 100644 src/LubanAssistant/Source/Datas/DText.cs delete mode 100644 src/LubanAssistant/Source/Datas/DType.cs diff --git a/src/Luban.Job.Cfg/Source/Datas/DText.cs b/src/Luban.Job.Cfg/Source/Datas/DText.cs index 18b36ca..3cc0404 100644 --- a/src/Luban.Job.Cfg/Source/Datas/DText.cs +++ b/src/Luban.Job.Cfg/Source/Datas/DText.cs @@ -1,5 +1,7 @@ using Luban.Job.Cfg.DataVisitors; +#if !LUBAN_LITE using Luban.Job.Cfg.l10n; +#endif namespace Luban.Job.Cfg.Datas { @@ -22,6 +24,7 @@ namespace Luban.Job.Cfg.Datas _rawValue = x; } +#if !LUBAN_LITE public string GetText(TextTable stringTable, NotConvertTextSet notConvertKeys) { if (stringTable != null) @@ -37,6 +40,7 @@ namespace Luban.Job.Cfg.Datas } return _rawValue; } +#endif public override void Apply(IDataActionVisitor visitor, T x) { diff --git a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs index 962a87b..c7a3e53 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs @@ -49,7 +49,7 @@ namespace Luban.Job.Cfg.Defs public TimeZoneInfo TimeZone { get; } - public bool OutputCompactJson { get; init; } + public bool OutputCompactJson { get; set; } public DefAssembly(string patchName, TimeZoneInfo timezone, List excludeTags, IAgent agent) { diff --git a/src/Luban.Job.Cfg/Source/Utils/ValidatorUtil.cs b/src/Luban.Job.Cfg/Source/Utils/ValidatorUtil.cs index 7d5838b..0d39a7b 100644 --- a/src/Luban.Job.Cfg/Source/Utils/ValidatorUtil.cs +++ b/src/Luban.Job.Cfg/Source/Utils/ValidatorUtil.cs @@ -25,13 +25,15 @@ namespace Luban.Job.Cfg.Utils private static void CreateValidatorsForArrayLike(TType containerType, TType elementType) { - if (containerType.Tags.Remove("ref", out var refStr)) + if (containerType.Tags.TryGetValue("ref", out var refStr)) { - elementType.Tags.TryAdd("ref", refStr); + elementType.Tags.Add("ref", refStr); + containerType.Tags.Remove("ref"); } - if (containerType.Tags.Remove("path", out var pathStr)) + if (containerType.Tags.TryGetValue("path", out var pathStr)) { - elementType.Tags.TryAdd("path", pathStr); + elementType.Tags.Add("path", pathStr); + containerType.Tags.Remove("path"); } CreateValidatorsForType(elementType); diff --git a/src/Luban.Job.Cfg/Source/Validators/RangeValidator.cs b/src/Luban.Job.Cfg/Source/Validators/RangeValidator.cs index c092de7..e8abef9 100644 --- a/src/Luban.Job.Cfg/Source/Validators/RangeValidator.cs +++ b/src/Luban.Job.Cfg/Source/Validators/RangeValidator.cs @@ -101,7 +101,7 @@ namespace Luban.Job.Cfg.Validators #if !LUBAN_LITE var pars = _str[1..^1].Split(','); #else - var pars = _str.Substring(1, _str.Length - 1).Split(','); + var pars = _str.Substring(1, _str.Length - 2).Split(','); #endif if (pars.Length != 2) { diff --git a/src/LubanAssistant/LubanAssistant.csproj b/src/LubanAssistant/LubanAssistant.csproj index 3d26322..5e46b2c 100644 --- a/src/LubanAssistant/LubanAssistant.csproj +++ b/src/LubanAssistant/LubanAssistant.csproj @@ -255,15 +255,15 @@ Source\DataCreators\ExcelStreamDataCreator.cs + + Source\DataCreators\InvalidExcelDataException.cs + Source\DataCreators\JsonDataCreator.cs Source\DataCreators\LuaDataCreator.cs - - Source\DataCreators\MultiRowExcelDataCreator.cs - Source\DataCreators\SheetDataCreator.cs @@ -381,6 +381,12 @@ Source\Datas\DString.cs + + Source\Datas\DText.cs + + + Source\Datas\DType.cs + Source\Datas\DVector2.cs @@ -468,6 +474,9 @@ Source\Utils\DataUtil.cs + + Source\Utils\ValidatorUtil.cs + Source\ValidatorContext.cs @@ -486,6 +495,9 @@ Source\Validators\ValidatorFactory.cs + + Source\AccessConvention.cs + Source\Defs\CommonDefLoader.cs @@ -504,9 +516,15 @@ Source\Defs\DefTypeBase.cs + + Source\Defs\IProcessor.cs + Source\ELanguage.cs + + Source\NamingConvention.cs + Source\RawDefs\Bean.cs @@ -636,9 +654,6 @@ - - - SettingsSingleFileGenerator @@ -659,8 +674,6 @@ - - diff --git a/src/LubanAssistant/Source/Datas/DText.cs b/src/LubanAssistant/Source/Datas/DText.cs deleted file mode 100644 index c883d0a..0000000 --- a/src/LubanAssistant/Source/Datas/DText.cs +++ /dev/null @@ -1,54 +0,0 @@ -using Luban.Job.Cfg.DataVisitors; - -namespace Luban.Job.Cfg.Datas -{ - public class DText : DType - { - public const string KEY_NAME = "key"; - public const string TEXT_NAME = "text"; - - public string Key { get; } - - private readonly string _rawValue; - - public string RawValue => _rawValue; - - public override string TypeName => "text"; - - public DText(string key, string x) - { - Key = key; - _rawValue = x; - } - - public override void Apply(IDataActionVisitor visitor, T x) - { - visitor.Accept(this, x); - } - - public override void Apply(IDataActionVisitor visitor, T1 x, T2 y) - { - visitor.Accept(this, x, y); - } - - public override TR Apply(IDataFuncVisitor visitor) - { - return visitor.Accept(this); - } - - public override TR Apply(IDataFuncVisitor visitor, T x) - { - return visitor.Accept(this, x); - } - - public override bool Equals(object obj) - { - return obj is DText o && o._rawValue == this._rawValue && o.Key == this.Key; - } - - public override int GetHashCode() - { - return _rawValue.GetHashCode(); - } - } -} diff --git a/src/LubanAssistant/Source/Datas/DType.cs b/src/LubanAssistant/Source/Datas/DType.cs deleted file mode 100644 index 9474adb..0000000 --- a/src/LubanAssistant/Source/Datas/DType.cs +++ /dev/null @@ -1,33 +0,0 @@ - -using Luban.Job.Cfg.DataVisitors; - -namespace Luban.Job.Cfg.Datas -{ - public abstract class DType - { - public abstract void Apply(IDataActionVisitor visitor, T x); - - public abstract void Apply(IDataActionVisitor visitor, T1 x, T2 y); - - public abstract TR Apply(IDataFuncVisitor visitor); - - public abstract TR Apply(IDataFuncVisitor visitor, T x); - - public abstract string TypeName { get; } - } - - public abstract class DType : DType - { - public T Value { get; } - - protected DType(T value) - { - Value = value; - } - - public override int GetHashCode() - { - return Value.GetHashCode(); - } - } -}