From fda6a5cb083f81aee3f4728e8696a46ed9407f2e Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 29 May 2023 17:54:21 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/battle/battle_board_2.png.meta | 2 +- .../ui/battle/battle_board_3.png.meta | 2 +- .../ui/battle/battle_board_4.png.meta | 2 +- .../ui/battle/battle_board_5.png.meta | 2 +- .../ui/battle/battle_board_6.png.meta | 2 +- .../module/battle/team/battle_team.lua.bytes | Bin 20149 -> 20165 bytes 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/arts/textures/ui/battle/battle_board_2.png.meta b/Assets/arts/textures/ui/battle/battle_board_2.png.meta index aa727f367..37f41fce5 100644 --- a/Assets/arts/textures/ui/battle/battle_board_2.png.meta +++ b/Assets/arts/textures/ui/battle/battle_board_2.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 25, y: 32, z: 25, w: 25} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/battle/battle_board_3.png.meta b/Assets/arts/textures/ui/battle/battle_board_3.png.meta index dfecbc608..9b6aabf37 100644 --- a/Assets/arts/textures/ui/battle/battle_board_3.png.meta +++ b/Assets/arts/textures/ui/battle/battle_board_3.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 25, y: 32, z: 25, w: 25} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/battle/battle_board_4.png.meta b/Assets/arts/textures/ui/battle/battle_board_4.png.meta index 16a304bd6..4a70287f9 100644 --- a/Assets/arts/textures/ui/battle/battle_board_4.png.meta +++ b/Assets/arts/textures/ui/battle/battle_board_4.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 25, y: 32, z: 25, w: 25} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/battle/battle_board_5.png.meta b/Assets/arts/textures/ui/battle/battle_board_5.png.meta index 5e925124c..824aba1a5 100644 --- a/Assets/arts/textures/ui/battle/battle_board_5.png.meta +++ b/Assets/arts/textures/ui/battle/battle_board_5.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 43, y: 43, z: 43, w: 43} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/battle/battle_board_6.png.meta b/Assets/arts/textures/ui/battle/battle_board_6.png.meta index 2c1d0b306..5caaf66bc 100644 --- a/Assets/arts/textures/ui/battle/battle_board_6.png.meta +++ b/Assets/arts/textures/ui/battle/battle_board_6.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 43, y: 43, z: 43, w: 43} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/lua/app/module/battle/team/battle_team.lua.bytes b/Assets/lua/app/module/battle/team/battle_team.lua.bytes index 2489a5de5608da95fac5ef57926bc99e0cc064ea..fd682ae6c0ec5cd0976f35c2273083869bdc9e04 100644 GIT binary patch delta 2496 zcmZ|QdsNhA9>;M98c<`5AzB<1$;*H;wamcGFvBGnm;r{1aubjs_2`u2STLi)fU;w1 zmI~B4Pnm5}>!zk%Hgw32r?RWNwU%3M+u7Z-dr~098*-79SZ&|G96RnG`{(QPeV*_0 z<@bAj!`q#*W1X_D7j+W{R+v1?t;Q7bimu!DWkuIvt;RI^{jt=4+Vw6?dsWxrhPmeV z`ZlKyZ#A47`667`=+~H%9AF5jWBaP4zCXKIDxQ}ap& z(BYbY+$ zy4_Aw<1%e^w7RrDDKn*RMrc_2lBk(AvV`g>O(uP%KI*PIr7}w!onEGBo-@ZY?&Kwi;7Aux?4Fjqg7*3l-n0&M@|o!9~G}# zJfm1Wslpsr8<`YR84{&g7)I4$0TM3X96LQ?LSu=KJ)n0)ioe5rQ!mbmKuhh=0WI;9)$3$MHctihsb@aTmUV zuioaX_zJ#3-5=<8^FY1p2)<7JC+eem7Q9PvnxL299NvRZ;ZyiL-iLc|A0EK3h*$No zzBfqwNiUF|CVdNE!2P%<;Pdz#?!|uybiIhr;MehG>XOf5HP2~HP*_Ez^rA!bE<>Si z@g1=-(u;58IWDRCl?!@B(58#*ZHT((n%lKtHhCdE?C%%D?;eP5;|LZz;g!_*K7YJUw8Myx;uBYsi zj~iTu{r>%?wL!k^s~y&D&365F`r@+94Q^)}Zokd#xDEfC`WEU>;|}~+{1kp1Z@?$< zHoOsU!e8U;4UUVJd%UfhGb@I?~~`Uv_64ij9$-{Z6RZ9IU_ z+*ZGJ;J^GQ)4vIlpX93T6t8E_SN)xZU$O9OHg00$Eq^5C96Qy$*=QP zuJ~TA!0vLb`BPP%t-$v)(gy~^TU*pENKd+|&7J+a%Ol5gjWY!e??7Nl(DyWGTgd4j*7owNgQ z#>X*3n3{eybKwk*GZftX0p_zy^V+q-mc2k_a2krslicnVsUAlzsS%gpN5z}jDtYpP zGHt6kp6!^ILoJ!wLTXD{TZGebO~CW<1Nb4aC?`RlXLK3r#8Wxucw>uQzdWV5?B3OG zC!<@_@4T;CA^j)tFc>y_A7pKf=+CK*iD$osel7H`qMzhk?8D_^sWn-CKS_~z!I~d4 zo4#)PCeU|QgTpGh0pE|~#0~4O<#u*GEOa*gqylm!d9--Urjk2Lv~G*P%{Eo`sFHR~ z98kp4r5qT6Td)PM!qWrJ!u2>7H&eIa6?iKC4Ypz@R^jzH53j`0w|R|F=BeeOJkSi0 zmNzD!LT#GgoWD;dpPg&=%0!>NJbN;;8C@pNEGgl+NcV#m>RFOf8<`k`AESE(-J9t? zi4OI+3b)|Nc$GL%FuQIZ$sHtXNFrFF!6CR2hvNhsikq+!C*mON!IA&RVS)NIF;fuEYE#hPBup@B|!+({Lj7;DA%{Jn>9nxjd94R`eIvs@E|| z43oq$*`1uc90y@@z*2pJ-&s^6^L@+LXXNYqh_CTezN0trPk1NZi1*-qcmv)heP{S6 zej2}wi#fEIv052p8DlNNIrw4RgsX4`F2^?9jHNr2fva-OQ@qm%f(g_FI#Dv;@n6*> Bpl<*G delta 2461 zcmZwHeNa?Y7{~DzxhTm?D2b#CVlJCdva5HOyQaCog21`~3lavtO_Ho@$|A_3P8$^} zl3Jcjr*yI~nlMnhg&rSH=Zdwgt;B-*CtGh9^8OWw~2lG%7A{yfsm-j2t#< zO69$}+`A|17nvMRgU91aT>t99&)4if{IbzLW^Q0?XktaF&En0H-9~$S-f(Tml&Yw> zf~aYEOZC%|^M?$RW*hDqJ9lc5Gpx{3Xc-Q3=jYh9Dld+jf(7lJ3Rl{O-a!4z4mFq##l~s6g3mvKu)# zt%ZZDk8H{o8tJF&o5@Hf=Y<8Ama{HfpDaXhWrMCK-Ecs{I;jAt9xa#rRJG>4z;Gd{JNBsr79-qW@cmv*u zPvA9pBi?}9@mgGqpTS3P1AY!ai@&>VpX+&oI)Wbw)-#|EuffOg2D}=t#z*l+zty_B zfV$w{)NkND_$vMf-^9D|b$k*3i5qbrzJxF19k{>T=W$&oxa1E8CS1ci8SoDi&QkBj zAL7&a9PYs%;7;6w&*1~O3tzzJaT`8^|G>ZFkNiG`PvaKctuWv;K_@{o!8zQ4J8%>3 z!JT*12Npcu(lO;|fOLebwnZGA_Gt7m2A*JGI}Y|>!;^5aaHSIs^rjVA^1@_?bLujW zizRGRhCWyns($$^*x0QveFkG^iR)=4+HuTJrC$yG3+Sgh4X?nt!eg5xjU~wv@7OZ6 z6X?5&zIys5m6zI7FT)A=ei4>FL8@d{u}DdmgR96Vkn6?M>Cw{ST!W{iWn214%~K<2 zSIz=S7#j$tTCE}**r2F_o z6=9#=Ck>(&*^-sHOC!Z+SiB*kH!I&4%-&3Hr6NvE_+Qlf!GTuHOD>5_(qcE=^XdLH z-NWcmhMm}l!?6p`#9llEFTn-41_$G%|KmdHE2$54iC3~mJd^+j!)k^{F#P|l@z*0o zustKMfZcl8?J9O}W%sIAVjoV$xp)=!Vw>OL_-<^*W2uMvZNU$U9rk=FfFwX%x0mR= z>?DSr=-Am1R<6OZc%0vAUE5MK<8h7e7*Em6Q*7sH_VcLT#T|GHuEmY`E&MvJS05d2 z!|U)SoXMh1*vmGaWLq|z!8S|rBJ9M)cnS961z5dM3eL{3gn5Gqf(XVC$YS23rT+rt C_?Q*|