From dced47ecf3d0b7734a27894a50eb7d33584f1bce Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 26 Apr 2023 11:43:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=8D=87=E7=BA=A7=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/arts/atlas/ui/login.spriteatlas | 4 ++ .../formation/formation_manager.lua.bytes | Bin 1835 -> 1887 bytes .../app/ui/main_city/main_city_ui.lua.bytes | Bin 12104 -> 12604 bytes .../lua/app/userdata/hero/hero_data.lua.bytes | Bin 3599 -> 4247 bytes Assets/prefabs/ui/main_city/main_ui.prefab | 58 ++++++++++++++++-- 5 files changed, 57 insertions(+), 5 deletions(-) diff --git a/Assets/arts/atlas/ui/login.spriteatlas b/Assets/arts/atlas/ui/login.spriteatlas index d8db6f7be..73836542f 100644 --- a/Assets/arts/atlas/ui/login.spriteatlas +++ b/Assets/arts/atlas/ui/login.spriteatlas @@ -62,8 +62,12 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} + - {fileID: 21300000, guid: 4c8cc7cd53e3b2846a4626abf9c5a69d, type: 3} + - {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} m_PackedSpriteNamesToIndex: - login_cn + - login_zh + - login_en m_RenderDataMap: {} m_Tag: login m_IsVariant: 0 diff --git a/Assets/lua/app/module/formation/formation_manager.lua.bytes b/Assets/lua/app/module/formation/formation_manager.lua.bytes index f5b3faf32cfafa37f9e749369ba068d1dcd9ea4b..a137426b91d0cbe720d9508585f2b18ded82f34b 100644 GIT binary patch delta 1104 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 SYj}~`nZR~>%uhV|zVe?h_8|8F diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index 07e1c7ddf985583241d9b044ae93ce70ed6c4cff..901bb6cb4a9aba9e222926d99be0c0fe46d4d330 100644 GIT binary patch literal 4247 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 VvYjGcPySazxIdYHTQW|w@IPwBDRuw= literal 3599 zcmZwKZA@F&83%9&Y~vV1csCB%m=_xZCb`$#YkUn324DOFHo-RU!4T6p<>COo#&)lH z398h5+^SWoCQZwvX^XUWoz$wNOqb?g4ekd99M z_|tRlbDr~@<9n``E-oh4o=E3YnZ--lxX?k*bosjXZ@ob)Wy$#&d%IrU{nKD~cS%KJZGVfW#y7=QX1?yGAUU-I0`pI_ZC_}|wa6#U?- zz>)ZWu4Pt8{L8ER1%G|*LBU^K6`Uk~?^;G6@kdwp3%-BtLBS8Tf@8zO-;`olPhf7S zM%EaX$=vNaj_2KHdWUK&^s}+D=27j%`Ep-N*<_PK7A%bq&DB_Z^)!ESve?i)tCYJb zr^Qz;TFv3?Zs&AkarXjinNvqBMrNx{6QtFhii;ePAZs^U_+(Ll{pn|+QIl9m2p0|+&ZsO&6E(=6s>mE$|$M971NI^ zdWQ@)WvH>z-PvSypE=j;ik{>&BYJaJu+Bxry%w`nQ>@I$J>ZP;c%D~ zZ}wpS2g)L^PK*1FY=Y;u$4GyAJ=shd=?AOpbQgInm5cHweODTBa$e}+J`Y>p5G=jG zyOM2_O;e`osG`0p=EQknE&RcG5(OIL&tUu|oG*tc3KUGiORy8R!8UjWW{YYR3nahz z_&jc-{*{CJ?MLcg2<#;pIGZ~blc}3WNIm5Irm?-ANfO7O577}q<_OZ^3%-P^{1;vkxt%7J^jwj{P1fp+Jz6OR5a;GZ^@kx zhrc+mJ-L}~@xHm;l}obGJJfyRPrRH|{F*?k$J3%c`9^ME`LC^izLsQ4K1gT&yzfY# z9sXU(I`c8>MSa<|ajmv%zBFWOm}oP4vU$~f9ohd-k1E<(Hd~urnUKf*I3L^CzlwmP zcGcEUr`kj8ir0AkLEm=V_>3YiOvim37XmEpEB*f(Pf#jsE#74QB7Cm+RqcW+ZqO zEfoUlYec;{9e(dtV;9yJ#C&Xh(~0TxIM0iS+bsQjy`qBj*MN9@ z#%hl0Ocj3ZWz@5Vdd^~f8T(FuPe^n%Y%#ggT51C8pT+ZAf&NY8`%W#-KScU*7VBSvtKbYgcGwR+ zymi<8vUf5?1A=#LuX)$jtWfXiSF9D|i`Ieg-XW$-aLiuiHFo$xomxARz!s4+gyU+8}T z^9`fFOlZ6Z<9AW-BJQUU`#zQ{3jJAfA6tEo>m&6mkbfHa%Mj;|<|prWn3HnYPYu?S z5}Y}BAdpF>%bugO7(bD?g?{3G@{{kCRi;`=jh9=WlDk{Yg?jM33;DZ{KZX1fEWzKp zf41>F;*@B^e5WviBxPg9=`_YtO7K_8> zu|}DFMq~C4(Wq|+^Is0NOsNH5(*)P6%Mz3E@rc~FN-s7k8m0|FH}aA9U3j)OgZbBy ze=MvRY%>Qk7%yRb9{H&%?d5i{4eK#rd~edVj(UELew&7GO269sm>I0Tmzw;@vEfs2 z(loPjedKORw0|U}Tdq9Xl(R4P`l?^Kw_|y<@!>F+U(FsFkMEo5%<}cYyY~yvw_K5= za`x}Nr>k*)?>jyv{w<5|$-DH1{TKOk%kYiOci0!0{kv4E&$20!??Vsz6Ij4~*o^N7 zrJL@i;`3(?zF+F%gE5_Ja-Fl%e0_;#OJC6$O8POL>|b_$R9mS!yUj<-2W8~`bPX2C z+?}-+w<@M7j8EZy&geL5DPl2iXzPsg8y86b$@3|kzjpLP4R6AF*bJA#TW}G~!8P!O zL-)aT@J09-;!ao#KM5;g7hDO);S#tXu7a0fIZVTi@FiG%XtEzPJngB`pFo^%Kz+;e z9ax_@3i~F@Nxfvha+)cnhH`JgTC9JoQ5CE#t8lBV&3JwTqk@txW#&Uiu5mzdR?vK1Fj7IuaWzQ%(t|o YlI@