diff --git a/.vs/ExcelTool/v16/.suo b/.vs/ExcelTool/v16/.suo index 8f7de97..2618132 100644 Binary files a/.vs/ExcelTool/v16/.suo and b/.vs/ExcelTool/v16/.suo differ diff --git a/ExcelTool/Parser/GenModels.cs b/ExcelTool/Parser/GenModels.cs index bd595d3..01134ee 100644 --- a/ExcelTool/Parser/GenModels.cs +++ b/ExcelTool/Parser/GenModels.cs @@ -495,12 +495,12 @@ namespace ExcelTool sb.Append($"\t\t\t{excelName}Infos[i].Serialize(writer);\n"); sb.Append("\t\t}\n"); sb.Append("\t}\n\n"); - sb.Append($"\tpublic IEnumerable<{excelName}> QueryById(int id)\n"); + sb.Append($"\tpublic {excelName} QueryById(int id)\n"); sb.Append("\t{\n"); sb.Append($"\t\tvar datas = from d in {excelName}Infos\n"); sb.Append($"\t\t\t\t\twhere d.Id == id\n"); sb.Append($"\t\t\t\t\tselect d;\n"); - sb.Append("\t\treturn datas;\n"); + sb.Append("\t\treturn datas.First();\n"); sb.Append("\t}\n"); sb.Append("}\n"); FileManager.WriteToFile(Path.Combine(outputDir, $"{excelName}.cs"), sb.ToString()); diff --git a/ExcelTool/bin/Debug/ExcelTool.exe b/ExcelTool/bin/Debug/ExcelTool.exe index e83f0d3..b96ba3d 100644 Binary files a/ExcelTool/bin/Debug/ExcelTool.exe and b/ExcelTool/bin/Debug/ExcelTool.exe differ diff --git a/ExcelTool/bin/Debug/ExcelTool.pdb b/ExcelTool/bin/Debug/ExcelTool.pdb index 34dbfdf..98312f3 100644 Binary files a/ExcelTool/bin/Debug/ExcelTool.pdb and b/ExcelTool/bin/Debug/ExcelTool.pdb differ diff --git a/ExcelTool/bin/Debug/avatarguideTest.cs b/ExcelTool/bin/Debug/avatarguideTest.cs index 924eaf0..eed9b3a 100644 --- a/ExcelTool/bin/Debug/avatarguideTest.cs +++ b/ExcelTool/bin/Debug/avatarguideTest.cs @@ -137,11 +137,11 @@ public partial class avatarguideTestConfig : IBinarySerializable } } - public IEnumerable QueryById(int id) + public avatarguideTest QueryById(int id) { var datas = from d in avatarguideTestInfos where d.Id == id select d; - return datas; + return datas.FirstOrDefault(); } } diff --git a/ExcelTool/bin/Debug/battleScene.cs b/ExcelTool/bin/Debug/battleScene.cs index a6892b5..c9cfaf3 100644 --- a/ExcelTool/bin/Debug/battleScene.cs +++ b/ExcelTool/bin/Debug/battleScene.cs @@ -166,11 +166,11 @@ public partial class battleSceneConfig : IBinarySerializable } } - public IEnumerable QueryById(int id) + public battleScene QueryById(int id) { var datas = from d in battleSceneInfos where d.Id == id select d; - return datas; + return datas.FirstOrDefault(); } } diff --git a/ExcelTool/bin/Debug/official_room.cs b/ExcelTool/bin/Debug/official_room.cs index 33283a5..c8028e3 100644 --- a/ExcelTool/bin/Debug/official_room.cs +++ b/ExcelTool/bin/Debug/official_room.cs @@ -239,11 +239,11 @@ public partial class official_roomConfig : IBinarySerializable } } - public IEnumerable QueryById(int id) + public official_room QueryById(int id) { var datas = from d in official_roomInfos where d.Id == id select d; - return datas; + return datas.FirstOrDefault(); } } diff --git a/ExcelTool/obj/Debug/ExcelTool.exe b/ExcelTool/obj/Debug/ExcelTool.exe index e83f0d3..b96ba3d 100644 Binary files a/ExcelTool/obj/Debug/ExcelTool.exe and b/ExcelTool/obj/Debug/ExcelTool.exe differ diff --git a/ExcelTool/obj/Debug/ExcelTool.pdb b/ExcelTool/obj/Debug/ExcelTool.pdb index 34dbfdf..98312f3 100644 Binary files a/ExcelTool/obj/Debug/ExcelTool.pdb and b/ExcelTool/obj/Debug/ExcelTool.pdb differ