From 19dce4838329ba35d4d20075ec12616f7a1bc3ae Mon Sep 17 00:00:00 2001 From: walon Date: Fri, 18 Jun 2021 09:40:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=87=E5=AE=9A=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E5=80=BC=E7=9A=84text=E5=AD=97=E6=AE=B5=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=A4=84=E7=90=86=E5=9C=A8=E5=90=8C=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E9=85=8D=E7=BD=AE=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E7=9A=84=E6=9C=AC=E5=9C=B0=E5=8C=96=E5=80=BC?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=83=85=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/Datas/l10n/TextTable_CN.xlsx | Bin 9689 -> 9793 bytes ...L10N_生成.bat => L10N_生成_简体.bat} | 2 +- config/L10N_生成_繁体.bat | 15 +++++++++++++++ config/{l10n => }/NotLocalized_CN.txt | 0 src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs | 4 ++-- src/Luban.Job.Cfg/Source/JobController.cs | 5 ++++- src/Luban.Job.Cfg/Source/l10n/TextTable.cs | 8 ++++++-- 7 files changed, 28 insertions(+), 6 deletions(-) rename config/{L10N_生成.bat => L10N_生成_简体.bat} (80%) create mode 100644 config/L10N_生成_繁体.bat rename config/{l10n => }/NotLocalized_CN.txt (100%) diff --git a/config/Datas/l10n/TextTable_CN.xlsx b/config/Datas/l10n/TextTable_CN.xlsx index d9c009acc4ab39b991603773ffd590100aeaa146..323a6fbec6ccb79c429316c1a2de938919d17ade 100644 GIT binary patch delta 2559 zcmV|xlOTkRA+6D>5j+QiBvhp30A>owrNsT z{qMUbr60>nw+?}gx#sxXd(X9xPj^l2-EwV&l2b&EF!H!$suXfFMc=Q^{0Z`mrLv^8 zl6;EpxIw2UA3q##mA+Xib>jhmG*eVr+h##vSj8J^j#SGfSk_86)WT420@G?vOH*-f zf15f8F;0Sp3W@dznSKj~TCWA;g<@U9rQL&QUQ-M7O(j}0pf&6*a1GTrUF$Q|v;eUZ zwXk1OEvQ2zeEP z-C+#gh7<*w-wKz*CssQ7M^?!bR`Lu+fAG7}2uQ2fN(RCEN3{5fTZm4M*P`Y>_R{re z+kT;q%T$fLni{((h2`ZGjbW&^{M85DwewEYU=1T2CMY<0lJlkZO1`FDZLdJc13Xkl zlB8kmW`ZzgwdGn;%X1|y=NPCGi(JrOY`WfcJZb`}aR10Yr5+ zXz|i&58ls<3&_VedJEYB4U~_?dk*0zqie}@My~I}A{~tv`NGHfxbUNSTKJQBUibtT zNt#Bp5k89_z!{xnOwrC(kBN8Ce^V4emJdvy>29zPoOPmnrg4uSFW>clG=uHIIqbH$ zAA)bqvqap`+x-->R9oi)0bO`^!#Ik^Fx>XmpQ5xCh%ChsIKKb(iHl7Ilu0y6U?S9l zqc%nNvot)*^U2sB<@wx?;+Xie*=*sD^BAY_#4}vs6z0?5DcCqjL;1yhm7W`0ueOD z3iQi8E94a|BSYXaES?UoEL~zLyWdgEQX?~gh!dh6E)JQM$9|Yq}EJ2S<7qEeHf8Qp_nbuft12%pmm{)`8 z3`WIE&F_KK4fQXgnKv;d&fK-fS_ypZ-CsWz3+$Ix9oaBtUD& zk7mePEzAD-&ge z2~Pn8{*8>my9R5L;d6ODu~_W`{G1CWDMJo`~SbS|M)(Bu*X=Sz??|7Q?DmP~NI zGP&lfJXWQ#T!0N$c(oM#WI$uWipm1(*WB@Mr3krcf7dnmLedfz{J650))7{bzyU}# z95mNZxO?!e;hY+-qzcKJFQi-ZCV774yLMYe6@p2)Us($m<%oWHIS z`e3j|@V%+AZCms-cH)|XmKBIP#wM~;ZD^RmBEh#7Iqg-uZR-_u)3!DBtTeW5?v0N0 z{zD`9f7TkCx>Oz6wmH3a-E@q-evR5jw~6emq#jiRU&DLwZOYy2yRc*IHJ%=bO=PbK zFoPST+vHHmtVU-wIf^}O7!)HgDifY7J%sgScrM^;n)8t7mtBXRZw21bPgv|&E{&8X z<;(;kQO#A`)TF%7lXM2f+;Ro;@p`w1Jq3liHe;Lc!X%ul>&*rCk*Y&s6u6+`k^KVl z1v0o`Fqz9uLx2h{l)y{@pRd1A;vp`Fu2pYwR(}DLp#v1Neh;Av3gKG_yMh4#009S+ zDHsLRvy2Y!B6$Iv!LyE-j7-KN|gQ*FH+_&vXs|CV^1>ey8VqgU*2xd+#@2d;5dqc6#-kp4?<} z3GLPwUk4b+aaKM^zi}hNhK`VQvn@wUMt5(A`3mglRFs}RsjYpxy+|K>`nx+xdue7e zgp*k975?p+!EpWs{pW}f^$W8;0001!qXQDNq8q~j1^$U4-9fWz9VP*PQEP)R6ouah z`wx?kYuy{_lw#(NB6MDd(X*t&%GpDon#$+fw5Ji zazvsS1)z8%Ds{-wwp@oP3an#Fu)0x@qcd2vD(>$xt|@N}yqHFVaTVCWla!@g=jiC1 zrWjj(1j%gV9mQ7Vm0KqZT zAVE2cNks6E*MX7t&j-CSamvb_wcqIycghxg5J&gPR->_P+o+xOF?@c4cbn(ee$}v2 z-K{vFA`_f)1I#t1D7P7&l-=oSX5GeLd0&BeIQNd*u4nX-2M~xmz=xnioBEvTyq4)-qp#v1N z+aF8=3B`_uS#B@mPHBN_pvlMN(50yGzsPb423;adp1f&l;k0S5p86aWAK0000000000 z002gli6lV+`Wut58zqzRBq{;?lN=>F8~%wQ-9Z5W0967201*HH00000000000002J VlW`?J0yQ9$u_Yn~1tS0e001Y=vs?fG delta 2472 zcmY*bc{tPy7aq)v8IsAqj3w(>Mz&~*kPw3_`!XWQo-UV=f9b5@ zGnn3f2C>|%-!=WRTkQ{F=0j@3Uui@gldz8zZNXZ%g01Y%DO4zfB~}wtQN7V1samy+ zKJQ(@;8Av=y7=8J3&XEyKFu!2v;cQ_^3ihId*B+wmUJLsVUY&#V>a zt_Av{#$V6YWq(JHYe#?97{3RqKa*A$#)e`#lU+AU$3ou4PP6kwvU44S#R zF@oga+=X;r!8#dhFQ?D}`dTQd#Hjh6kYt-Pvl7DMb3g_dF+NrHTB%YuybIU`dbct zk+hN~+`&5^^&M$zgkDJ2?y(!K6qI$v@fKRdt5Z z?qAm(ZSCXMoBP^zzGNfuk4dp0H}G7Zd~$1X*uJ7C^&5t13bUNimDprwI9#6+(IkI@ zk&&NggX=5tYRTS#JZ3#=L!;4|36%}`7DuK|v?Ek{vK!y)u_CgXZMwU+jS^(ii`3|;Z6MiZ`j*AgSzr3yEszTnGTeU71=00)dW?*+5oUHZUKERLur!L~v-Za>PAG#llW#VGJW# zoRR`ga)_>d4LgGradpz9mjDEyAm4i7v)=V zG>p@urZKLhQpksHwyp^6_g~alruX)=~pz}ZK`N}HN^U%W9NI0 z<0ZI+L}!nh#nDf@C&V)Y{BN7M`Yn48zB2o0lRc$I_d9;RaBuIFUP;J>7E*rf0oR#O zG#Oy!oP`TCyFbCHJ2z??0}t>ou6d=F3f`Y>osfXsyxRmz=upjt3`ilP-Li{|prVq(;v+Z9A&8A}>y)F@wYc)vOm7yQ!$Su~%`nN)F4H7UoZ zxfqU45kkMAe3=V9-5L+J%qs>Wf#GlE0=o{rRL$PCD*$8qZB}(Km+xV-UTn5V`PG#e zOMaHLD}mG6t#N`N)-L-2_gVuBv-Zkb7xJo(ag2K+G`1>xd8u}p8V0*V_?{@)Do$u0 zt(JUh>R9WQe!kFBX3m+Sj>_PfTz5LhN~w&(mjxBz&sFIgeATiE`ve3~WWb%V?_c7r zH{&D0a{@H~g;iVAiRGf{W$&PcP;sk~7ZI^r7UHfhzxR~*uem*C;qSU6v8!8{V&;d22Qp6i{3bAvJVxRpB@u(9r>Hy&bc!D_M!Yn{y@k+ zRBAqQbtoQ6)L@u`EdV3h!>86-=8p%)){QcIBPxXPro?TtJmK5l=r_7=+HA);BpOZy z0CZ83s>$GH|L9#Y z@sh{U>R|Y%ey~s?PF)E1HCIHshf2=z?H9~tQ7Ia`FNfLC1IMlaAW|_KAIVt;(b&tK z$-$u@e(L*m77$1rLb@R$3S@O*+0^*@!g`L+mNq`Q_eHQR1O*E`eG%I}^p()@Xosmd z@gIYrx(}zV4LDQ?r#WbJy*_`FW5_M^YQROgg~N!Vy(=%*jObE*iY;_~eFt)777Auj zS}Z)$F;h(qHB&ZA@*Ilg@G)_67EI;*=q#hcsYQW%G!Nu(@n)O700Pt@n=)DvilgWq zxkjfNPfuQ|>YaM$XU_+%%kjjKCKlHjE;BkMgI=LF?N~x^L0?EQi`U@O!Q!IdFIZZ7 zu(gV{@ySjOOrm*mq0&IMLw6v4<8;h+#?rzcE;*$3V;Q(cMqH{}j3rhU{g5C=?vC>NSpt z$*}-#*j`n>*K?3A!-2@Wrdy$L&1~7a7{t0&6z9Nx0`u8K=uNDz@hc?Th1@As{BUpxH#;6^Uy_7aW0rTM0y5hC$wAi81PGhkZFPcZsa zk=~oT(@!78jMrJuR9~P-@#Y7!4WEC43KK5Oo>}qpn)%=s;f8P3+e=@o@!rj3MZeH8Pl=GsWE5F{ z=O*=V^OI6f)MEisi;RTmFA{)2e7`U!+8NTei~(zwC`kY*dlEsBm5d|_i7Ak3WD%nO gcJ+ihcC06U|A%rQP03zn{f`7mSWXIBAoY*!zxTj-*8l(j diff --git a/config/L10N_生成.bat b/config/L10N_生成_简体.bat similarity index 80% rename from config/L10N_生成.bat rename to config/L10N_生成_简体.bat index e983985..2ed68f6 100644 --- a/config/L10N_生成.bat +++ b/config/L10N_生成_简体.bat @@ -9,6 +9,6 @@ --gen_types data_lua ^ --export_test_data ^ --input_l10n_text_files l10n/TextTable_CN.xlsx ^ - --output_l10n_not_converted_text_file l10n/NotLocalized_CN.txt + --output_l10n_not_converted_text_file NotLocalized_CN.txt pause \ No newline at end of file diff --git a/config/L10N_生成_繁体.bat b/config/L10N_生成_繁体.bat new file mode 100644 index 0000000..c4c985e --- /dev/null +++ b/config/L10N_生成_繁体.bat @@ -0,0 +1,15 @@ +..\src\Luban.Client\bin\Debug\net5.0\Luban.Client.exe ^ + -h %LUBAN_SERVER_IP% ^ + -j cfg ^ + -- ^ + -d Defines/__root__.xml ^ + --input_data_dir Datas ^ + --output_data_dir output_lua ^ + -s client ^ + --gen_types data_lua ^ + --export_test_data ^ + --input_l10n_text_files l10n/TextTable_CN.xlsx ^ + --l10n_text_field_name text_tw ^ + --output_l10n_not_converted_text_file NotLocalized_CN.txt + +pause \ No newline at end of file diff --git a/config/l10n/NotLocalized_CN.txt b/config/NotLocalized_CN.txt similarity index 100% rename from config/l10n/NotLocalized_CN.txt rename to config/NotLocalized_CN.txt diff --git a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs index d2d4888..c943363 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs @@ -66,9 +66,9 @@ namespace Luban.Job.Cfg.Defs public NotConvertTextSet NotConvertTextSet { get; private set; } - public void InitL10n() + public void InitL10n(string textValueFieldName) { - ExportTextTable = new TextTable(this); + ExportTextTable = new TextTable(this, textValueFieldName); NotConvertTextSet = new NotConvertTextSet(); } diff --git a/src/Luban.Job.Cfg/Source/JobController.cs b/src/Luban.Job.Cfg/Source/JobController.cs index 0c49b61..1c2da00 100644 --- a/src/Luban.Job.Cfg/Source/JobController.cs +++ b/src/Luban.Job.Cfg/Source/JobController.cs @@ -64,6 +64,9 @@ namespace Luban.Job.Cfg [Option("input_l10n_text_files", Required = false, HelpText = "input l10n text table files. can be multi, sep by ','")] public string InputTextTableFiles { get; set; } + [Option("l10n_text_field_name", Required = false, HelpText = "text value field name of text table files. default is text")] + public string TextValueFieldName { get; set; } + [Option("output_l10n_not_converted_text_file", Required = false, HelpText = "the file save not converted l10n texts.")] public string OutputNotConvertTextFile { get; set; } @@ -233,7 +236,7 @@ namespace Luban.Job.Cfg if (needL10NTextConvert) { - ass.InitL10n(); + ass.InitL10n(args.TextValueFieldName); await DataLoaderUtil.LoadTextTablesAsync(agent, ass, args.InputDataDir, args.InputTextTableFiles); } diff --git a/src/Luban.Job.Cfg/Source/l10n/TextTable.cs b/src/Luban.Job.Cfg/Source/l10n/TextTable.cs index ca8cde8..d17013c 100644 --- a/src/Luban.Job.Cfg/Source/l10n/TextTable.cs +++ b/src/Luban.Job.Cfg/Source/l10n/TextTable.cs @@ -23,9 +23,13 @@ namespace Luban.Job.Cfg.l10n private readonly TBean _textRowType; - public TextTable(DefAssembly ass) + public TextTable(DefAssembly ass, string textValueFieldName) { this.Assembly = ass; + if (string.IsNullOrWhiteSpace(textValueFieldName)) + { + textValueFieldName = "text"; + } var defTextRowType = new DefBean(new CfgBean() { Namespace = "__intern__", @@ -40,7 +44,7 @@ namespace Luban.Job.Cfg.l10n { new CfgField() { Name = "key", Type = "string" }, //new Common.RawDefs.Field() { Id = 1, Name = "origin_text", Type = "string" }, - new CfgField() { Name = "text", Type = "string" }, + new CfgField() { Name = textValueFieldName, Type = "string" }, } }) {