From 121e59732d4965a3bf87240d6b7ed0cc028629ee Mon Sep 17 00:00:00 2001 From: dingxiaowei <1213250243@qq.com> Date: Sun, 14 Jul 2024 17:28:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/ExcelTool/v16/.suo | Bin 84480 -> 83456 bytes ExcelTool/Parser/GenModels.cs | 4 ++-- ExcelTool/bin/Debug/ExcelTool.exe | Bin 32256 -> 32256 bytes ExcelTool/bin/Debug/ExcelTool.pdb | Bin 85504 -> 85504 bytes ExcelTool/bin/Debug/avatarguideTest.cs | 4 ++-- ExcelTool/bin/Debug/battleScene.cs | 4 ++-- ExcelTool/bin/Debug/official_room.cs | 4 ++-- ExcelTool/obj/Debug/ExcelTool.exe | Bin 32256 -> 32256 bytes ExcelTool/obj/Debug/ExcelTool.pdb | Bin 85504 -> 85504 bytes 9 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vs/ExcelTool/v16/.suo b/.vs/ExcelTool/v16/.suo index 8f7de97628c7babe560e57f53c7fdd233761bb06..26181323f84b65804e5fbd73c1a0a4103581064d 100644 GIT binary patch delta 1875 zcmb7DZA@Eb6z+MsEfj8{j86x1Y!v2zTUuz#m(FgCWf_JqiC-}eO5ul+U`!#pn5<}I zku|gQY`IgD1+JzsgpjS5jA)`U88Q5r5~E9uKa4X*iT(lCY5dwer?%*T#rP)AJ?FmX zea|`1Ip+|`{ z+?mw*pO>5d_p{3?QtX?IwfL^oDzWQGRxuVEW%C4`XeV@_VlIMP*k*haZFyx8F>DTx zEv_fH>Z2xvlO{UFi7>Ggsd3WpA#h+O%aRw9WoaXsBFq0wmgU{ZRwV64l1z3Ffyq+g z>I_~|m@QX}D_2cOvfUudbnYc^qIZxjsH9yEom$(F)-pxJz9e%;**~A;u43HYX#wtA z!@qXn7>?F<;FatLBF(K9;8EbjQkV2Va|kr6L_TA-!yt2_-13wi0~H|-2DJCTgRzrM z!AwFwQThqsvRtDFU%CFNBYGg47}bbKjuov{3$lZ3T zqeGbAiZ?>mePr$BQ8yUy_JeyYuaYuDI86wl;(gf2gR1FM;Srd6R*vMi8i5BW>BNHG z;~5ytUy^u2Ql2qT5W;UB>eKrUOoJAcG+Ag*2|UdrqgHLM zjUH$Z39UGux~DGh@S{r(}JW604zU^b}TyJ$Msel1a-*b6QC$^|E=T_uo?D;Ea!;n{P5 z;J5)(+qOwQPQ@G(^r01LTu#-MJ0?F$d&!O&aD4rU`m_t`^%uT41-o7%Q#pZK_6o^U zgb0D#|JqddZVZPd^oAYqHeNTELzKGu3~bv{JvhA#8MVo~i3b?adJ}^k*JLBktXD9v z1Ny+%b}0OwAJE_H!=FiSBK`2|c>U(%+9M)1*SjCXXC}DD_`~T!?4LcTzGsIVy=(O% zXp<(KS*=v(TOeO=Ui%2Nh)MfNXy;7}Fp;KuYoSieU9wrUIpOm-?v_surv2pxwB!nL4m|wGD(g JXNNj=@)rh{R-6C; delta 1890 zcmbu8e@s(X6vulWeWit0D2n`$A66;Iucy!!D2hf3+t5v+ic3aJCgsPH$shYsl5H*# zH>aC+hQ6adOqNBStTSdK(3^~HnaLK&W{e3W+Y++>{CoSuk#0*I)18BqRdCrKyU8c_ zzI*RE?|jcWcPK0mU66-6pn5V;Alc>)e|P-it)HM$3|h_s6e5^QPCTGtHJME7iF6{5 zs35Y4Oky3enaCyzh_{JyLLs&i_sM<(%?=`$C?-;gzt}O299r|dae3x7k2?C!Fqv|e z9Bf;4*ot46TW~SWVP^N}kh3@JqbpAn&k*~G_lV9&AQwC2VK^NLY|^9w+r+iQ?_@Rgzi#Q<=n^-<)L1D`AP|1OIL&=?JgLtl2+Mb2bRU9 z;t+7N-z7qoVK5wKt*Hg4Q);!R6dY=rF>_ThP+fvGk_|(hS@x2ZQ^I@dEv1N-oT`Kq5#OeOQ7vi8jKa0#R42|buC&{is@;&Z3kPt} zegLO4YOlt(1BCInnptH#UEtPDn2LDq4;E`p($3Ym4=jAGb1UAn@3otnXw5}jF$rz7 zNaBsI(|{9QO<3IS5=VDm0quy>&NV(uSI-ewQQdLKK1wTt;FF@sz^f43G6Tx$oGW}x zx0c2~cpynbt2UD3H*naD%PU;sL?8Fama7R z*L)po(wP1%3F_q6V={>cpF#$nRI5bQz>k2z=PO0!SCs|m?0*yIj@RJ9^L`vZX`6Jpco(voV<6W!qi&?v5E30qx_}t#! zI<>cuG503pO@*`|5l)lOD*2eR%iJ0==scc8b|cweU#hS2uBJ ztkcSE!7(glnerzaeknErl7R6;6_1kwc=FDZ`iu485wCxE28>e{9KBP@f7~s4u5W{! zP2_QTd|gWmer~Oo@y;L58D}lnJ<_aySqzz?V}1f+n$27m?DsXgJ)RoX(;f7w-iGd= z>Z|W{tHDNhe{Y?;zQ+^nf2=kfoiEeJTOeEPxc_ZR?DvTL@Bi+_fsy*;JGyM<8Q@5KzlGqJ<{~OMvc*y_& 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 e83f0d34c79b5c875f428d7cf45458ea350fb761..b96ba3d1a6374daa5d2e437e22a7c6645e8ca812 100644 GIT binary patch delta 516 zcmZqp!`SeLaY6^n+JGZFC-%rNwoP0a&S)~3kx`v>#Y6@Mi^+;iI+G(A)fsyxH!{{U zW=v*e66Q%TWnf@tU}7+2U|^fPu*6_-0FxQxg~@>yawb0n7zzYginIh73N&OG7`XB$ z00}ig)*=g_2%M9K%xRmv*g~Cg$L7-(70i4GfHLCw3xS$=If~9q4z$s-xdjxG=h0vR zS_X8`Mn(n(h9V6ipct11J4mc(9x~?(GDl-f0u0UUA@>gbaOlaL>bPa6_|r)x4!kjwKx!eNY_e~OG-Jl*%#x*y6AgGa T^OgN#W$G~6ELig%$Y%!t)Lws* delta 526 zcmZqp!`SeLaY6^n*Q$yo6MJMBCrw-#&gd|ikx`v>%R~kSi^+;iI+G(A)fs0@Ze*-y zESb#6B+Qdz%D}+Pz{Ft4z`!*KOA~8r#f!gDgJc3j2+_>egIFQNWlOA delta 185 zcmZpe!`d*1b%TeD!uM!hExE=harrMtWBL8vxBvUO#o_+m%X 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 e83f0d34c79b5c875f428d7cf45458ea350fb761..b96ba3d1a6374daa5d2e437e22a7c6645e8ca812 100644 GIT binary patch delta 516 zcmZqp!`SeLaY6^n+JGZFC-%rNwoP0a&S)~3kx`v>#Y6@Mi^+;iI+G(A)fsyxH!{{U zW=v*e66Q%TWnf@tU}7+2U|^fPu*6_-0FxQxg~@>yawb0n7zzYginIh73N&OG7`XB$ z00}ig)*=g_2%M9K%xRmv*g~Cg$L7-(70i4GfHLCw3xS$=If~9q4z$s-xdjxG=h0vR zS_X8`Mn(n(h9V6ipct11J4mc(9x~?(GDl-f0u0UUA@>gbaOlaL>bPa6_|r)x4!kjwKx!eNY_e~OG-Jl*%#x*y6AgGa T^OgN#W$G~6ELig%$Y%!t)Lws* delta 526 zcmZqp!`SeLaY6^n*Q$yo6MJMBCrw-#&gd|ikx`v>%R~kSi^+;iI+G(A)fs0@Ze*-y zESb#6B+Qdz%D}+Pz{Ft4z`!*KOA~8r#f!gDgJc3j2+_>egIFQNWlOA delta 185 zcmZpe!`d*1b%TeD!uM!hExE=harrMtWBL8vxBvUO#o_+m%X