From 60d3cc40d12a3cd17ddc38d21a57fbb97640ce8d Mon Sep 17 00:00:00 2001 From: coffee <985942825@qq.com> Date: Sun, 26 Jan 2025 19:33:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=94=AE=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExcelResolverEditorWindow.WriteSOData.cs | 31 ++++++++++++++++-- Assets/_Project/ExcelResolver/Excel/hero.xlsx | Bin 11077 -> 11078 bytes .../Excel/Hero/{Hero_7.asset => Hero_1.asset} | 2 +- .../{Hero_9.asset.meta => Hero_1.asset.meta} | 2 +- .../Excel/Hero/{Hero_8.asset => Hero_2.asset} | 2 +- .../{Hero_7.asset.meta => Hero_2.asset.meta} | 2 +- .../Excel/Hero/{Hero_9.asset => Hero_3.asset} | 4 +-- .../{Hero_8.asset.meta => Hero_3.asset.meta} | 2 +- 8 files changed, 36 insertions(+), 9 deletions(-) rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_7.asset => Hero_1.asset} (99%) rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_9.asset.meta => Hero_1.asset.meta} (79%) rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_8.asset => Hero_2.asset} (99%) rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_7.asset.meta => Hero_2.asset.meta} (79%) rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_9.asset => Hero_3.asset} (98%) rename Assets/_Project/ScriptableObject/Excel/Hero/{Hero_8.asset.meta => Hero_3.asset.meta} (79%) diff --git a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs index 6a1d0e2..5f660a4 100644 --- a/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs +++ b/Assets/Unity-Tools/ExcelResolver/Editor/ExcelResolverEditorWindow.WriteSOData.cs @@ -41,10 +41,11 @@ namespace Tools.ExcelResolver.Editor for (int row = 1; row <= worksheet.Dimension.End.Row; row++) { - var assetName = $"{classCodeData.className}_{row}"; - var fullPath = $"{path}{assetName}.asset"; // 跳过注释行 if (worksheet.Cells[row, 1].Text.StartsWith("##")) continue; + + var assetName = getAssetName(worksheet, row, classCodeData); + var fullPath = $"{path}{assetName}.asset"; if (assets.ContainsKey(assetName)) { @@ -86,6 +87,32 @@ namespace Tools.ExcelResolver.Editor fieldInfo.SetValue(instance, convertedValue); } } + + string getAssetName(ExcelWorksheet worksheet, int row, ClassCodeData classCodeData) + { + switch (classCodeData.tableType) + { + case TableType.SingleKeyTable: + var keyColIndex = classCodeData.keyField[0].colIndex; + var key = worksheet.Cells[row, keyColIndex].Text; + if (!string.IsNullOrEmpty(key)) + return $"{classCodeData.className}_{key}"; + break; + // case TableType.UnionMultiKeyTable: + // return $"{classCodeData.className}_{classCodeData.keyField[0].varName}"; + // case TableType.MultiKeyTable: + // return $"{classCodeData.className}_{classCodeData.keyField[0].varName}"; + // case TableType.NotKetTable: + // return classCodeData.className; + // case TableType.ColumnTable: + // return $"{classCodeData.className}_{classCodeData.fields[2].Value.varName}"; + } + + + throw new Exception($"无法定义资产名称 " + + $"className: '{classCodeData.className}' " + + $"FullAddress: {row} "); + } } } } \ No newline at end of file diff --git a/Assets/_Project/ExcelResolver/Excel/hero.xlsx b/Assets/_Project/ExcelResolver/Excel/hero.xlsx index 2a6aa5be5241232a33bd2e9188ecdf3580cf91dc..07deefe224f51193ddbfbf57ceb70643117b3093 100644 GIT binary patch delta 1613 zcmV-T2D16ZR>oGao&f|%rinU}q5&)e)3Pa((E%KPx%V(_x4NMSxk=8+mvep+PgYgw zJcH7O6bT}pj~oz8@hkbL4141*fGHkf1eaG)YfSVpc~?D!5Uy24xD+jwJ~l zu{uEuW9kTF%@$Bm?OBJgVkT8Zjoqpo*OWcc9B|AnT7>$WX@Q>Gks`Q^1I_1Dw6=q%APP@2=Y|eUdaIbVR7@MZ?ny`yu^Ar3q zyT0wJx`k+G#Q>!-XAx6CjZ`U&2PDn&Xk?%jY&mY}yv-Sto zF2w)Dk?RvT7`MdGuCoK;9*}mqkN-#d4YM2rwE+p{P2=ff1ONb0liCC!e_fNJI23)~ zs{IcX?*oG0mO3?xwx8Wo+cUe*h*7Bq!a|gu`Sp7t5;~VS%s#Y@$+_p=+;a%T@#pt2 z&~7A2eHu-4%V_Bui9CArqw_@n{%!ebplc~}qoW(ph)nb!B-KAp|NLW|(c~??5W+NI zh|-CEVJse*X6ju?=%xmZe@O&0Cz^yVgRjZiOyh*O$08^UOuNohif5_t0@S=Ma9~xx! zO~U5al+n;}nX6C7g#up_b2>iy(8XMOEg`3g{>2)-40RYU5P$n5OFvv|%ssr4fOw1? z!793zTi`(HTMk^qP%Gyy06C-UG5<#9BnT$@%mQDf{}xH|Ye->=93QXCe9OW%UlZ*} zPVO~ea~k~PAK7K1e-HI?>@S+Fh=0B?D5h<6b5f56zyP0G=;wCUwa|U%weo1oHhOkf z*Sw-1cS`FX%7g5C5d6>XL2wWJA|PKIPXiZa$k1p=V~OJOPVz*y4a@jtsU#Uf3m_1xjm=jgk~Dty3iHa zRN#|$o*RM>$8NsgSR)Jk=H=Kg0t{YAVe~d_jm;Yv%Y#246s*v;M%J#N6=*?g3ECp@ ztd6i{#JrAZ%Lu2A=*Wmg9nqB$%Q~VbBcAGrzKmGa5d#^qt|NvrVpB(0l@dkEwh9R9 z>P`VcZQUy%f2gm|3J7ZKivm)0Rx%FUIRC>q0$mvg=`mA4kRWpf1S#S)Llz1MQf;Y# zpjuYVkaZnmBkeZ|2-1G5fFSL63JB7EuYe%!pB0cw`@*U(3P>fRWDnRO8|~2+`-(sd zd)TPoGX(@`KUYAIuudIjj-VCbiWXVHQ9vpyNSXVPnLj`6ktLpVvp!_IO_8i~ z0E?U*WD7@{M3D<6-|{}%LR3%v;sq>!lCL-fZyf7;q=8(uk%~Z*TWJ!RZ6{44o9(4Z zS&j z3cP4Pdi9d5Gc4*x?VUrkC>E!8q)Alsf=?a_R#f+r=Nh2lCy5VraCMK7UsTq7)G|=^ zjYNeOwUs83XLiyg_6$tIJ_4^BRa3BYctv)VX_Mc#{G7yJjbryr_HJ_aqf`sX3AkDY z7%t(5pyHa*xEO`K=s+2q`O0q>IC>Mf!&(MB)lQVM@(UcBa^6?MuCW%oF-czipK#KL zl4;_@A-gzRPxP23EOC978f={s*&L32Pkz`IE;cKm=1F005JrC>E21 zA`lAz0000103ZMW0C$r-CzAw7rinU}(Yli?#AlkX@h0gRIxDM0}k zlUyk}0X&nJDK-IPlg=qX0SJ>1DqacZP2=ff1ONb0lXfas0bG;LDn$ZJ3zOdj6_Y9} L6$YIq00000T4d(3 delta 1601 zcmV-H2EO^mR>fAZo&f|sfQe(1q5&)e(y<|v(E%KPZSP^)ZFNKOGCAk}a?VfU@vefpbVFW=dDgx}(l<&G<9R0f&T)a0QkLW*KgQe%%w%9w~T_tQWfM z0D@zGD4_yr4Wx$23-u7pW?^q z&0Sa3FJ!wb4k(QUkGKYAl}@?JG60oHWfnQpF+S4TJ(kSasattgfVfwM0Ur;oyjP0Hj^+)Bllv1G5|hwE+&{s4&K21ONa}5C8xe0F%%v6_cMT z1%H)T+j65g5PjdO{RfKo0fQai%J$U6m-w1YZDw|#F_vvAfLM@CX1;zK$%v?thuMcX zSUP>W>2na0N1xxL(72K`3urtx9jj#;B=+ech)-kl`?tlXzG-C4iw|B%V=^{>kj(r% z`SXuaPSdySOb9c8A>MOn$@YHuExtqQ<#4ZMJs(P(i5bb~ zbZYfQfuGWh9+~CS$QGs5?{Z)dl>3bQ8j+@1k(a(*l21UKz|HN0FknCU?Un@*R)6v2 zd2Z!NX8G~0iVqEPdNyIxOU7t4^O$E&MqGifsXZAT0_b8Py^)gR*!BqTl~2e6816c*T1`c?o}Fw`ozIiO(ld=^~El!W2fTo*3-m*;>>NMOqh zAFs=73vQaPsc|4j?-H^p4gU!a?0-Bq2WC0;7tNO>IGq`k(zYH7QlEyv0G~z_6lOM! z$a@!+ifG5Ry6%H%_`Dl8O6L|Tg4|mW{LgPeQ2Q?e9C%_x8n`G!23A8FM;2G~Q6zF* zxQ$fC|V?lpw9%L?J5%++bEuv13CMH$t#`c2887SRs4DBID!SAU}|B;#f% z%sCmQG&kVEg|5Jo0-vJu!VqFO@ru>P89LxLzrcQxVDLf)qt{7mWM9EpKKucpWQDdh zvOY*!iI%jEq~(bp>j+mxOzViYikQ_A9ThRJBOX-5qK@dQh^IQDry`bhL|;X$>WG1g zSl1Cwr37!;Mgu`z-D)7Ht$#ZW1oib<13`^_(Lk!sD#n2a=YJSSqATMdJsvd>B*;_) zL5j?pA#)7`skYESP%X=5$f^!;k@jm11Zls~K#=xZ4FqYw(?F2+&l*UjJ-6zM22#nW z*aKF`Mtij7x+2li9xm$lqXvSspK2gT*jXKdx-hRJ+DNp827*LeYJVU|w3P;eL|bbh zsN796WUGN7U3VJD9bMrS)~KtLRf46g?Mha~F5PC@j--{~iWXU6rh!yeP%`%*vv_~H zLr1>p9($1OIzh5d0W5QNkS%7)B#NAC`4+d)7NUCU@eNqf_)rIz zw-|M!vJ#_?g|e>|D&(1sGKoC1RVJ}#U=r35*ltu!!Opq$v1-aGo?CHF5?kZMJCU82 zo`N_tLUIJImIa1O#UY4aGn(*GSc~?Q!HKW@c7}sDfhVkG!CUP}DJ#Fgv8mvFCG3(I ziI