diff --git a/README.md b/README.md index f71ac52..a3b3aa6 100644 --- a/README.md +++ b/README.md @@ -746,7 +746,6 @@ return - [ ] 新增 unity 内置编辑器 - [ ] 新增 unreal 内置编辑器 - [ ] 补充单元测试 -- [ ] 支持多国家和地区本地化所需的表 merge 操作 ## 开发环境架设 diff --git a/src/Excel2TextDiff/Excel2TextWriter.cs b/src/Excel2TextDiff/Excel2TextWriter.cs index 6fabcda..1b096c1 100644 --- a/src/Excel2TextDiff/Excel2TextWriter.cs +++ b/src/Excel2TextDiff/Excel2TextWriter.cs @@ -43,12 +43,13 @@ namespace Excel2TextDiff if (lastNotEmptyIndex >= 0) { row = row.GetRange(0, lastNotEmptyIndex + 1); + lines.Add(string.Join(',', row)); } else { + // 忽略空白行,没必要diff这个 row.Clear(); } - lines.Add(string.Join(',', row)); } } } diff --git a/src/Luban.Job.Cfg/Source/Defs/DefField.cs b/src/Luban.Job.Cfg/Source/Defs/DefField.cs index 46929cd..3db94dd 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefField.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefField.cs @@ -45,8 +45,8 @@ namespace Luban.Job.Cfg.Defs public RefValidator Ref { get; private set; } - // 对于 two key map, 需要检查 ref,但不为它生成 ref 代码.故只有map类型表才要生成代码 - public bool GenRef => Ref != null && Ref.Tables.Count == 1 && Assembly.GetCfgTable(Ref.FirstTable).IsMapTable; + // 如果ref了多个表,不再生成 xxx_ref之类的字段,也不会resolve + public bool GenRef => Ref != null && Ref.Tables.Count == 1; public bool HasRecursiveRef => (CType.IsBean) || (CType is TArray ta && ta.ElementType.IsBean)