xiang.li
/
luban
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix] 修复ref引用了被过滤的记录却未报告引用错误的bug

main
walon 2022-07-28 17:02:31 +08:00
parent c738b4dcad
commit 412a400471
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs
View File

@ -24,6 +24,7 @@ namespace Luban.Job.Cfg.Defs
public Service CfgTargetService { get; private set; } public Service CfgTargetService { get; private set; }
private readonly string _patchName; private readonly string _patchName;
private readonly List<string> _excludeTags; private readonly List<string> _excludeTags;
public Patch TargetPatch { get; private set; } public Patch TargetPatch { get; private set; }
@ -34,6 +35,8 @@ namespace Luban.Job.Cfg.Defs
public string TableManagerName => CfgTargetService.Manager; public string TableManagerName => CfgTargetService.Manager;
public List<string> ExcludeTags => _excludeTags;
public DefAssembly(string patchName, TimeZoneInfo timezone, List<string> excludeTags, IAgent agent) public DefAssembly(string patchName, TimeZoneInfo timezone, List<string> excludeTags, IAgent agent)
{ {
this._patchName = patchName; this._patchName = patchName;

17
src/Luban.Job.Cfg/Source/Validators/RefValidator.cs
View File

@ -1,4 +1,5 @@
using Luban.Job.Cfg.Datas; using Luban.Job.Cfg.Datas;
using Luban.Job.Cfg.DataSources;
using Luban.Job.Cfg.DataVisitors; using Luban.Job.Cfg.DataVisitors;
using Luban.Job.Cfg.Defs; using Luban.Job.Cfg.Defs;
using Luban.Job.Cfg.RawDefs; using Luban.Job.Cfg.RawDefs;
@ -58,8 +59,14 @@ namespace Luban.Job.Cfg.Validators
case ETableMode.MAP: case ETableMode.MAP:
{ {
var recordMap = assembly.GetTableDataInfo(defTable).FinalRecordMap; var recordMap = assembly.GetTableDataInfo(defTable).FinalRecordMap;
if (recordMap.ContainsKey(key)) if (recordMap.TryGetValue(key, out Record rec))
{ {
if (!rec.IsNotFiltered(assembly.ExcludeTags))
{
string locationFile = ValidatorContext.CurrentVisitor.CurrentValidateRecord.Source;
assembly.Agent.Error("记录 {0} = {1} (来自文件:{2}) 在引用表:{3} 中存在，但导出时被过滤了",
ValidatorContext.CurrentRecordPath, key, locationFile, defTable.FullName);
}
return; return;
} }
break; break;
@ -67,8 +74,14 @@ namespace Luban.Job.Cfg.Validators
case ETableMode.LIST: case ETableMode.LIST:
{ {
var recordMap = assembly.GetTableDataInfo(defTable).FinalRecordMapByIndexs[field]; var recordMap = assembly.GetTableDataInfo(defTable).FinalRecordMapByIndexs[field];
if (recordMap.ContainsKey(key)) if (recordMap.TryGetValue(key, out Record rec))
{ {
if (!rec.IsNotFiltered(assembly.ExcludeTags))
{
string locationFile = ValidatorContext.CurrentVisitor.CurrentValidateRecord.Source;
assembly.Agent.Error("记录 {0} = {1} (来自文件:{2}) 在引用表:{3} 中存在，但导出时被过滤了",
ValidatorContext.CurrentRecordPath, key, locationFile, defTable.FullName);
}
return; return;
} }
break; break;