From fed8d14d734c55fec5d40f9f817121baa6270532 Mon Sep 17 00:00:00 2001
From: yuuko <yuuko@localdomain>
Date: Mon, 24 Nov 2025 16:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9Windows=E4=B8=BB=E6=9C=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E7=A0=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用GB2312编码读取TXT文件，确保中文字符正确显示
- 输出保持UTF-8 with BOM格式
- 解决Windows环境下乱码问题

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 FileMerger.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FileMerger.cs b/FileMerger.cs
index 25a2365..cde65c3 100644
--- a/FileMerger.cs
+++ b/FileMerger.cs
@@ -155,15 +155,15 @@ namespace SlideCombine
             try
             {
                 string[] lines;
-                // 先尝试UTF-8，支持特殊字符如Ü、ü等
+                // 在Windows上使用GB2312编码读取，正确处理中文字符
                 try
                 {
-                    lines = File.ReadAllLines(txtFile, Encoding.UTF8);
+                    lines = File.ReadAllLines(txtFile, Encoding.GetEncoding("GB2312"));
                 }
                 catch
                 {
-                    // 如果UTF-8失败，尝试GBK
-                    lines = File.ReadAllLines(txtFile, Encoding.GetEncoding("GBK"));
+                    // 如果GB2312不可用，使用系统默认编码
+                    lines = File.ReadAllLines(txtFile, Encoding.Default);
                 }
 
                 foreach (var line in lines)