From e225e859418e0558ca3c3e579c69f119249e5551 Mon Sep 17 00:00:00 2001 From: Oliver Wong Date: Tue, 10 Mar 2026 11:45:01 +0800 Subject: [PATCH] =?UTF-8?q?[Untested!]=20=E6=B7=BB=E5=8A=A0short=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ExcelTool/FileManager.cs | 32 ++++++++++++++------------------ ExcelTool/Parser/GenModels.cs | 4 ++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ExcelTool/FileManager.cs b/ExcelTool/FileManager.cs index d802640..f04de91 100644 --- a/ExcelTool/FileManager.cs +++ b/ExcelTool/FileManager.cs @@ -91,17 +91,13 @@ namespace ExcelTool { bw.Write(Convert.ToUInt32(data.Item2)); } + }else if (data.Item1.Equals("short")) + { + bw.Write(string.IsNullOrEmpty(data.Item2) ? Convert.ToInt16(0) : Convert.ToInt16(data.Item2)); } else if (data.Item1.Equals("ushort")) { - if (string.IsNullOrEmpty(data.Item2)) - { - bw.Write(Convert.ToUInt16(0)); - } - else - { - bw.Write(Convert.ToUInt16(data.Item2)); - } + bw.Write(string.IsNullOrEmpty(data.Item2) ? Convert.ToUInt16(0) : Convert.ToUInt16(data.Item2)); } else if (data.Item1.Equals("sbyte")) { @@ -160,14 +156,7 @@ namespace ExcelTool } else if (data.Item1.Equals("string")) { - if (string.IsNullOrEmpty(data.Item2)) - { - bw.Write(""); - } - else - { - bw.Write(data.Item2.ToString()); - } + bw.Write(string.IsNullOrEmpty(data.Item2) ? "" : data.Item2.ToString()); } else if (data.Item1.Equals("long")) { @@ -334,11 +323,18 @@ namespace ExcelTool bw.Write(Convert.ToUInt32(numStrs[i])); } } + else if (listType.Equals("short")) + { + foreach (string t in numStrs) + { + bw.Write(Convert.ToInt16(t)); + } + } else if (listType.Equals("ushort")) { - for (int i = 0; i < numStrs.Length; i++) + foreach (string t in numStrs) { - bw.Write(Convert.ToUInt16(numStrs[i])); + bw.Write(Convert.ToUInt16(t)); } } else if (listType.Equals("sbyte")) diff --git a/ExcelTool/Parser/GenModels.cs b/ExcelTool/Parser/GenModels.cs index c354667..54dad05 100644 --- a/ExcelTool/Parser/GenModels.cs +++ b/ExcelTool/Parser/GenModels.cs @@ -139,6 +139,9 @@ namespace ExcelTool.Parser else if (type.Equals("uint")) { sb.Append($"\t\t{name} = reader.ReadUInt32();\n"); + }else if (type.Equals("short")) + { + sb.Append($"\t\t{name} = reader.ReadInt16();\n"); } else if (type.Equals("ushort")) { @@ -354,6 +357,7 @@ namespace ExcelTool.Parser type.Equals("string") || type.Equals("uint") || type.Equals("ushort") || + type.Equals("short") || type.Equals("sbyte") || type.Equals("byte")) {