diff --git a/.vs/ExcelTool/v16/.suo b/.vs/ExcelTool/v16/.suo index 2618132..e4764fa 100644 Binary files a/.vs/ExcelTool/v16/.suo and b/.vs/ExcelTool/v16/.suo differ diff --git a/ExcelTool/ExcelTool.csproj b/ExcelTool/ExcelTool.csproj index c0f0255..cc0d5da 100644 --- a/ExcelTool/ExcelTool.csproj +++ b/ExcelTool/ExcelTool.csproj @@ -64,6 +64,7 @@ + diff --git a/ExcelTool/Parser/GenModels.cs b/ExcelTool/Parser/GenModels.cs index b3be1f0..49021dd 100644 --- a/ExcelTool/Parser/GenModels.cs +++ b/ExcelTool/Parser/GenModels.cs @@ -477,6 +477,12 @@ namespace ExcelTool sb.Append("{\n"); // sb.Append($"\tpublic List<{excelName}> {excelName}Infos = new List<{excelName}>();\n"); sb.Append($"\tDictionary {excelName}Infos = new Dictionary();\n"); + sb.Append("\n"); + sb.Append($"\tpublic List<{excelName}> {excelName}List()\n"); + sb.Append("\t{\n"); + sb.Append($"\t\treturn new List<{excelName}>({excelName}Infos.Values);\n"); + sb.Append("\t}\n"); + sb.Append("\n"); sb.Append($"\tpublic void DeSerialize(BinaryReader reader)\n"); sb.Append("\t{\n"); sb.Append($"\t\tint count = reader.ReadInt32();\n"); diff --git a/ExcelTool/bin/Debug/ExcelTool.exe b/ExcelTool/bin/Debug/ExcelTool.exe index 73d9626..0d64567 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 5af038c..a37c1bc 100644 Binary files a/ExcelTool/bin/Debug/ExcelTool.pdb and b/ExcelTool/bin/Debug/ExcelTool.pdb differ diff --git a/ExcelTool/bin/Debug/Microsoft.mshtml.dll b/ExcelTool/bin/Debug/Microsoft.mshtml.dll index ffe2141..da0768b 100644 Binary files a/ExcelTool/bin/Debug/Microsoft.mshtml.dll and b/ExcelTool/bin/Debug/Microsoft.mshtml.dll differ diff --git a/ExcelTool/bin/Debug/avatarguideTest.cs b/ExcelTool/bin/Debug/avatarguideTest.cs index dc9e6e3..94f12a7 100644 --- a/ExcelTool/bin/Debug/avatarguideTest.cs +++ b/ExcelTool/bin/Debug/avatarguideTest.cs @@ -116,6 +116,12 @@ public partial class avatarguideTest : IBinarySerializable public partial class avatarguideTestConfig : IBinarySerializable { Dictionary avatarguideTestInfos = new Dictionary(); + + public List avatarguideTestList() + { + return new List(avatarguideTestInfos.Values); + } + public void DeSerialize(BinaryReader reader) { int count = reader.ReadInt32(); diff --git a/ExcelTool/bin/Debug/battleScene.cs b/ExcelTool/bin/Debug/battleScene.cs index 57b68fc..ddb69ab 100644 --- a/ExcelTool/bin/Debug/battleScene.cs +++ b/ExcelTool/bin/Debug/battleScene.cs @@ -145,6 +145,12 @@ public partial class battleScene : IBinarySerializable public partial class battleSceneConfig : IBinarySerializable { Dictionary battleSceneInfos = new Dictionary(); + + public List battleSceneList() + { + return new List(battleSceneInfos.Values); + } + public void DeSerialize(BinaryReader reader) { int count = reader.ReadInt32(); diff --git a/ExcelTool/bin/Debug/official_room.cs b/ExcelTool/bin/Debug/official_room.cs index bac0683..be1e626 100644 --- a/ExcelTool/bin/Debug/official_room.cs +++ b/ExcelTool/bin/Debug/official_room.cs @@ -218,6 +218,12 @@ public partial class official_room : IBinarySerializable public partial class official_roomConfig : IBinarySerializable { Dictionary official_roomInfos = new Dictionary(); + + public List official_roomList() + { + return new List(official_roomInfos.Values); + } + public void DeSerialize(BinaryReader reader) { int count = reader.ReadInt32(); diff --git a/ExcelTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ExcelTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7a4eed7..e53188e 100644 Binary files a/ExcelTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ExcelTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ExcelTool/obj/Debug/ExcelTool.csproj.AssemblyReference.cache b/ExcelTool/obj/Debug/ExcelTool.csproj.AssemblyReference.cache deleted file mode 100644 index b1b9e11..0000000 Binary files a/ExcelTool/obj/Debug/ExcelTool.csproj.AssemblyReference.cache and /dev/null differ diff --git a/ExcelTool/obj/Debug/ExcelTool.csproj.CoreCompileInputs.cache b/ExcelTool/obj/Debug/ExcelTool.csproj.CoreCompileInputs.cache index 64e5c8e..c799f4a 100644 --- a/ExcelTool/obj/Debug/ExcelTool.csproj.CoreCompileInputs.cache +++ b/ExcelTool/obj/Debug/ExcelTool.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -437758f1983b3631650720a6b12c64139816a676 +f9568ef42d2d08917776e58ac01f34159ad429ba diff --git a/ExcelTool/obj/Debug/ExcelTool.csproj.FileListAbsolute.txt b/ExcelTool/obj/Debug/ExcelTool.csproj.FileListAbsolute.txt index 58a1d3d..3e7a243 100644 --- a/ExcelTool/obj/Debug/ExcelTool.csproj.FileListAbsolute.txt +++ b/ExcelTool/obj/Debug/ExcelTool.csproj.FileListAbsolute.txt @@ -47,8 +47,6 @@ D:\study\github\ExcelTool\ExcelTool\bin\Debug\Spire.XLS.dll D:\study\github\ExcelTool\ExcelTool\bin\Debug\Microsoft.mshtml.dll D:\study\github\ExcelTool\ExcelTool\bin\Debug\Spire.Pdf.xml D:\study\github\ExcelTool\ExcelTool\bin\Debug\Spire.XLS.xml -D:\study\github\ExcelTool\ExcelTool\obj\Debug\ExcelTool.csproj.AssemblyReference.cache -D:\study\github\ExcelTool\ExcelTool\obj\Debug\ExcelTool.csproj.SuggestedBindingRedirects.cache D:\study\github\ExcelTool\ExcelTool\obj\Debug\ExcelTool.csproj.CoreCompileInputs.cache D:\study\github\ExcelTool\ExcelTool\obj\Debug\ExcelTool.csproj.CopyComplete D:\study\github\ExcelTool\ExcelTool\obj\Debug\ExcelTool.exe diff --git a/ExcelTool/obj/Debug/ExcelTool.csproj.SuggestedBindingRedirects.cache b/ExcelTool/obj/Debug/ExcelTool.csproj.SuggestedBindingRedirects.cache deleted file mode 100644 index e69de29..0000000 diff --git a/ExcelTool/obj/Debug/ExcelTool.exe b/ExcelTool/obj/Debug/ExcelTool.exe index 73d9626..0d64567 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 5af038c..a37c1bc 100644 Binary files a/ExcelTool/obj/Debug/ExcelTool.pdb and b/ExcelTool/obj/Debug/ExcelTool.pdb differ