From aa0d0a9a3676b1d2d9b2d71a4247a3d553e16327 Mon Sep 17 00:00:00 2001 From: walon Date: Tue, 7 Dec 2021 17:33:56 +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=8DLubanAssistant=E7=9A=84=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82=E8=BF=99=E6=98=AFLubanAssistant=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=B8=AA=E7=89=88=E6=9C=AC=E3=80=82=E5=90=8E?= =?UTF-8?q?=E9=9D=A2=E8=BD=AC=E4=B8=BAOffice=20Add-In=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs | 2 +- src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs | 2 +- src/LubanAssistant/ExcelUtil.cs | 2 +- src/LubanAssistant/LubanAssistant.csproj | 51 +++++++++++++++---- .../Source/Utils/DataLoaderUtil.cs | 5 +- src/LubanAssistant/app.config | 2 +- src/LubanAssistant/packages.config | 15 +++--- 7 files changed, 57 insertions(+), 22 deletions(-) diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs index dadcb86..904658b 100644 --- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs +++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs @@ -850,7 +850,7 @@ namespace Luban.Job.Cfg.Defs var refGroup = new RefGroup() { Name = XmlUtil.GetRequiredAttribute(e, "name"), - Refs = XmlUtil.GetRequiredAttribute(e, "ref").Split(",").Select(s => s.Trim()).ToList(), + Refs = XmlUtil.GetRequiredAttribute(e, "ref").Split(',').Select(s => s.Trim()).ToList(), }; _refGroups.Add(refGroup); } diff --git a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs index b21bd21..776bcb6 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs @@ -215,7 +215,7 @@ namespace Luban.Job.Cfg.Defs return _refGroups.TryGetValue(groupName, out var refGroup) ? refGroup : null; } - public void Load(Defines defines, RemoteAgent agent, GenArgs args) + public void Load(Defines defines, IAgent agent, GenArgs args) { LoadCommon(defines, agent, args); diff --git a/src/LubanAssistant/ExcelUtil.cs b/src/LubanAssistant/ExcelUtil.cs index f904694..bd3d925 100644 --- a/src/LubanAssistant/ExcelUtil.cs +++ b/src/LubanAssistant/ExcelUtil.cs @@ -202,7 +202,7 @@ namespace LubanAssistant foreach (var rec in records) { var fillVisitor = new FillSheetVisitor(dataRangeArray, title.ToIndex + 1, totalRowCount); - totalRowCount += rec.Data.Apply(fillVisitor, title); + totalRowCount += rec.Data.Apply(fillVisitor, TBean.Create(false, rec.Data.Type, null), title); } object[,] resultDataRangeArray = new object[dataRangeArray.Count, title.ToIndex + 1]; diff --git a/src/LubanAssistant/LubanAssistant.csproj b/src/LubanAssistant/LubanAssistant.csproj index f6d4542..4df6b33 100644 --- a/src/LubanAssistant/LubanAssistant.csproj +++ b/src/LubanAssistant/LubanAssistant.csproj @@ -130,17 +130,20 @@ --> + + ..\packages\CommandLineParser.2.8.0\lib\net461\CommandLine.dll + ..\packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - ..\packages\NeoLua.1.3.13\lib\net47\Neo.Lua.dll + ..\packages\NeoLua.1.3.14\lib\net47\Neo.Lua.dll - ..\packages\NLog.4.7.11\lib\net45\NLog.dll + ..\packages\NLog.4.7.13\lib\net45\NLog.dll @@ -157,16 +160,16 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Text.Encodings.Web.5.0.1\lib\net461\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.5.0.2\lib\net461\System.Text.Json.dll + + ..\packages\System.Text.Json.6.0.0\lib\net461\System.Text.Json.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -447,9 +450,18 @@ Source\Defs\DefField.cs + + Source\Defs\DefRefGroup.cs + Source\Defs\DefTable.cs + + Source\RawDefs\TableDataInfo.cs + + + Source\GenArgs.cs + Source\RawDefs\CfgBean.cs @@ -465,6 +477,9 @@ Source\RawDefs\Patch.cs + + Source\RawDefs\RefGroup.cs + Source\RawDefs\ResourceInfo.cs @@ -540,12 +555,21 @@ Source\ELanguage.cs + + Source\GenArgsBase.cs + Source\NamingConvention.cs Source\RawDefs\Bean.cs + + Source\RawDefs\DefinesCommon.cs + + + Source\RawDefs\ExternalType.cs + Source\RawDefs\Field.cs @@ -745,4 +769,11 @@ + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + \ No newline at end of file diff --git a/src/LubanAssistant/Source/Utils/DataLoaderUtil.cs b/src/LubanAssistant/Source/Utils/DataLoaderUtil.cs index 59fc86f..907d7ba 100644 --- a/src/LubanAssistant/Source/Utils/DataLoaderUtil.cs +++ b/src/LubanAssistant/Source/Utils/DataLoaderUtil.cs @@ -206,7 +206,10 @@ namespace Luban.Job.Cfg.Utils var excludeTags = new List(); var ass = new DefAssembly("", timeZoneInfo, excludeTags, agent); - ass.Load("all", rawDefines); + ass.Load(rawDefines, agent, new GenArgs() + { + Service = "all", + }); DefAssemblyBase.LocalAssebmly = ass; return ass; diff --git a/src/LubanAssistant/app.config b/src/LubanAssistant/app.config index 63b4bde..ba76a9b 100644 --- a/src/LubanAssistant/app.config +++ b/src/LubanAssistant/app.config @@ -19,7 +19,7 @@ - + diff --git a/src/LubanAssistant/packages.config b/src/LubanAssistant/packages.config index 0e2370f..7030cfe 100644 --- a/src/LubanAssistant/packages.config +++ b/src/LubanAssistant/packages.config @@ -1,16 +1,17 @@  + - - - - + + + + - - - + + +