From ff1dd168dd622f693889d9308a1cc70e85619a6e Mon Sep 17 00:00:00 2001
From: walon <taojingjian@gmail.com>
Date: Tue, 29 Jun 2021 09:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96Excel2TextWriter=E7=9A=84=E5=AF=BC=E5=87=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=BF=BD=E7=95=A5=E7=A9=BA=E7=99=BD=E8=A1=8C?=
 =?UTF-8?q?=EF=BC=88=E7=94=A8=E4=BA=8Ediff=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E8=A1=8C=E6=97=A0=E6=84=8F=E4=B9=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                 | 1 -
 src/Excel2TextDiff/Excel2TextWriter.cs    | 3 ++-
 src/Luban.Job.Cfg/Source/Defs/DefField.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

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)