From 3cb237de4805a0c3dbaac60685989ff4e9660498 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 21 Apr 2023 14:53:28 +0800 Subject: [PATCH] fix bug --- Assets/arts/atlas/ui/common.spriteatlas | 6 ++++++ .../app/ui/main_city/main_city_ui.lua.bytes | Bin 10170 -> 10178 bytes .../userdata/chapter/chapter_data.lua.bytes | Bin 7527 -> 7559 bytes 3 files changed, 6 insertions(+) diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 2083c9d19..4ddfd5271 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -71,8 +71,10 @@ SpriteAtlas: - {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3} - {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3} + - {fileID: 21300000, guid: b7ec10a4771dc744eba18a4cc4491c01, type: 3} - {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3} - {fileID: 21300000, guid: bf5180354d324cb4685dcfb6480b6a65, type: 3} + - {fileID: 21300000, guid: e71034853e8f2eb4e9be049af351872e, type: 3} - {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3} - {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} - {fileID: 21300000, guid: 31c5ffb6550fe564ab9f5159f4e9a1a6, type: 3} @@ -94,6 +96,7 @@ SpriteAtlas: - {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3} - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} - {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + - {fileID: 21300000, guid: 2097e79c28658fb4e9abc7fe576293e0, type: 3} - {fileID: 21300000, guid: 66f7e9bcf829fc04d816daa40ffaad77, type: 3} - {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} - {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} @@ -117,8 +120,10 @@ SpriteAtlas: - common_dec_3 - common_btn_green_2 - common_btn_red_1 + - common_btn_grey_3 - common_ad_1 - common_lock + - common_btn_grey_1 - common_btn_red_3 - common_board_1 - common_progress_2 @@ -140,6 +145,7 @@ SpriteAtlas: - common_board_7 - common_btn_green_1 - common_bg_1 + - common_btn_grey_2 - common_title_3 - common_btn_red_2 - common_alpha diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index b8e7c17dd64646dac2958e4f555f70e022707232..7b1aa8253ad2f1dfba91c26de334f2b225d50361 100644 GIT binary patch delta 6143 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 delta 6096 zcmZ{odsy35n#V&(xP(Bt1QHsO5FijjN|W#lNJlJmUh;8I#Ga`+ zsVy}uxqo7aBbdD~Op)0vr4!*KMuPEj6laZpZT~bKc+^4*n)Rf8RM*X{7!JBE^sLRr?k{zj^y!k`T8^qm zrf!;~)2iF!xcrt%j;3d}eo({|^}`o4O2e7nZTQN7h6_z8EV#~zn=RX*pV~So zjjtayC+_jO>`sjUA@aHF%oyoQz1{gDquuwQ&fO>rpQpyb)b4ox5Q|mSt}5~y#(-ZT z1V2KE)-PSL9lpHiJ8C#K(tkDFtnyM9-$#g^gZ@?U@}();H$KMKW>|AK5D&PUlr>$M zT>gL&6K2`%73xrdsev0DBNoqOnC;5GLb)Y4S2kU&O_?gm4XS7T~8R94#U)!M>hK7cQa4EPF+~pL>QU_Ti7#2*e zwWwXf;ghLTv8maedbWT&G+iAxU2g41`x5l`8bY&Z|29>ozcuqRb7Ey9@W{|w zQO>(HzR6O0?GsKo{7=yT1|0ovB@%dU@7#8oBT^KS*_DK@-EU}KYpKAMjxY0dLSQ^(``~%l?s9uP$3_F6l3PfEn#w_J961^fi~3 z-rnTTUb`BxUh!7hJ63(n%gZyLz8a>jS5#GYr*1W%JneJeAO3U8`cud4zhAu^`0A?0 zea>KP(U(@)GohcF@$GIf{@EI3JWKX(7MZ}2h;~$I3|rq(E!pl_)GU)C5ayM?Yu8g1Dd3g0Qb1Ut4e;AIO*R6!?U2D2v`RNMxS>r}adg+qw!s;Dq zZ*APXbq~E^RUjlTeY`Zm78)-c$Vuu+3@MBQ+3|c=Xd=Id7cH1ea9Z02(?yA6iTv?? zp}CIJlW7{x7VH?v5^f*ODC(H3-fp&VrJR|Bl*9pnV#f`f+9xd8F=>(;hXge#&bUw` zJOmfp>vgdV#P%~-)Wz=4Ea@H2O0XsHN=I{w9ckigqkJGN49T3U*V+?Wv+sgs!+6MYKHi_t+F^ij9 z5o1!L;^4BfGQHiVVOGfoR}c1=1#M}lNzGxuyN{kZufqm8bXm)Mwfy|Zs}V!<8uZ=T zRpzK+9XS(jPA^-sks|0eRJdP8|8KoZ_K=SWTpRCiH_Ry6F^$RyC*xpwg*miMEAg1^ z=F(YNRh=|mV%nQs*20hLPjGB09@2@p{kgkaS|!_?(wY?M!(47c7byV|%qX@jk>y_S z?-7E-$ohA|?}0x6-v$01_}{=EZSwozf1e)~%Ay}a`VOQIq16YF5`GsP;8@AY>|v8YKq1*THdIUA1vSjag0YA{KxzCR&+m9&%k2AlP0{!t2CM$@C4NT`8{tQ5 zpEg!3pFi=8KGj*du;8f;lr+`QDV6(=Z*fd(G@doxNYh`IZ>7ef)NLIC4YQA0Khh|n zt@`~`sxyQR(ZJ(Phv-`?)zlr17cVdDGyB|)4_!U4-+lao!=%x9@+z*Ko7|Wo6=vu4 zX?dmA6uUOJub`MZl*4ybBr9jq^Lw`JP@1U8>#G(gym5o^+Nw=bIC65jqp@W#lCf+B zsC2nyvuV9%Ec-C0SDcdQ%BD33J4-8PIq9lyS$0{sq@-?A$IBR&u_dNiB?jOP%4})o zAvSk{(x}oWsyJTb6i-M^nUsuacTZ<-ejim=G~2+*si;2 z_#F5Z@EzdafX{XX`2!0EE_V4(05d=R&gSXJ&c{ErCe+^!kH;QG^V~{RD`XZ!S zNT=BRPEs<%yRd9qOL|S|xi!d?4CMNr9}a> zz4iFCt0`CueRSmf`lX=#uy56OYizp=pU;H;Ft*E>J`z4JR4v7}*ZrtqJL#+E4C7Pw z5X1Q1B>hhvI`75yY12%v9*9)9<2MY}3Ki8hw5SQ#Px(g(cRsz;7A5<$D&lu18aAvh z9MNqH%<30c1MbhlxKnub7k{e_FwaF6+&^AE-BR)7v^@ubTdDSs-E0iEpv1O4tkp5M zNBkqCMABH?E)zFhJS@ye?aou%yjqLAF^hO8r>-hR-IL~`t2zxhW%72nwQR|+OB#%( znFr&7qkWPLjVn8)jvG?e46uU{43KE!ar=`xCF4LKk&lqKRxkgSdI|Eg@(}H z_-JZL_hgC6Jdz%tHkhCuv+4EzQ3*ZFzy3ixB_{|Nn! z{0VpwdXi+d(3{}$RIsKI9-GCvO`@txYv-6c1t8v(ex#}PbTTzo z#dj@M_&ggvchjS%TeWQ`FLq3?YdmARv8Ix+^|*4{?hFK0J z>i^VI1A``YMFs7m_^qb7#4G@yCDxyz9^6Yg9 zT0Bj54sh&h47SRNPhv$do244yDeE{pM%ppr9DLTiS@bF_f}U}(1MRCDItudBGo^_( z7EhUe5I!Sm9}rDI?}A>Ne$Ij9ZCLJGF;dx|o z(X)J}h+F+&5;cDHLYC&R#zX(%Qw#0<$F~KiZqL$?tMwH(CrZC$J?>TA?$l0dJR)Tt#I(FuU*Gtw=r+w06(Qm&%yUX{|D%Q4t@}PANWJ?55Ph2Ty=XQxoI)&h{fJ*u}u(`q$60$zWB1% zp7M6Cqqf2#jjtnRr5v#vla!gGH?^}Ry$P&|S_o#*p{7@u(Be!e>*gE#6Z1$mjbgyD zZ6v`DL9fq59U?!RfC0EEX{O56p`u`NSexio&al{%hT3g&D)&ja;@8N&4o!eu)fz0P z&>xKPU~ufo=OwT$3c>g3di~kJ^A;?810BZomS%J)$FV*svTSu+(%ar&&@x|c=tj=b zbn~5F%9hP6Fp5*h#(uPHu&zIKW#_}I3;x?_|42T{NMQV1yOcQ=c!CXoeG~Jz@VIP9)rTyiD)O)cCqR%l=U$q`kVhue4-9U`ldjv0-ChfY+mp>*8`* zu56{EJGZ<&7rRc6G@*JhA!A#&EN|}nU8ljn3j-`6OpExz?Fifb;NzQN{Qd@B4yPSK zlpcmb$6(L}@KfNsz%S0P774jegYKM9RS3u5g6;_rG5%L*dmj8G_&#twSSxbKDX^yi z8Bm*=AK^8Uqm7rOppK*G?wi6852e z^A8n>qBE4;$->E*_K%VKEji9$P?Cq}ge40j_8<%P5hGe83Mbe}-uGhqRy?;&!Q(#0 zi{p-kJSYWrb7nodr>cCp?PVfwv0+)bGqYxZ`pcsPBAW(pB27eAd z0Va2o74S*$o#4m7XTgWT{{X%f{3iIP;5qVG3y*N&kzGiE3NZ0d2&@B>ogu)%i$R*v zl2nv$g2&jTPK-{cq`D2|^0^v)oR=7sh5`S2L^Z*s9=PmUDKsWTj3($?@WV)DdbpM! z+ghsO;&=>LTAi?~c7~PeSJYM>tSU{?VSEQdl5f)Fhqe``Oeu5b6igDYaI<|fiBYUj F{U3`l*s}lt diff --git a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes index 00ac897f7479ed6f12f91b80618243f35fbdb924..ef38341d4e89d30457e0dfc20c4fdea9f93b921a 100644 GIT binary patch delta 1019 zcmXZbdq`7p6bJCl(lq9KdRcS6YPfXjuDdt4skrdET)E0k^HFLg({8KWG;N|WHS>|0 z(E=?|Q78o^6}1e>O2ht%f?kk84|*e58I*!iUul1S&N=to-#Nc~KdTzzMo#&;w&`V- zQdV}tZu3jAwfd07A4 ziV|a%(yHw-(Yh6x#WDkbfjdk#TDOY890Cgn)S=)l{0jaB*E>89|AuSe56HiP|G=&A zBK!r*s7%t?Gww@&U~T8-^eJf8C1N9P9n3sxT0K6SV%q* zmv)@i>7^D6D|bvFF@)!!VHp~v%#N=jA{uSs&STU_?vlqe2L(l zRZNbDO{a7>2)qQT1d)sl&_^+lY(E-|W8!IC;ZOJmJOPiwtMDW|@JF~8?u7^8PjH{ZLt4sadWS$i0#{KmjDm0QAUpu~IXnap!PnsD$lKuya3?H- zPdf3^`LMNsGSNF6HzWyCDvj!%l2^6Sb8?eGfn&q0HN)wbv(1}=? z5AK{6hGYo0OM)wc2p0+Liw0{ONsL#76_Jt7tdv(sRk`V3pni5NN>I(UFK!ADccNVf zUVjnCd5!j0;LGqO_$Ay0_t>L_LAEYL+Yy~dv>VY{xDkE;pMk64W_S*+g=^pz_#S)~ zu7_LUyKo)c0H23v;Rd)4Zi8nW&o{!g@FV!Ng&k`Z)^bJtSk!wg>N@`HaeOM>@Gv|A Jx7ekkxPSI-Unu|p delta 979 zcmXZaZAep57zc1?X*QK5J7&9_9YQI>OsUgzdCVdV#3 zpbzFUHD9tqdk;+|>CFiJB!OrknjeyiA_LJtl1lnp`}q5xbDsO0=iH{0FUdnSA%5#d zIcu}X%iOLIz02RIs2H}4+doaJqFbshv5ax3LeZY7IIW{2^i+8;Gb^{V7L~&qS;XTO zantFfL-E3Z)KlJKMv+|4)k?i`efdNY$85+a6=_tSBq7a5K&Wh`I=WU*S(S`l&a!V* zRi&%6({Kacf~VkbaJSW^Wd0ynK(K+J5gR_h?>%mUm*FLN9qSG73OomI!Oie@cpm-* zE8u*sfDD9nkxm0;_B6zXq9LaV4QUkxd=6Rc6)ip?Ov#p=S2D&JmbD}V`AZBuS%%aU zQ;32#6wnv)r8-fThA0t6oPLr#9>MkFF${ z+T?4Fuj964owF{VvW}T%rvu{4R8>3D>DmfvMR^$Gx1TEt4w9(tQMtj6{}W?F9qG8h z_QdiIgbK(D;X5gYOsVlVGI?T{<-|#jkwo_198IFuUcalD8$|r;&y}Syp`|h!H>R^t zV1qHrpWw-c;TP~4{1hIAU%@{-9)l;~-|%y+kHaJICj1hffXCp^@J;v@eAnZC_%{5& zK)I~T*f4-#5Wz!i*!CcNAMS@&;YaXecmS5e)!w`u0qiv6#+jZck?q@_fEF*J-V^4h z_w`D2MyRvHRM>wU=WBgs1%9w2R;j^@@o`}#A&$u<4odgciiEyW1VJcJjslugRrFa! zoR3AuJ44m)HqPL{+mWMT7ddJ-KHG&h-l1$O%5M8QJP)_S*Wey_2EGb+z+~J-M z7fHI1b|bxlbO~uE+zGeA3ve&o=ME%9bPv)Fq>D)VkoLmO@DzLrZh%|hNw^1YgfGLd hNA3{K9C8r@`iKFw;+Gk*sH$4wd+;;3(S3wW`3w0GQ;7fo