From dcd5e045034b70e91fb98700bc53440b54eec81a Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Fri, 15 Nov 2024 10:56:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=95=86=E5=9F=8E=E6=9A=82?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 2 +- .../矩形 2941@3x-2.png | Bin 0 -> 25304 bytes .../Contents.json | 2 +- .../矩形 2941@3x.png | Bin 0 -> 20866 bytes .../Contents.json | 21 -- .../mine_dressUp_exclusive_ar.png | Bin 685 -> 0 bytes .../Contents.json | 21 -- .../mine_dressUp_limit_ar.png | Bin 963 -> 0 bytes .../mine_dressUp_new_ar.png | Bin 841 -> 0 bytes .../Contents.json | 21 -- .../mine_dressup_give_ar.png | Bin 450 -> 0 bytes .../Contents.json | 21 -- .../mine_dressUp_exclusive_en.png | Bin 696 -> 0 bytes .../Contents.json | 21 -- .../mine_dressUp_limit_en.png | Bin 935 -> 0 bytes .../mine_dressUp_new_en.png | Bin 919 -> 0 bytes .../Contents.json | 21 -- .../mine_dressup_give_en.png | Bin 423 -> 0 bytes .../Contents.json | 22 -- .../mine_dressUp_exclusive@2x.png | Bin 459 -> 0 bytes .../mine_dressUp_exclusive@3x.png | Bin 849 -> 0 bytes .../mine_dressUp_limit.imageset/Contents.json | 22 -- .../mine_dressUp_limit@2x.png | Bin 488 -> 0 bytes .../mine_dressUp_limit@3x.png | Bin 995 -> 0 bytes .../mine_dressUp_new.imageset/Contents.json | 22 -- .../mine_dressUp_new@2x.png | Bin 505 -> 0 bytes .../mine_dressUp_new@3x.png | Bin 964 -> 0 bytes .../mine_dressup_give.imageset/Contents.json | 22 -- .../mine_dressup_give@2x.png | Bin 335 -> 0 bytes .../mine_dressup_give@3x.png | Bin 902 -> 0 bytes YuMi/CustomUI/UIViewCorner/UIView+Corner.h | 2 + YuMi/CustomUI/UIViewCorner/UIView+Corner.m | 6 + .../ShoppingMallCategoryListView.h | 4 +- .../ShoppingMallCategoryListView.m | 208 +++++++++++++++++- .../ShoppingMall/ShoppingMallDataPresent.h | 3 +- .../ShoppingMall/ShoppingMallDataPresent.m | 5 +- .../ShoppingMall/ShoppingMallViewController.m | 14 +- .../View/DressUp/Model/DressUpShopModel.h | 21 ++ .../View/DressUp/Model/DressUpShopModel.m | 34 +++ .../Presenter/XPHomeContainerPresenter.m | 6 +- .../View/XPHomePagingViewController.m | 3 +- YuMi/ar.lproj/Localizable.strings | 5 + YuMi/en.lproj/Localizable.strings | 5 + YuMi/tr.lproj/Localizable.strings | 5 + YuMi/zh-Hant.lproj/Localizable.strings | 5 + 45 files changed, 303 insertions(+), 241 deletions(-) rename YuMi/Assets.xcassets/{Language/en/mine_dressUp_new_en.imageset => 1.0.30/mall_item_card_normal_bg.imageset}/Contents.json (85%) create mode 100644 YuMi/Assets.xcassets/1.0.30/mall_item_card_normal_bg.imageset/矩形 2941@3x-2.png rename YuMi/Assets.xcassets/{Language/ar/mine_dressUp_new_ar.imageset => 1.0.30/mall_item_card_selected_bg.imageset}/Contents.json (85%) create mode 100644 YuMi/Assets.xcassets/1.0.30/mall_item_card_selected_bg.imageset/矩形 2941@3x.png delete mode 100644 YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/mine_dressUp_exclusive_ar.png delete mode 100644 YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/mine_dressUp_limit_ar.png delete mode 100644 YuMi/Assets.xcassets/Language/ar/mine_dressUp_new_ar.imageset/mine_dressUp_new_ar.png delete mode 100644 YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/mine_dressup_give_ar.png delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_dressUp_exclusive_en.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_dressUp_exclusive_en.imageset/mine_dressUp_exclusive_en.png delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_dressUp_limit_en.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_dressUp_limit_en.imageset/mine_dressUp_limit_en.png delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_dressUp_new_en.imageset/mine_dressUp_new_en.png delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_dressup_give_en.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_dressup_give_en.imageset/mine_dressup_give_en.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_exclusive.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_exclusive.imageset/mine_dressUp_exclusive@2x.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_exclusive.imageset/mine_dressUp_exclusive@3x.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/mine_dressUp_limit@2x.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/mine_dressUp_limit@3x.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/mine_dressUp_new@2x.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/mine_dressUp_new@3x.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressup_give.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressup_give.imageset/mine_dressup_give@2x.png delete mode 100644 YuMi/Assets.xcassets/jm/DressUp/mine_dressup_give.imageset/mine_dressup_give@3x.png diff --git a/YuMi/Assets.xcassets/Language/en/mine_dressUp_new_en.imageset/Contents.json b/YuMi/Assets.xcassets/1.0.30/mall_item_card_normal_bg.imageset/Contents.json similarity index 85% rename from YuMi/Assets.xcassets/Language/en/mine_dressUp_new_en.imageset/Contents.json rename to YuMi/Assets.xcassets/1.0.30/mall_item_card_normal_bg.imageset/Contents.json index 8409f86f..bde95ce1 100644 --- a/YuMi/Assets.xcassets/Language/en/mine_dressUp_new_en.imageset/Contents.json +++ b/YuMi/Assets.xcassets/1.0.30/mall_item_card_normal_bg.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "mine_dressUp_new_en.png", "idiom" : "universal", "scale" : "1x" }, @@ -10,6 +9,7 @@ "scale" : "2x" }, { + "filename" : "矩形 2941@3x-2.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/1.0.30/mall_item_card_normal_bg.imageset/矩形 2941@3x-2.png b/YuMi/Assets.xcassets/1.0.30/mall_item_card_normal_bg.imageset/矩形 2941@3x-2.png new file mode 100644 index 0000000000000000000000000000000000000000..c1b1426488196732c4258607ee84e9029504e7a5 GIT binary patch literal 25304 zcmZTw2{@GR*T!HJSrU@9B+8N&WnYqHrxHK1lq9<_cEhAnAtV%83fZ@88Ovyqt?WBv zWFLdE561AllbNCacU`(#==HqkInRCW`#$IK!az^s(7|H|si>$9X+L&lQ(AA|n1N@nRiaNxOikA2#z^`M#FDfcf z3N;l7_??>gZz(k7&r+|ZfXIKQ86tjR$Q*kn6_pB==2g{O-qdr6ez`V{M#(r?+z_-? zCqkev2`2S6WA5D1*`jl=YE=)gU43FK_~OV%K@AnblPAw_2u1eMzTUbk_Kfx!En8F| z>j}}5u%O7O$4`H_A1$oCWGMLasB%z|qGG{3dfpG)xS3~^lf5=KxV-RdCGWSt-zQwY zxoxuh40JWI+Os?VrmeIhdo#uoA&aYRb}^ruRkSTO4_y3O0>9}}Y^s})5j>aJY2UGp zwjIs$(PemE+jM`>esHWXF@|8gj0tW^Jb_xC0lAg&qLw^dt6F->x5t;1R#z*(6Q(!i z&b;x=JyMn^(6i=o-8f}w##bvqRrL1NYAYYjxw!Kh z`4jlBtK6&Awt+@oI&r^@SL0@e&nz`-|9nu!UXO_o?{CV4oC`c|YlIm{&I(TTkVYl5 z`}u0>Z#a}+ZaY5reCbN8F$(AEGkYM!03Dv#I~yPmez38@dFG0kL1TAvThpiV7HfNF z-RaYdH4`ig0TV5uj{2en>}M4R8^5pqJn(IK%VzWQ)n|FlQzs%inm2gflw!*j^t-JO zzHrlVd>}7(C(x)S4O{=J8v9|1H-LY^*6Vr`29G(_5<7*ptu*{BiF)mue%mWu)KG51 z(zM_X5cQl0T6n$`OXEpuQBL38bRvZjR>+`l!4WxYadxNrik z{vhLVznV=(^KvT7oQBWnN;KN}>~L=@E0SHJKc?CZpz|e2x66^UatzwdGooNfo~vx;`K0 zArlThhEF!20jN}%XF;k^v%Awx%Q|*QK{IxVnQsitp+93N&4#^D0AI6eF0YDpYW#em z`DRolQ+0_%uaso{uUE54QyZ&a<3-OR*UZ@Re=p;@sf$CjROXgG`@hnVuQ2g>5W**! z{0g%)S&6(LA?ugEX%L6;S%s;c&DokWYTmN(`+&0medH0A?w)yiAC#;Y~@ z5IgMF5esyWaX>RlsV{%~X?5RkPan5Xj;IW&sGnn2uG=r~2K(|m6yUPF{+f#$P zjxTzZ;nJKM9u8vG5|5QD<~EYuom2_f>?fwjw*oL?y>Ugo*jMO>>QE(Ba11V6->9+a zmCM#q`36g=q@#^%Ov=M7vTuy}7ZA5u_%-iNm@sl zyW(!%_SqPQZO*Q3HZ@%lwZR+S4^(0CEV#*=py+W+@GOL_^%YlJPAnqFrkpD~OK3Y^ z+)%9K<*npD6QRB0Sb1xU?fChH`3T2?j$zzgzdZ15Om{)%wa;!-@I%!h`^0mQQ(nBJy{MgT&et>Ji=puWjiV(H-eH)|?Sxy0tTzyfa)t$m);gx6P>eHpY9o zdZZZTy|(m11MwaH8+9w9v}gUc#Im-rgc(lxo}rEi-(`*wDll&?HE%7f-hCvNOUVU3 zCww-k1?k(IW`zw+DoL#IgS(+6^gYu2YxJvXAw3c)`Yt72&)a8v>Y%RezH}ae@9D^k z%eZPa_2Yru&f_WFv%ZZPI#WsRN<8%uCZigXE}p|%uPz66Kdtu*u0J$WUNa+rtU%72 zVfykFRzY^kOGei^CHvH`d~Dr(gC6g{u=d#uQioU_85QcSuD8%A5Rkme^wMl6z%R;N zx*@;=Z^VOyBAbK07t|^N8%RxjL;a_bdMIUB=3BF&T?YOA}qKoDEMX&Xo?otyNq^f z{Db~2vM9Xw)%9dS!f9uht4@N>hM@V$4idU?m5yA`LC zz&1b95o32I`dc?h^KS+NIp(Uy@LtB<-nWsfrsF|crL?aTn;>Ud3#arRPR&Tl0g$kw@L zt2J;bx$Lx!Ev`#Cu99x0pfI=>DqwCtzpc2!Gy|s>b8Zu=)z z@2n3Y$BBO&a5JCb&W^=MEK zlxnin(suc)IxXUUbP3|m)bL7g;2rf)ah^perUY-@^J1a2sp~o}SYys>sMI=Cj*E;p zRN$YkBhi+N|8-h=Z`j6;RBcudT6zyoZ50weCZKLABZjLS{iFg^uPx*S2vqMFuIFA= z)EhYc^|(|mHM2|*NXC_kc?&I26}b6?E3m_3=6wxZ3AqJh*;#DPJ&IjPsgW~5bU|(A zI1AoYFD+*UtVq&50FmRq$o|E*|I=$i1ECY0u)^aoXx4-Itu3+G!lw(aEO%cW6i-2z z*4+{dfM+w~crJg8z#aB6SO3cU_ZtU+BCxeRP^5a^%JNy?8v5Ufh24HG_>V4Ib-#t= z<62GJ3CvG9cD}||Z`UdG-VP{E^e}*dcy~knsudQZqYaBvM&Xvs1@|PwW|VioEmw zlfPVF=BHe7MHRUPQecBXLb9%l+hCz>TyS$VXfCfXS~i zn45)+)8(AGwftiZ(h|Al0}vIvYJ70om_3-;m57woyhrO{U~Hv9YAL~f&~7Jbb8Ay5 zVWy%xH7%HpcLdl*;6o}BboJcgbGk)wOfW5lWzdIHHQaMQMdYSyT$Dj zXe$u-FT~XbF<-qI5RbZv6*3XKaC#R*sc5eWrv%OK3{K_FbUT8q=SFJyWHSDR zdum>9Ca~i)zUM*8J1|5pp;=lFWuq#WLW-AE8t9m)@hDCq6SvACYIw zs4jX&tYp9wt*mJJ3Hc{l;HYI=WA3}_M}?TG??DoOp7VbEH-@fT%#ITLS$Ok9%RUCl z(%m5#s|D9%VomhB6^oiT60{-a^m1l7WqA33nTZ;)1Otzjx=4))I=kq{*~LxZFa6Z= zrmE)nA@548E6gqCTq?u`7>uJ(^lFOpLKr}P-1*rAAsHFz0`mDXjezXpczOUhKlx?@W=;z z=DgQ6ghrx|@wF_a4ymuZX^*7V<6=cWV8XD!DT3X;S6floBgqq{>qv(-6OgYPqC zgI#HSECcv~eQ@snggFN(d3gK~iEXs=6=p(i;qb*iD}sT3{*HfkX^2TIs9(!CYf1uQ z9#%-MNQL4wo|fjv{r_$#L}pX8zH05``!24(g(8T(aNcVY%EINJ2)iMl24W(;|CoHr zyYbIS4+NWI(GD3~KeQ<6W*aEK{xj%*>v78;`EFFYZ(WTBQWcsm&&ZM#* zBO#-VR1N4HF08b3Zorzq3v%uorPSSHSm%R8phDm%Ak!dk&AA7J$PuxTDNHQy8eEr^ zyL06(B`;jTT4Ls2ZD^>zS^t&Ybmi0(oX@~?08b`HDNCFG-zYVh)d7zOW33np{3U8D zBAE}9Dx?ArUqd_A1EDcjObWMnoJykMya7%=6_u(NcdqGNrJ3l3)u*Jbp7k;g7{l7U6mmPxcalOTzw$P~+&mB=@wp_l(-w9`{!OVEr34MbrSh@A z)J*&rH3n*Ih4_R|Y{wc#1w(ROZ=TGi+r?Q}DsN#>zB(*G$sj-C!NiNb8Xc$NiO6~K zcMH`%it#{{>?nCv#J6BJm0qgEGUMU+q>{oWuJC3`K;Wp*V)8?@g{{8c2{>T-+jJ%j z8ga~KT!eI@V@FjI@yLS;jKIIMydb<3dCiFSe^I%U-tguf{5z2-+eU*XpzsGV33RLP z=(vyfkv39LN)mRss}w-fYY4OSti*ghE{U{1q-yX5B#XoU0Z`)6zbL`3cnsr#$S5Tj zh0v3c)P(rIfeMhc`5`osR8YS*H_Q6SD+wY+o2m6&d7qcz_jlZn?ePZizO8!B+r zccUJXXt6oG@RlD20Kq#v^31I``I+XnE9BD^EN^w(p;GQ6zPb!mO~0x!ensv&rD$8r zMy8^S&MwFLTDD|LlO9LS5T;XW?X{KJES?EO!`|tf5P#kmAHHkvvgC;<@9il!;uV&M zPpm+tZU-cOHT)M9Q0C#->`tIE)RF3bp#cqd8^k4`hv4jlTM|JJgk4NUJ=!IaRvzG6 zYW$@V=YV`t@ZypdKEVEVS5+|02BA(Ea#eMAC}iS=(&zigXeFgUy`z<&-JjDJZz@~ zEmhvYnL}V68X?HptwD|?5vSne4gI#$(ALd+jJqY<`Mz^dY+!`+Htk;6^#noiGU?2mMF2aE z67#jYKkUn@k=mv!-e_p6sJ@6tCgUzMp<)(qf}J;Ujz-QaCA^osW!AgiW-~?<#l>l(h;; z&=j2%nTvXMU{`i5%D2(O@whIh-sbx`HI9Zi$pFTB^j*-;x|nsR=+=i_mFJHVl6o)B z+&|8D*@_&tLFyRE(J#oG5j?YoHp5TO8VmjRVnCSBfC7q(yoHB-K1@Sdw#%j#{l-H94}RS)a~AS?w2)Cl7MFT)?CKkY~iWsYW*4+Vv;yask50csO*8}%)l`rkw5rg_=Sy=OmFz96l z<|~el|6niZC29uRYU%YN--|#7V>ibqp( zlIuICT5Yf|_r>~YuYybF{h4aojO70TBn*7mJu4MumOi2OKjo^3w=K^-K+!z3ybBWn zUzrFqwcba0&!^-(XY0yC=gV3X8RgH1H%QKccpdDmj9%W7(=S5OArD}gKN{8i((dlE zSETZJFI#3sSIH@1H@wp!Vh-^4UITe^_gRIjEYP_YGIG~GI3pb&mk** z9uhxH?<$^=xIsM5a2gV(_c?6k=3fzb+D-p07aifNs^&p0^pX^W%+bp(6_e&L48WS)o3)c%?xB;OW4 zyej6@e@I~erm(h6JloVQL3$S>Z_EIg>vzlY+aB65&8bvC^3R)Uo5$G9c?_Q4RQv%s z8MPvo{Q4y2Oz}1xO?R4u;-2{l{N7BxPLU%DFkrv4EENlzw>CrTfgQ7i?1A&u#4ZTxaBkOW9SVEnhiwihLGfV-S@nS!|9UuqEHe zFBqOCL!9;rtK-!zS)%}Kl>6Q0Q_aBS^Xh8Io!Q&sR#;fi%Q2^v_j2Rthb)#P(q0Qo zmoeZOUrq8oF!d56P8K`jAu6w47w73Jr5XawpWX&p?KovMd>Xg;3*zYpK7!>VB_M;F zz)_WAoZSeA)UD=T?Kr{8s6*D!@gPH?vX&H!3!ATdbPkiB%cP%zh2p+FU>_bt%O>eX zC3&ovQ;J5gtbw(cvO&uU|68{#LRWr!cBqo*Bp}cDnf|-^Xs9uFWvm=Pbq0Mx)KNaFattJGCiMzr_}TT;x&r5 zMLYJ^Svv_WmwZs?Q96iWkTVZHtwsT(k=jh=A7@L{30HBI9W`A~C_Q$I|5ap+;@-@5qQz%@~ z)#?^_mfrWs?@N%C%IwgV$q^b#Wv_?bFy?HK$aJW`J>UyhXrLz-3L93@a7Y3kd9Oll zoSR@#VE5xxfy?!fRuUU$no&uV$p?79A%LbFvDAuhukuqsdL~HnONkWD&((?qz$PcD zS*Fu@Y*G;_LQ}UlKbkpx%gKv>lC@LK>U??cgm37ag|Ne+PZxdk}y)c&YbzA zoizimXdg-hs-v$5xc>-TGzr;{RNgZuLeA}&B-IZ@< zO}paq_B)19LUWE_#{x-<|Au*D?tmt4Dfejg#uCX9)99;HpZ#@}{CAPyn!BL=$sP{` z?jjk9ICZRg2*dFUaArerFh%s%!VLKyrlKn6aku-fm&!K|7~4$lhf9!5%856gUw#uT z=FkkLIF~Z>j<^9CLOFb1@-O%*kARp8%5k6ySiW>dGe7~`z)b8H0m{VC? z#MQYyAfl%2(mJbZ?p~u|)q1L`DH$B;+$$#)b?8e}Z_RoT3y`R4G9#%d>%$fQ;VQ4y zPIcUn$V8u83TCC8g~uR6MtIf2ycc7a%{K18AFopPswOK9;5Wi=O4Rz@X+2x$=Mj-9 z;N-rSjck0G9|lK#dI|XpN>?;!Yz%Y_xKyc0V!Zy5%H7U_a>scu<*s-%zZTv*zThjR zE%oTYeeg^5C5D+EPn4+@P(8cet&guBB9nEdxuCiQ$6ObW3yL5U?b4J_*}v*FL;5HI z5oH#=J{17Lt8$t7zjgXl<0ESLa<`^@`hPe&9V-$KBUX`v#vTYRPO|t96*iDFe1HUwYsAcvgeqo=Yx99G zv%IBp-phy^K>DG7+0s?;CVp#M5i$vN`S|+rZf1#x2CWLc$$xSlR~hgKAYbXs-FjSn z`(;1(XGb#)M7dVzt;(F-0D|g12WO;qQ9kmV`J5r(UI~#E0bmD7iiv+Ti}1UQtE~CL zzg$04aAUj`!_r|$#?O&jSLUvE>}JfR&>`6w#q#XWOw(y~hguQKr`OB5w%bj0}4eQ{_68M&byi6f>lWy1?f0z45?$9L&ZQ@72tAyt( zdn8y$&Ooia&M5(J-Yd|rg-w`A8*5^sJh~s2$yeuwPm)7oUj&o*vDG`;k6d++;o-i< zR=qs~3qBGbLo}!IUS!^TOLlA(z_(7AIo^c&c7H41NxoY}=fT(OrWqQ-N%;y|@R48c zi}Sc+ZTOA}HZoeVn$Qv{Y~{_wg)pdbBD(3+S-XIAxt-I)Z)%xp;H- z7DsL3k-uf?dH-R=z8n}nUT!}FM|Goz;9RCJTc+E%DQj$n<+3~F;ms4?8|m3m#9OSo z;O606Jo2Rz%$#Qu%0+8FA#;d)&W{emjuM>fO5paO39V4`{vvOB^mG%YO#--JN188r z>YK}ZATFOwBN+|NCk+5${XOT>PG$I$)-@k=3=Z+qpDKb4Xcd2MQ41SVRMv(PXX!5ZEb|cQSetFJW#rv-sekhRSi~=cQ5lOo<1|l*BCDh?ME>-4!W|*zX;Y7H;A46tF+(}; zGP5doJi6w+=+^oVjSK#yP~{H??w@^J+SNTaKQ=D@l^D-IjShkoqC7wyikfjL7tL?9 zJ@WO$6C07L?6bkg{%KjY!bGF)eF;d{OKk$BfoLgd5(GMPrD8G#uNX#Q zRHtCGR|`ALaDM0)<(@hP*O`v z>QxBIu$Edmi0LHyKdV5AagsC>Y=Twv5QL+z62&nbu)>>)I`ksH@-?fSCJnp)-`Njg z8P`m_;u#6Ou|1g8b`@;y18fRVDMGgG)p0s<3y_Av@!o8ux;y4SE1=B3mHTgL^BMWj zKl4l(mNV8i|I@q!0K&sT8u;3UFVT8(QksXqu>I{0$XI}v-lsY75$4--3f}#rmH>7- z&tC5v#ewYp9|Zy*#`O^RznaCwGNJ`ZoE(TVkV>zPjUk7yvHfwf5qC+BXHe}3?LAS; zM0|h^9w_i~Jic#IInEVSi;C>_LS)*U6V0?0H4uyd?F`}Nz8I`IPRTU@2ER#i0otVF zTSZyG#b%*BcV8T)NAh>jMiZGG|MWp%d z;VAqyc{J-W3WENoWOMf_!%c32I?+*N^+C=q?<5K)RixR}xp|^Zb~hk|j!aMgf>Kxv2HIBl zawtwNf^41#)h^H;`PMvyZ71p`-|Ku5reyOBKuCxnP?`xp3QFpvWW@^3yYKIRMe!NT zT~(_B6oU%3nOC}DA1;Y{$ED1tayP#O7UA$J^_C!c6@bSCbe`t3>RC$E*?}bA|YxO+N=cak! zRmrsAJ@_G#V$;EkML@CSr4&nHE28umGy=OLdXLkoMYvt;T{;%!_7lwVH|@MV#D zoP&Ks*kjB5cTbf2ii5!aVCHX_9MiAtPkKsY)YWJ0x_Bs6lURq$k70%h&WOqxs95RBm{Bi%EZ+Y|dm=$IU<@Sy#}I~XYLAm*QVemyXq zGZTNk1yGpn$Qx_QfU3_!_gwvlE@irwi53nHVcBZ#G5J6H%-Q8()hsN*Z)!zDYDTm1 zW~PoG>EcMzx|6JtohjBs39YV594BYH#M}Du3kPS@s0%2+SQLd(GmcoRY+z? zZIOJ6*;G;AG;S6eF$oV@%MTJp$6WIrj-k$xB01oI>n1pC?f^&eFp_o-rq2HMZ);}e z1|PQ%Qj@&ZYVuY{?92boSOY>#CH6xuowSk7zw3?SHTW+#-8nS;?egQ*^kuLK*=m)N zgUxC_PjL?SbgAlP^LRNgcl963X?)rX3r#NXFtYnchtx7>K1}Cx#&sDP0X^G7a-m}s zisZxGo(=aMGG6PH+%-kh*2kr}_cAsJB^NR2%SXuPB(?zo#kAJ}kK$WUG5YzVd)}+y zb4{0F2>Gc*vIDg%9lBM3#15YVTzr_F>-C)Pnq=GWyS!D#>;QqE@GHCIA5ZiS`13}( zOig?Cu=c-a3Uvh*m?NTkeYgt`eH z8?{;De(D}N!{4W^_<0{TeYQ21fTT;jbyy>gRUkP|?%7U4@>X95&s+z(2>$xWLG-YJ zi|%S{{N<5GmI{i$%EsFuns+v%oO|NP1inMve9tg=NMoO+!En|c;m~^?@Y)J#Q&g^! z8-im*p`>28Ddx0^?#{gER7$i%NwXZauycIRZ`dK>s4;N&pb!}XSWS)qat1eu?jg#$ zu0)`^`@Y#%-7$f{uJQLdh&rh18oi@_&*?0O4 zXy7kR05{Y-f70(SWj0Jpm885LHD6{?B@cl=&x7OA9^3<%O%!u^fD`(HBNg=&Mw&A% zG@$`39ONu#oAeS9$s^#4k-hgRZI?38nM8@Q)1V3QCmTE5O{NB&k0jzsydUn{aI1mr zBW!&DNmoj}V+r4P-otdPY^bX*_BbtZ+8@cd?Xp%Tqq^UVkbUhRJGe5kbd_>? zTnYdAb#UDaFkN4og|wZ9i~Vag6Wa_t0;~CO_@}J-cM~!lB-AC&vi*i-vgK7KTa;GU zyq`NtsVd?@D!?*bh&1$PS5#E*WlDfcK!AREn||KZpqzRA@Yj1Z@tIXj_LPGUJhGd* zTZh&Yua$7{KN>$vYeUcdfC?J6E{cV75@xg2SL7Z`euOGqBPXnkR5nQ3!%RFGg6M4L zH=;yTydHKNFmOZ|%XWboR(JS0^SW->bm-qn2`74XvPd)u0_E)>C!xK4YwMQZCqAx} zIiK!0K)2WXc*Ohs^$$2umyci_vi|W#GLcyJRFt+2y6GC99;MD(If6&I?u;@zmg1|8 zOw*=4LUwyMKxey_+9Bk@&8|tPam#KJ_b=g3X@v>iIEmdc*FM0TU zG?p|!;56?A0-CH7gsQ+KkD&~TUVa8ix$40-CHX)^Rm73XKlISj5T?E_L0)vug2Agi1nN4u@t$vxpoYWf_ljR+C zXCis#R?H^vTRbzuq2-AkaVZ}Eu#eB6Y(D89rNEFJN4Iu@nT?nb%W;VlQeVmSnD4o0 zb!meWP>|Gt&QUg$4oTyiBiF&!u@5ptznTf>AUZx>SLSKYh!+dxZ+_|#NqN0pRCkc> zwWi%-P)}v@zq)ISyN-;xrvOfkCH_n$Dly&0JFdziwuI$eP_X7>7RuXQd~^qJ<;}SR zaDMM=oA2JaNJkdTu2xduBb68O3%a*%T!ZHQc5o=9afh)bA15EvkwOr6oBAohNHU!t zCL{$M9Dd!a^~W-VEHMCmj1Kw;KQ>l&8kig$YHBa6Fd5}>+0$J@@*~K(^on`q>5tbf zG`?yeyGQboOe<-Oyl-!@eqj^+Yf8h$+){=O%Fh(0IM1!-0cR-!YTWyhlOuf3U-AHd zes*N&vVB>7_tQM??fJNihA?4GWjfM)G$7TUKp4lAHp0Mb&u1+jnY&FZ2fO{8A}MQ_ zZ87LJ{w1ad;|w(X=K`@%uE^(WH9gt985$*#EFn^~%&t;k8RZ|EY|O4Qlk0t_lKV}y zk%+YX){J-kXG1(OYUAL8GPNI|qT(_&yb~wzR3rl^AZXck;;8a`S9j zXoA!u)?IH~M(Qodkk`x$iDm0cy?G7+ni*NFK>9+?!9V=etyst;KH?Zk@3TTW|NsYnerrej`wu{*jB8>?>8rv-$ei>m%+0>%)7FZ;T~;snny9eN^BGElB|QiF5Kf!#I-1`r z&d>OXNIV^36*x)Cf@hH0$6x9nnL*qUop^qZ{XmwP^YA6WMa%j`D>l0?+3B%?}dz)DrS=uglIO;Z=VyM5&bteBzzDR$`h2wl9?y6O7 z=*6P})7TF{H}L%my$0bMe9dfJMB<9nfrBI|6*jICs~*k_6opvHw^PB6A2mCm+M zz5jklRykAAVqhE)uAHsQO0Hfm>(7p)?KEr0;|{U92C3~V0rMp-|5ABBhM&|I2PjFa0$R-y`ec^gvq24+rD*Lec7CcV8!T7^E@-fwLv2uN=X z30C+CHUzF%ge*`oyBEo}K&Ikk+kYmyGw`OZ+-dfGNFJbrFdd@`=rsn^qgP9%$$O&=-+ zWb&vGAVZ#jT!VtyWqy9ilF2K~mvK%-rKgp4YNzz_Gt!d1P{GJQW`k=nm+Cf_o?r5r zQj^D{H!4iBfE?WVv^0UE$X+Z!}7;RMXOtPQxoV6(0x4kKX(@=Y3monqc7VNHZE%;4VVa zPCkk->{S>2D)a>96BofBulWbu$H^10Pgx1u6W<59LA#T8wQreCvM$9xeBfZrcWgO- zrz&47P655e92E8Vfb;HXUf6U{jAkNu=J8q7&2q&Z)b}rzu#zL7!=tY$w&Bq>*i!KM zgR|SglG!H(2*Vmnxw0g30gM-FTk!uJy1>u{d__1&=%!O27@mEtFrZcf|P9BQaqBvnDlta1^P&H= z14~`0?xbNzN|FYP-bR)_Y^M#iWuVm>L6Fl)q*6&hnqfiCX4L)Z%w; zJ46*qlZER@Z6Wh`nlfhv(7xvAb|@b5DmfE+=E6VPqn4WE_`vwNO@b@e7M1$AUZDRC zN z^;U*nW*tl?AY%;VD${6CV!XDXWnAaYtoXiAGt3?f_%3f?HaP=5`$v(!wN41BB8QEN zn0#l>;Gut#?-pepV;(7bytYsK?nf(TKcNhcHlJXvKD|jl_!EyTrn6X@I|U;s2Atae z?r*ZQ+!2`Ut4J_guY>h)aOEpu0TTO@kxBxU9&#=k0DKsAwoz-Tpt*s=9Q%e$KZ6YA z%gPLDUKNP+>sgL&=qYZusg8Tmo{$ahQ`A!Om*ZRa=Q!#wxqfG%V)}rBuz;2^UQS~c z-Hds6`-=;DIyU06kO1>~q`;nT<=ua_yjH+Di{(LDK1eHO3OKClvY%OnFLJSpmSe2h`Spn}R12b9l zfq|wPN2!t-MO=jfG9_H`XrpSEXBnpSt>S(@L0XzMy&SwWAl?yHX5g7WLah}AHZ=^Q zs(=9sQ;fsvM9wPP1mUh(-J>F48SS$qe9-jPgo(%jJn`p^vyfHTt~{RN9dO7lB+>;`&PtU7@uh zJm}!^pJRu5+0tS<#qW1)udway5=g%7O3a}*&6SwEM&~TfHBAlm{bVn?^(wLp<|YwV z585M#G_a0aW`^BnZQ=CQvi^{$N)2A5Kf3fJ8?3B%|3&Yu=duw+E!v}v{GSK@Y zAG>ie=$*E;qUM*r7^BH=BAT@#q}lq*9WVv3gM+HMi}}Dr!0CU-6`hyf9i>ZtRPBiv zOjePb0SG>^Nd&xc3vgSbb#mj=Cvgui(C`@4w~KGDgPg*gd2gv~6OO#mdI?^Z7EDcP zb(MkQHT6QZxRF?`|2}DK`gh^EnxfL`a)v^JG>0Nch0%%@?Em^==-A6YJdg_8;%Y3k zARIz>fsXKx2Y3YBv>Kz!&I37bhHFpsh$_pGeOpT!a61Bq%M90KIKPudM69H#-Jy^P z6|m{-d|>+TV;{}UE}nTs!AUjt=ax6hPnfbsBwPHJ(!V7D9~I@@t$QO<)H|_ooFHIz zFLr)>IeBhF$Du&1!}g5`A1g(J7V#SJo;9p0=~{O74eUhFdl*^LdvzSYKzZ?JAnp&w zoI`WKIJq$wpG|x4DpiLb-KpbX(pOl^u~uVq8f!W@*^rmZI+CWylc7Lqz^eRM{PMJ> z$0&|7JSjncJ1JsXwS)QqWiNhF7qFWBceH#SHyhyc^yD)zMS)tKW}Y7QA)t-0ZV`IV zuE>!tw-ND9CbGQUNN7=UHIv7zyvO(V32Jh8?*zlIVBZ($f%~9Dk1ip~ zn|uTriWTJ}u{CC!hs(^fE_}f}S^^#89jTrAD8tHQxm+;0#QZ=MIGc5}N6}IscuwUqQy?D-5!yH+)FU?BIyf~> z8g&G&;d%&aabQa0#~&T)u{k@Du=b|-Xiq?w70uskfWQS2tH9FV1pdIvGU+da%ywfm zA!oqAHz!^JV44Z4&wh&!xLN$SMyNuV zc=R4Gt1&Ewxfi+@TDtaocE*oS{JN9&zFTL~&TqPKlXU|I7&Msz2epCs8d1}y67W5y z-?^cxI9HKt-Q{<2FkriHNf50q z(lP1@d3^9Lt^YMyI!~-jcD06B<;+Xhf)?72Q4qM|5Kz1RR!~44LFyfs-W{%YVC{u* zw`pn!@2gEI=bdtap%JwovJ;0AjyLd z`d>3OTiC31F?H&4WE14_I`aRXq6!EK6rFf)gi%9QZl1#cxAHVOdEx@Xg?CP*TO8tlrf--C0GBMP*2fQO8snq z#Q#p*k6AmP@Q-@nrLku~@39te7eGXJK`0Tt>2L@iQ})?p+yWv5pF-6&2Ok+))^Ai1 zh=^hdc|e~uF7gZ@hKx#FXcg!g8Re5NGB8__1sQpV-V~=x*9F8;#>JY2+TcLD*kLrN zD!a>S-SG?VT=G`teLz9Csz0i|^#1aslTZuGdjaS1jpGmNeTNAa%JC8@n8K}EU-%&U z^(sx!n7Sb6dhPMEVd^wQjr0~^h8{>c_GPe=-LHmLhm zfWCPmZP9vFwN{yU$J0YP2N{MKb`@alLuQk3pn(*VhoE{faF248xsA-i%)VWZs;c<*s!%6i{=eR8Yzdpe*1j;hPJ z3dz3lTG7=}N{xOKa4cZyos+z^Q{_rmdLx&7YWF#qKGB;1KnOab;F{VB@H=1hxiEoKpf-E56tg1UU5y2m*wC;X_!_DT^luFGs5RZ~B{0L9xR%G4r{(GMI`A!GPET?2(Mw{~=X{(b4*ZVQ~A_a5ICmT9AdRAvm%ts=2| zSAu1LD>;VpH5RR#z0IKE#4Enf=uaIdx5TaGQf_PvVY5>n7UD3X9;iqW(!~yd_jFRn z*t4VbP5(wVAFV@>o86bFi!rN;Q{WC8lUFq3!pj1ha5 zc;(Ca+enq?ncrl>_Bg8!_~WgjvUV)w=$&MJiU51c1`MpGe>cC-cHaTnx#=)_Zs|`D z%VPU85U-4Yn-cGw0&B9CW!$`1dY-i~2#!6|7WZ_EYVVX1eW?O%TqR4iL%+EK&TM{z zVMCSFj|XD^n>r^d{98p+`tXyZ$P7Mw-2VV^cgv~3_Y!Ai+;ZHaUtxGCpm+;BswLLL zqds3Xg+kqI{f3e1pk|~HGvF{rnFs)caYu?$5@WB_X1rMawnmuKKCL)Gt}7{rpC?-+ z(s}&m?vmp&jo(TEeByO3mF5rzA`Af?olri1$ya0UA8@%ytkVxaJ`mQ%-cKSOJYb<6 zg>CTf&MZ0NKhhcKMm#;oLteWlh3S94IhN9!sa!pvWRXU$u)rNqh=oY^H?vl};}QRs z_i9i)K)hf z+V1=yiupW6h7hNNb(C;^bB~Q-PK&yl2=w!!)g+S*PSsjCYOZ;{#{}opYmY_H=*!I<{&z15%+BI_ zeqJu=kwa7Mr&_=qqEmd|&|JupY0}b#pZkZNiT2&P@6A9RHvrbk91<1)y-m{^eEu{`S~ZWN#~6kN);z5LQ1y!O;H{d$tDB!Ih5 z$Z0P`sxy}*e7obL{fWI-8KhX!kUfcrAFE~GU+P7K_;iF4M&P9KL!dnQOYWK; zTR|+BJ3@|ixv$9_cxyhNHa5mUp$-_8!2UL1c-AHdk8GOb(=v@>K1vBrCbNfOH82T5 zU9I%sX#pcz<$u5oqqsWlaaOqd)Ku82hY$S*u~RkTewXI@s%43Hjf;if_dA>-|>rVBO$@UH^87x%$XntLK6{6u7>E^~beiH=Z@w zX=_Id0FGzKrJ1W)Yuv|`TY19|_^($jRCu3K=Gqt-C~LHxW$&}R9LcOh3FF@!gA-Ql zV`a+WzfSSR#Zf**j4%?YQnKBulZp2S^Sja#e^F3@2@_<(HtBv86&R?@&k6>O2S#t?2F<)GWPAgUWIjS!Dv3pQ>+zlEQd}~;yBFj!c`M;r z(-}jHy|WyxlHh-BqFiZnR<|Ma{G1rjmAb>`&q}|euuu^Mn$p~n@eUhtXFE44BXd>a zhi`Q1PylOH-i;0gQJlLr^zd^hw?-$WczlJh@`2hsktpc+C4pwb(CcK{dkJ^k5+Wv{ z&W-vst{BZUfr{VtZp!7_&Bi{d>CS<$@*l;rNr4CU>V;Y@HcO!9j9ucw!8M7F=vTf# zUyS5oik{L=z2+&HU*Hd1QZ}>e7IX=B>o{;=Z)k%!s7d}1 zAhkP-yLv8F*5Jw)mj|6cTIlN_zt@=Ned*D)6kj-OM5XIW?uKey5r>Rj;ca<}Juw_97+BBChw3SDWYl-3@beoL)H;SCq| zUoiL#x-FkDea+ysbdtVMwW3{?$?aH!cz>A&2LBQF59~Bk;AJZ2|7+_?ypl}xXf~D2 zo1WD4%A71_+OXr+GHHrHW$84UR+IbM;=X1IDgv1~)-N(C*F>R|&N^H;?>UnM-_jQx6ZaZ_8+%6sPLN|>fDlC@+9deAum_8XCrg$9y8^~&*;4FAQm4$5aKX%@1dMd(jZP>`nQjb+?kWJvzKXi<5U!7av zz({Vj$3Ekhuq6zBmYgE$aRr-Lhs*>7ifL7Lrm67?XS||c_soABZHX8-vT@gc`Amx$ zw*V$Y8u}bD(g1Jfub)f%a!jHN%3z67lSDuR$!K`@yXC5%V}U8Ff8$hEcZ>X|{=^?Q z@ws5M{L|lqH~v_i*)5v7!BF3b``zkl(D^qGe|_ozd@(0Y3{IYD^S(w2s2U4PpCzgh z6)e1-U&fVKkgg14<&?nw=wp!)iQ5xQ#Il3TCG~$H6m7MWf0_cSGfuDMP0doV>YkDE zZ@uj}kseHh7pPu8L3D!-oxiAE^N)2)qT;cQ4~TuZKh(Cez5E;UcAAiF2Z>uaVT>!Y z%U#YE#s(hMhs)r_&LnoZyIl8RN9y?Sh!7$e3rQk4R+O0u z?!x!Pu3z4+Hw-t?`ZpWBcY74j*uYwN8_Yv+Fk0DR|HP~#)BuW?$R)((;~~gc8n+M1 z`1|gEY()2T2@=2*L@LL!U`bbbC=s%~S%9Cf;`xkeN@b!pwx)lwxeHi%I#lK8Y0jUo zH#D&iU71yH^|ntzv5AuD>H&FQO>b*y|CACoM-wT{wF3$`8AT8Gh6P&p(y@eGMKG%6 zM%}(gchZH3B?V(xxB8dK5hd7C5aAdglA$l^&a7bq-187V$1rD&Kvp;$4@>qty|R+7 z+f#vDkW|~=>N4}ucBZG15v32HTQ#k64L*$t6LrBzSW-YRb)Iz%M01rxRGP^qjrde{ z?-;{qIpMfUKa-kD&B^Y4o)LXpURdH(+E3#oN!az;lSZhRPRR>v)v&h0XuRDKzC5t7-Pn!|E}iJPvKU`;`GR)Z5Y^}tth{lEFsUW1 z0dq-gBzs-s@zMj#@2$5!17PAwf*rnO&b22`kS@!DS8W(81IDT|=P!`M-Fnm1)>UZ%XKtR;PAPKUtNRok3hF~UTbahWo zLNzDopt`Mt`fzeiQ!Ep0x+AqYIXpx7kg=q94o~h4%zo!<3&u8hqGO}HA(zZ07~}{W zs4ALlmFME05fPG(kfCTNzgoqFj};gvQI^G2+l!a-Nmi;Ge3S%2!sP6Tg>CPOQY`)I|1miv7Ey(lZD+l^)qO(D@MkkaHoai z?=Y1E3!Jl>W;jMM@f6@4sQolK)y$p7%5eu$EZ(jVOV|EXqS{6Abp%!feQ`Rt)3BdZ zTKLGoD(2M;O;o?}Cf<+kKmnrXT`@eva<-<^QcD(Sn!gcLx)MYcqWnQ3T8-_6UXR9r z`JFITylgoqm3VK>05WeK^`O_)C~@ z?q*tYV-F9drf8=G;YwgscpcAMQhvBcJ@^#%NJvqEtj^Xl!h(s#_~@8rU0~7c}Hs z)f*3&tK#_`hRz^sUP(5b?gv{%sOfi(|IVUmxk~T)>V;s@6P6_mBA6--&-yqfrzNlE^ZMv0qlUUbW1mXL!we=|rjjM?<>u6PSbt zUOLBb$PA@F4yTZUJ8JNZUPQrQexgVpEsYw&^mMiF=u;vT(|D~0?7Cf$I3Lqkj+B;+LUY$L#LH}Z;5wnu4@Mq2X zCB>&8se=Um=FI$O?FMc(%xfW*eUO@c=H31j)0QI((j($|*^ijY-Ce~V4=K-pr8#rV zh}=jFRo0^EOMYLZlKpHRl+o8p$WN|@^xs=7W4D(C3p!X4JI~P)Pk?ncZMT}7<))Fj z`yCJN7<55pcvD!d8vSreLn!j?`6!%|e;&{k%VSvY)%kyBSxxZd545iVA8?9hX}A(1 z*N(GbnhVLwzE&{Gd}PchFupLLWDUPP9@~=q79g) zxl!%HwJ3U4x$E=W{Ba)h%{K{{i^vz`P-fWvAUP6sZWl&25$V`Y`hB6x&Y=;~x6@pN z%fFXIW_0XcjQ%5Fp>SRj;sQb!b!9sXIWYP=kkezr812Z*8C&N_bAA=u@GB=@y^msaUmNr>HG3g%bxMcCW{ zb}cx}!J)$<>XEfwz%&AXC0(>`b>+JH!s}}CRj)05uLf|>LEoYD#3`YU3 zvg1B2-%pp$Nq0Woc;xwIK9bQ!$h zorMYQ$}U|`{$cXP{aV%F>~*#qWR*a6cAPOcfeLnw0w WwAH6bgI@fq#OYHmC(BO+-uO3DKCv7C literal 0 HcmV?d00001 diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_new_ar.imageset/Contents.json b/YuMi/Assets.xcassets/1.0.30/mall_item_card_selected_bg.imageset/Contents.json similarity index 85% rename from YuMi/Assets.xcassets/Language/ar/mine_dressUp_new_ar.imageset/Contents.json rename to YuMi/Assets.xcassets/1.0.30/mall_item_card_selected_bg.imageset/Contents.json index 22dda616..afa6fd50 100644 --- a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_new_ar.imageset/Contents.json +++ b/YuMi/Assets.xcassets/1.0.30/mall_item_card_selected_bg.imageset/Contents.json @@ -1,7 +1,6 @@ { "images" : [ { - "filename" : "mine_dressUp_new_ar.png", "idiom" : "universal", "scale" : "1x" }, @@ -10,6 +9,7 @@ "scale" : "2x" }, { + "filename" : "矩形 2941@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/1.0.30/mall_item_card_selected_bg.imageset/矩形 2941@3x.png b/YuMi/Assets.xcassets/1.0.30/mall_item_card_selected_bg.imageset/矩形 2941@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..2fa8877cdaf911e5e85159d7c900dda32e4da5e3 GIT binary patch literal 20866 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 literal 0 HcmV?d00001 diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/Contents.json deleted file mode 100644 index 8f508484..00000000 --- a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "mine_dressUp_exclusive_ar.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/mine_dressUp_exclusive_ar.png b/YuMi/Assets.xcassets/Language/ar/mine_dressUp_exclusive_ar.imageset/mine_dressUp_exclusive_ar.png deleted file mode 100644 index d0465fce0a935d50c9a70211ab30b39999bc3212..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 zcmeAS@N?(olHy`uVBq!ia0vp^S|H593?x6vT4n;NX#qYVu0ZpAh^FQ^@ctQXD_OtEf3=XU9 zH+wI1CTL&WOc`^5-~7e%AE-S|j0)^zc)7!Dr|X2}S3@#5KEAds>E)19UCGVW+db7= z!N^R!Fsm@(yp5l4T!d6W)~`9G)9g1XC1~-6hh9i^&?>9G$f=8Fu3a>7TmFM9k~JZ(h1b0Qwd^g!;=)xWi>I#MYFB-!adTz( z+{IZ_%#QJ8ZkZ4kZW_AaMS8!<)yx+Yv>r%zE#=&6n6<=snbhpi|MenGq5;me$EuB@ zeBIXCO1f=Vk;n}!zj9S0qU)S>##Lp9Q)MyQhuVGq+2l;WH{)Jg$VB)2LrZ(^-l`F- zO}J+CNg^oY%fox8KAx)JnECW?32)bd#G9KtbvVVXc0O`@ru0oqFJ4){VxR31Tj`p; y5oc}OUVcs9vS)Hm-~ON8QFS(j^*2=iGo&rqa=o|vVhS*J89ZJ6T-G@yGywp6R8Oz~ diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/Contents.json deleted file mode 100644 index c2b4fdb2..00000000 --- a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "mine_dressUp_limit_ar.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/mine_dressUp_limit_ar.png b/YuMi/Assets.xcassets/Language/ar/mine_dressUp_limit_ar.imageset/mine_dressUp_limit_ar.png deleted file mode 100644 index 898ea1d1bf3e2e7e7be3254e7d7737e1510804e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 963 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`T?+6CaRt)LDhg%0u?a*-v-ph2-C~l3)NIQ-vb2Z!JK7RbQBl;!E-7~*k!?v$5Rs|*C% z)Dz=bzt^t!-dbk)oW;d;?c2ZiFD<;0#msT=d-=Wew0$bff%Dv_E(#Q1CFRCZ+`s6S z(do;UDF#|!qqtvAeC)~5zhhOvdy(ZUFKyVr=46Mu;D!a$*|x7e6g1V)v*CEs?wZy6 zlY*a|)U_y`8S!E1_XZECt~k$(3j%_k?b%19*1q66$#UImOX^FhM24%suEfZ;8Z=7p zesRG-9?$bAIHN#O^!JRv0FEnW_hrfD*h{f?!e@?`*7lWRTn1{k5?ZL7j9el_h{OF)j$J{yqMo5GWu`6 zo_Y4-=a#MqhRa$Hebk=uV9kE()APSD^<*u-T)E?`>D3F$Tf{Oim7B@$+s}PY*7p4O zy?=kJz4@dpl&Ugmt#JBg|Be*L_ydYIJMYCVDRr9Q!u*>*_T3K7CAv4)?|&szcCYuf z8Oxz_UkhiJmYfgP+j`MfKK;Vcom;CUkGY;yT@y3?Q1y~PMer)RTtQ1yneM*+P78DWcEq=vV?iR=6P^vi?$)(HJtAos6ypJ6{rN zpL8{kHP1-fCrZezW7XluS&OgBJ4rpR+jx5wCs+F&h9f5zWl8)0Pn&S?^$o3=RnAjW ld?zn$ud3dub!ML8q553oD@Rg)rh~F8gQu&X%Q~loCIH+Z=-B`O diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressUp_new_ar.imageset/mine_dressUp_new_ar.png b/YuMi/Assets.xcassets/Language/ar/mine_dressUp_new_ar.imageset/mine_dressUp_new_ar.png deleted file mode 100644 index f7c6b3e1daa84281b042dc7242773d065edc23f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 841 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`tq$-BaRt(SRX>2J7exL9BM_sv z>Nkk2`2~`#{yCxc4@j!|XI~{qF&O=v0OVHv=&uGU2J5W^Dh8?Pt@#T!0VoC1KA{?D z!jB0xKsDciB0bgrTk8Hz0Gs^(|Noyq{-4R z&mRBVvG&*W)*sg{{8=&UXJOQtnLy`imIV0)GyM7C^YF|2*Gj+iPOad*a^&X1X)QS$ z9CvnWJc*XMv%MrT*v4$%1YwT2L$i&qF)%Qxc)B=-cpRTQ?d7CZ1_G^e4~7EUEP}v_7gUKUu7Texv*^^=bANtWwX*uiaBgtZ~KJ#t~wF4koOJC z=QfsDCfO7JI>PtPlCX;WQT=XRkZQxPiu>nG9XgKgK39<;D3J2E==0@yD;2m3x6j|| zQ{*6XboKn@?RPcBTnqg_Gl%M!zEE!7{&&5+(!KkkM;8?xop<6ww-e`L|0UIIUtH$Z zO!>-KYj`S(Gv&qEwC-hE8&WvMO&*@PFoWTAXIj9gqb&DdipS4Xe01wTqa4E}i~a1D zOTW}qtPv5`{NUiWo}s|*Ui0UlGQm}6Bvq#g=Kufrqu95MdlirV(hn@8E@mSv>{zNcS^T>dd@Q>2pGjti4!{QGd0&BRYG_TZW|Rev?DWlm35$thUnGKc3d z1CL73#L9F33zwM8=@PDDY_oW_-{MlicAe8Zmg}y1^omz9eCZwOQmt==T<_+yIq%b) zacRP`go>)WO;z87cIQ>p9=Nt5Z~fj2(_)Opn_7M~Tx9GsNeF1P+RWbL8uY7BSxEL! zo3!mZ@rV=E!H>jvrgyB^)}efB#ogj)r}`Vejq<)<=n7!|b$a%-qN&Ex3)9N>Ew;JI zvo*lUKhpDk-=&1zIl8yMhyR`be%)`qy{g}|xXk8if2+@IOmAND`njxg HN@xNAQCqSK diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/Contents.json deleted file mode 100644 index 113ebb6a..00000000 --- a/YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "mine_dressup_give_ar.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/mine_dressup_give_ar.png b/YuMi/Assets.xcassets/Language/ar/mine_dressup_give_ar.imageset/mine_dressup_give_ar.png deleted file mode 100644 index 39536593a6b9791f79358849c6960a7659dca938..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^>LAR)3?z5gE@TH%u>n3Iu0O*<5GXYGcPNkxA;IFI zA%8=Hfe5GuEEV$q|Nnnap8UOd;s3X9e>QFWnU?bJ?b}~Xjel?5`n`PF-{Z%Al@$N( z@B6c7&+pl@w*71X+00)OFv$iF^I<;C}`dobWj=c2@42-OvE{-7D`i`Ykq0UCLYf z{pVWomF4&3V!AF_MV+78zuSGacqbF<{S7<+D84pyFABVt&@1|4wzi?7@$tE?t9$*! zPF<>i_@$|ID%Z|MTm=H~0VD*z@n=`oD*#{N3Fa%`izA z=rW~}AirRS-`|8kU#bm#{k-Kyqbu*-tH@=c~~R5g5T zYpXhwrT@&N;9q*vI?UQ7J}@0=_x-YT$L$;H+Rt)P)K$^zzRg{1|6}?BtCr3+joKWp9k%YdnDt_*Yirn_ z1WkM!ad}13(wQ;Wuf>(NIKK@w^V;}Qed_GGpxI(43zs{bSQoY{IsH}Qir&p@rn)`&sKTFBEhnUC4agF z@4c4W8YS7zf;9=>0$&)mDE%mqU%WEKX3fl>f0y#C)0y#Sc}DJ&S1#+{_3qfjp?maa zbV6hMW6L$U2ln02HCdc;uV-8N#E3`bzh*r#ta!BX=-*kq{}{KO-zIyw-{dneq8U70 L{an^LB{Ts5>wH|^ diff --git a/YuMi/Assets.xcassets/Language/en/mine_dressUp_limit_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/mine_dressUp_limit_en.imageset/Contents.json deleted file mode 100644 index 301d3b68..00000000 --- a/YuMi/Assets.xcassets/Language/en/mine_dressUp_limit_en.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "mine_dressUp_limit_en.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Language/en/mine_dressUp_limit_en.imageset/mine_dressUp_limit_en.png b/YuMi/Assets.xcassets/Language/en/mine_dressUp_limit_en.imageset/mine_dressUp_limit_en.png deleted file mode 100644 index 8ce8040a415ec306d23c1f53e30efbf8f722dff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 935 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`oeb~^aRt)Dw*wK&|7|S)w=n(R%J_c|6WA^`usIMCsFCIWexNwZ z|ARn{U~_=B0Ku)f|4--se|zcwLD&DE?*4zW&Rjd;$wup_5a~@yf?k>vOU~xpzvKIWEB3x| zJWuBX!BtvCi>vC(17Gp%-Q{A)IWf9U_4cZrw>15nLek75|3>?Wo^iRl=SqX<>uHZv zBeJJlI=Ij8qfyppe|Pz3JnNla{mVZ+&wB=Ql>EO_t4|q-FR7dsfBcf6de&*Xv&*Xk z5AQL^{}k*pIiYS#vSszWK30Xz=N5j`kKj1U?sz?@D|1Px;Ma;G4l(C_^BvZ&O?LFy z%3L-zDNxFM!1!GisU}Kn3tH3~7eBcg<|x8n9)E6mr#k=RlUMTsbhwNU&cA5H zz5LN6qtjcq8=T7FI`15;yOH%^MS{rv4=kq3BLYkQZ?YNAcG=oxa)o`QC?5J6$9vbbZownU5jQIfZVl^I7-Qv^V+a zPhP$2lTWSV)$EyGJ2OrEo@7d_*4whn6N0=Cnv}E5>~UwltY9KIS<5&3Mx*zaHty?d zPWvov*Veymy8M2f)M3$i)!Xv7&YE>lrSs+X-kICi^vWw9tk=xiGPfY4s27+>89ZJ6 KT-G@yGywo9?#<8u diff --git a/YuMi/Assets.xcassets/Language/en/mine_dressUp_new_en.imageset/mine_dressUp_new_en.png b/YuMi/Assets.xcassets/Language/en/mine_dressUp_new_en.imageset/mine_dressUp_new_en.png deleted file mode 100644 index bb1c31afdb8607aeef5d0812e142d4ab215ed987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 919 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`tqbr8aRt(SRX>r?4UUq& zkKUSJy+E?+$AsEHAO+Q6WtBh$Ak<&|3n&7V?FWiOq=4d;zraTQ=&u24{|nbOp&F{C zzv^dC_5YT-e-l7je*FLc|HS^^8~7U~vcW>;&hpZ*jT0J#IWkTc=4vu9Fy(u?IEHu}pF6FyY?Xn4!{iNIkGS-%-r8Gh zoWqp$_W%DI(rc7N10LDB+sG8pJtHtFae4`Fejabh)MAEnp|uHTa~Ge^`(Pk9t4qy7 z=Al#YnTPw^Ur(|QWeE{zUYKqY{VnKu0DJg+w|?HB^k*CyF58c-w#xpr=Ah}0&w-N{ z-W4vGyU*xVOw@X{_Srgm!dp&eHGVU{*OGRl>*(&lRS!2eOtYE$`sUos3t|_m|5~X& zbEv-Z(9kxyvbyW`+if$Roqq0ETsq<6uf50bR~2MDbX=$#7Z%dLktyiQ)u&IoC7l^3 zX*~9il2_Ojl3scpCc*FF(GYZ%JW77LBzE^QLXP`I?iR>1m>LzncY>m~AuMRkvOylzQx9I@&1Uvsg2hFzve@}z(_ zO!pSZepFm?@rAm?#9 z+qx$!P-Z>x-o$4_U4OU(@u(}JQ+^wueGEaWuYk*?XCwzax& z+Xwd4b2h?D4EI)>u^O5z*{Fo_3ZE2T-j`uewW#-L*enI_-L}sCp%pTkf2w$w3x_p- zOnP}CpXceBE~zjkt1RdA75gjKOq}}n-3rr*Q&v{*tv9_B_LAR)3?z5gE@TH%Apt%iu0O*cW4L@fw{pT zGBo6GNH7oq+5i9l|J~pB_tvdHn>PMxYW!7F{Qujxe{bLZJ$~$GTFUR`%l=-x@O$>G ze@~wL*|X=WWJ4s-e4dgZzu@2RzZ}j=JiYDJYI$i_8?C=U@o%0kjv*GO-(ESLcUVDy z^}@mPY7fszZ20*4|NqSi(OF7K4_&Y38F8=c>Aw)G@FH$%SKq~awVc(P>H@B6&6O@) zy;8HJZeP@`2sxqHqLQ00`*%M}^D(p%zmZ^!?Mc{l%I7^6LHI%l*x${keerqfe>UW`6(x01tFhPE!Eb&HC-7 zn`v1@Ar%S7#LmK6qyPW`5lKWrR5;6()Z3DSFbDup8sjb165`#~|NqV1%{C0EJ8sXD z&Y&PdKyqbnY?fJ*mk!QV4-_8NNl1Oeom&lBQ{aiBkui6Jr_5c%$W%HdM>Q?}sZANV zo-@V!yHI+~sMRq@7u0q8vSJTWp(pPAbd~$;N#ouFI7|lrttX#g;-ExjUGSiUJY9zP z_}FUudpS@Y`y$SVK<002ovPDHLkV1mvT B-M#<- diff --git a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_exclusive.imageset/mine_dressUp_exclusive@3x.png b/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_exclusive.imageset/mine_dressUp_exclusive@3x.png deleted file mode 100644 index 474c61308f58d0b882e3e974eab3f6426833c0cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 849 zcmV-X1FrmuP)0W{E{C0lOOz& zAN`Xa{E;60lOOz)AN-OZ{gfX4k{|t&9r}?V`;r{|lOO$)Ap4RZ`;#C0l^^_*ApZXT z{qpMkoi_ZIDgD>C{Hf8O$qx`&j{IO~LsaO1?O8wctMD3;X0000YbW%=J0QTII842+E4F%%KcWx0^QoE^x zU(m6gW?MZkAL#0gLO~02(q{kw0xC&FK~zY`rPk|qqCgA);E`Jq6+!UQs@rYCMM1#3 zw)_6?wVq=4%s@uiJ@4#v@q2wxl|$-kxw;+ zx(3ivpRaF5<)ZTqxXvrk+VbsRVI!zpA9Em$e#&#GTfSl-x%bz5GV+KA`~x(lygjjt z(Ort$h$D3K`=ZA})HW^^n8uthKAm<88yZ3V~(QRzdK&`WE9UTXELFQFUhb zfU?JP1TsC1Eyx-B+TrHG?9G`YUUFEvBt;gAfa9}w;N)pgN)Q84n)Agmw{kX_fDdyS z`H6%9R~kWK1`sk#*6@JAB<+vkAw~^oj<^YVQ7vpqgl#K*+-2265-lOV%S){#E;NX? z7<_`rW$%qqMUp{<%7zV5XRJqoPk+i$xW1Qpz+yvu%H-fgaj@TJIlys`!G;_haZG=5 z1c=ElzWtoIZt!EuUJdG$*Tb&BTkJ8CJbBs}Na6K-LJZvww@M+lQ7sopJPOyL?mgi3NjW z_M6uk&nA|q!Lp%;1O3TWO=SDh3$%RVfLw)2hsdOOW{ah_Bg7C(FGbhpzUr1MwyXMc bjp)Q*=teQ(I`d#S00000NkvXXu0mjfzd^LH diff --git a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/Contents.json b/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/Contents.json deleted file mode 100644 index 634583d6..00000000 --- a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "mine_dressUp_limit@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "mine_dressUp_limit@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/mine_dressUp_limit@2x.png b/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/mine_dressUp_limit@2x.png deleted file mode 100644 index f42e7833119ddc974e7aa977c09d3c17d48c2d3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z!UKFlT!Hle?QH+IAt4Z#6(qQw z{r`53|J#}WZ({%|`1kMM|2s?my}k1PROY{5U;cf2`S02O|3}0BeZ2qwfb+ix8~*Rs z`hR`;|H~c!&s7>P%3KOGnztm#FPP!@jdO38&d!W*`yL5#P1`w63XP$wg0l;qzT^6KRjBEnkFA*ymxfo873XQqf=)t z@tHE`s7rR%o^wk&7nw{lEZ@djW4v{_E}!uGRcDWFT4lZH%K2;Ob98DBL>G21tuv_e zU>1wj<8>*Ma@xAg-`!PYrpYSCi8pf_kN$l8`>#^X{-Edj>07*Hg5u8GN!*`5?{oi+ cmCrwjdz6{ox*Bys7#OY$p00i_>zopr0JSgfx&QzG diff --git a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/mine_dressUp_limit@3x.png b/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_limit.imageset/mine_dressUp_limit@3x.png deleted file mode 100644 index 794c0d01a95cbaecd54d5e95bb6acf4185c812b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 995 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`T?+6CaRt);Ela62xWziEIbzV*B^+-~U6V|Gqr> z_xszwkGKC_%>DQC)Bha;|Ni{^e=_9Xx0nCE-v75p{{KF;f6sRRKV!A> zpix!y|NiIF(64S4CQo;MEYe=Zu&UzsrHU|cWsUcex8h9t8shlUA*&oa`;kFG@|D=caGH_eGy?or*m3FeF!Dakm$ubvriqoxpv?V`nq2TS~e3ChE?-P@2Qy zY`@pT(BHV=;Fe5%9;Mfl>y|_pO?l8|yN z_Wb30n%>=y1=beY@80=i?Vq&ZBdP|xHm7FIymji&LCM4&5NP?|3>=nM^7!mzW=M1X=_fk40sJp O*9@MnelF{r5}E)4=LFyY diff --git a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/Contents.json b/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/Contents.json deleted file mode 100644 index cbe423c0..00000000 --- a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "mine_dressUp_new@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "mine_dressUp_new@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/mine_dressUp_new@2x.png b/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/mine_dressUp_new@2x.png deleted file mode 100644 index 8f0ddd3f52c3997d3235c6b659a88c12fcfeab10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmVOw{j(YixdH0Tb`Hgz`k9+xzd-#lc_>g<^kbeJ;diehS{>#Jr<>LLWq5AUh z{l2vOpN{#Kg!rbI`S|z#*wg&c%lqu<{omUBwyOF`raj64000eiQchC<#@Nj5rJHG4 zL?IOkIK2Vh0003*Nklox*+Wb9`tD?(?}=j*$75j#g+%vo^|fEc1M}#o-54j z_+Uv6_rIUt9M3=les{pmjzX-BDUUKlZsEpu1`*w4!$8T5H^TuPcKTxH+0Mm~7E3VTV2ni%tBIjpEGCUxB}d@q z7%IfJ@EAj#^Z1RST5K@-|4j2dLIl0UQE^jm7f$0xilI^*y50|n9d}G0LGSqZKC4Q( v2#HrJ{cR4^c?;H0f#p71k(nG00000NkvXXu0mjf1xfVN diff --git a/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/mine_dressUp_new@3x.png b/YuMi/Assets.xcassets/jm/DressUp/mine_dressUp_new.imageset/mine_dressUp_new@3x.png deleted file mode 100644 index 412343c5f319906015afbc55af344309383aa31c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmV;#13UbQP)J1iF5djdisue_>Fn_j(Yiydiaic`Hgw_j(PcxdH9TZ`Hp$`jd}QudH9Wb z_>Ot`k9zoydH9WX_KS7*j(Yfxdijod_>Ow`{{H^Hv-36asrt>t`}Oqw%EJ4x zr1_|s`QF<6K?Ce{0000RbW%=J0QLvn4jGeK@X2>&KW|dyshYUZiGeR4>aV^@P~Kbs z00OW{L_t(Y$EB9(a;qQ|fWbBU)+W8}K`;h2iJE1(jvf~@L_22}H`Q=o$-E7X8TRghjX)*5 z1R+!iA74h_;SKa7Zgzz0(k40`?jH7Un^ljvDwdg|aF!ow5k2~>%t~J|)`@@>^eWfW zW?v8iEw&53QL-s5_f63fqOgqva=a#o;2i61EsO4}Hzf)b)@eXkmfoXMqq98Fh^}Q^ zjHduXOHI9EA*ZcpI-!YN=OoW+wYG~sFld~QTe;nVp2AuU&(NS!)^tJlVVLDb6oyjU zgf~E;i{7=m9vI8%g0USf7)#~>S+Z{;H8?a;wRlMsiYOot0(kI+Y`q;L!G23ma=nNG zEVy7x4xG=`$|1viiwR{gmq&r;76LsHTpsO11bSgV8Ck+X@kl< z5QyEFTq8)xAv9?=nmpfQ8C&?TgBj&u(!NBwb@ps8wP?qMx1)hk^N?TJj1exijOH1L z7TX)OZnc#+IgOec-n(WHD&5H#DbeWp8wp+cXIa!xlx}$SO5-@3= zRT&B^l4qqB@~i00$fRMvGJ@g-v zqP*3j1vSdGxehMnxG)8NsI4UgWJ mSnkaCCbuWH*PXeBO#B6TJ^gg(4r06j0000+i*Gp00004bW%=J?vVzGyWAdB0002KNkl9r+ibc5^hVNNnyE#g?{uG!Y}%g-0db$+b6O|v>_9v=7_NuX@yco@swhY zj5{+D7Zg@c7~^#e*{+t(#3e$M(~Qs|smw?kL$OXt1zO{bUY#h*tNuaCh{DgvQHBg+ z?64s^l7o&JJIdX@;+Q3?IU;J?e`%_T(S5^5{Q}Iwq_*GN-R#f>^Qu$9!{G_D*)YSj#>Hqrr{@~#HWn=nZ zUH|Xz{m#z*-QE11ocdc@{Ijz9XlMS~+WzF_`-zDBp`iPOg8Znc`fY6e(a`vZEmu<}6Yos)$O z!qipBgD|VqA^YY*mQLKA$?FDQ(ty+*ymSF6;>#>99)O+>T1+X$gp^*`?FlwnjC@j# zwjHqYkfLTd4Th3kdNM`d=0}saxG*|l5UjkQ?naTE>Yk%oa!CUk1k~kHPVskdmuj3( z+;>at^YVD`aZyz}-0rhm&k$Kz?|^ZAI5kQd6BX)?hkQ4>)>B-HldN@BbL#)<9dN*L z5ve+oG=JnNw~~2{^F4M;**~bqbyZpEkfRg-y}vzHWm(lN&bbki6u<9-V2pi2dSB6& z?Bn|$7v<-d&h1UQ9NqQu{%}r&)(BlMB!)2rKRkZS`!Y+>6iw00R88Hit-U%ic#rbF z${HToV-2ivR!s07*qoM6N<$f~(KgJOBUy diff --git a/YuMi/CustomUI/UIViewCorner/UIView+Corner.h b/YuMi/CustomUI/UIViewCorner/UIView+Corner.h index 25e563c8..1cbf4a7f 100644 --- a/YuMi/CustomUI/UIViewCorner/UIView+Corner.h +++ b/YuMi/CustomUI/UIViewCorner/UIView+Corner.h @@ -44,6 +44,8 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)setCornerRadius:(CGFloat)radius corners:(UIRectCorner)corners; +- (void)setCornerRadius:(CGFloat)radius cornerMask:(CACornerMask)cornerMask; + /** * 设置视图的指定圆角、圆角半径、边框宽度和边框颜色 * diff --git a/YuMi/CustomUI/UIViewCorner/UIView+Corner.m b/YuMi/CustomUI/UIViewCorner/UIView+Corner.m index 7c0c21d2..de019781 100644 --- a/YuMi/CustomUI/UIViewCorner/UIView+Corner.m +++ b/YuMi/CustomUI/UIViewCorner/UIView+Corner.m @@ -86,6 +86,12 @@ } } +- (void)setCornerRadius:(CGFloat)radius cornerMask:(CACornerMask)cornerMask { + self.layer.maskedCorners = cornerMask; + self.layer.cornerRadius = radius; + self.layer.masksToBounds = YES; +} + - (void)setCornerRadius:(CGFloat)radius corners:(CACornerMask)corners diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h b/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h index 9ce6a425..781d467b 100644 --- a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h +++ b/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.h @@ -7,9 +7,11 @@ #import +#import "DressUpShopModel.h" + NS_ASSUME_NONNULL_BEGIN -typedef void (^FetchDataCompletion)(NSArray *data); +typedef void (^FetchDataCompletion)(NSArray * modelList); typedef void (^FetchDataForPage)(NSInteger pageIndex, FetchDataCompletion completion); diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m b/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m index 2ce783c0..a84371e7 100644 --- a/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m +++ b/YuMi/Modules/ShoppingMall/ShoppingMallCategoryListView.m @@ -9,18 +9,204 @@ @interface ShoppingMallItemCard : UICollectionViewCell +@property (nonatomic, strong) UIImageView *bgImageView; +@property (nonatomic, strong) UIView *itemBGView; +@property (nonatomic, strong) NetImageView *itemImageView; +@property (nonatomic, strong) UILabel *titleLabel; +@property (nonatomic, strong) DressUpShopModel *cellModel; +@property (nonatomic, strong) UIButton *playButton; +@property (nonatomic, strong) UILabel *pricePerDayLabel; +@property (nonatomic, strong) UILabel *description_1_label; +@property (nonatomic, strong) UILabel *description_2_label; +@property (nonatomic, strong) UILabel *statusLabel; + @end @implementation ShoppingMallItemCard - (instancetype)initWithFrame:(CGRect)frame { if (self = [super initWithFrame:frame]) { - // TODO: 补完内容 - // MARK: 逻辑比较复杂,需要新建文件处理 + self.backgroundColor = [UIColor clearColor]; + + [self.contentView addSubview:self.bgImageView]; + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self.contentView); + }]; + + [self.contentView addSubview:self.itemBGView]; + [self.itemBGView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.leading.trailing.mas_equalTo(self.contentView).inset(15); + make.height.mas_equalTo(self.itemBGView.mas_width); + }]; + + [self.contentView addSubview:self.itemImageView]; + [self.itemImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.mas_equalTo(self.itemBGView); + make.width.height.mas_equalTo(self.itemBGView.mas_width).multipliedBy(0.7f); + }]; + + [self.contentView addSubview:self.playButton]; + [self.playButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.trailing.mas_equalTo(self.itemBGView).offset(-4); + make.size.mas_equalTo(CGSizeMake(26, 22)); + }]; + + [self.contentView addSubview:self.titleLabel]; + [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.mas_equalTo(self.itemBGView); + make.top.mas_equalTo(self.itemBGView.mas_bottom).offset(5); + make.height.mas_equalTo(20); + }]; + + [self.contentView addSubview:self.pricePerDayLabel]; + [self.pricePerDayLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(6); + make.leading.mas_equalTo(self.itemBGView); + make.trailing.mas_equalTo(self.bgImageView); + }]; + + [self.contentView addSubview:self.description_1_label]; + [self.description_1_label mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.mas_equalTo(self.bgImageView).offset(1); + make.bottom.trailing.mas_equalTo(self.bgImageView).offset(-1); + make.height.mas_equalTo(30); + }]; + + [self.contentView addSubview:self.description_2_label]; + [self.description_2_label mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.mas_equalTo(self.bgImageView).offset(1); + make.bottom.trailing.mas_equalTo(self.bgImageView).offset(-1); + make.height.mas_equalTo(45); + }]; + + [self.contentView addSubview:self.statusLabel]; + [self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.leading.mas_equalTo(self.bgImageView).offset(1); + make.width.mas_greaterThanOrEqualTo(50); + make.height.mas_equalTo(22); + }]; } return self; } +- (void)setCellModel:(DressUpShopModel *)cellModel { + _cellModel = cellModel; + self.titleLabel.text = cellModel.name; + self.itemImageView.imageUrl = cellModel.pic; + self.pricePerDayLabel.attributedText = [cellModel pricePerDay]; + self.description_1_label.text = YMLocalizedString(@"1.0.30_text_1"); + self.description_2_label.text = YMLocalizedString(@"1.0.30_text_2"); + self.statusLabel.text = @"FFUFUFUFUFUFUFUFUUFUFUCKCKCKCKKCKCKCKCKCKCK";//YMLocalizedString(@"1.0.30_text_4"); +} + +- (void)handleTapPlay:(id)sender { + +} + +#pragma mark - +- (UIImageView *)bgImageView { + if (!_bgImageView) { + _bgImageView = [[UIImageView alloc] initWithImage:kImage(@"mall_item_card_normal_bg")]; + } + return _bgImageView; +} + +- (UIView *)itemBGView { + if (!_itemBGView) { + _itemBGView = [[UIView alloc] init]; + _itemBGView.backgroundColor = UIColorFromRGB(0x04184A); + [_itemBGView setCornerRadius:6]; + } + + return _itemBGView; +} + +- (NetImageView *)itemImageView { + if (!_itemImageView) { + _itemImageView = [[NetImageView alloc] init]; + _itemImageView.contentMode = UIViewContentModeScaleAspectFit; + } + return _itemImageView; +} + +- (UILabel *)titleLabel { + if (!_titleLabel) { + _titleLabel = [UILabel labelInitWithText:@"" + font:kFontMedium(14) + textColor:UIColorFromRGB(0xD9E7F7)]; + } + return _titleLabel; +} + +- (UIButton *)playButton { + if (!_playButton) { + _playButton = [UIButton buttonWithType:UIButtonTypeCustom]; + [_playButton setImage:kImage(@"mall_play_icon") forState:UIControlStateNormal]; + [_playButton addTarget:self + action:@selector(handleTapPlay:) + forControlEvents:UIControlEventTouchUpInside]; + } + return _playButton; +} + +- (UILabel *)pricePerDayLabel { + if (!_pricePerDayLabel) { + _pricePerDayLabel = [[UILabel alloc] init]; + } + return _pricePerDayLabel; +} + +- (UILabel *)description_1_label { + if (!_description_1_label) { + _description_1_label = [UILabel labelInitWithText:@"" + font:kFontRegular(12) + textColor:UIColorRGBAlpha(0xD9E7F7, 0.5)]; + _description_1_label.textAlignment = NSTextAlignmentCenter; + _description_1_label.backgroundColor = UIColorFromRGB(0x002840); + _description_1_label.numberOfLines = 0; + [_description_1_label setCornerRadius:11 + cornerMask:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner]; + } + return _description_1_label; +} + +- (UILabel *)description_2_label { + if (!_description_2_label) { + _description_2_label = [UILabel labelInitWithText:@"" + font:kFontRegular(12) + textColor:UIColorRGBAlpha(0xD9E7F7, 0.5)]; + _description_2_label.textAlignment = NSTextAlignmentCenter; + _description_2_label.backgroundColor = UIColorFromRGB(0x002840); + _description_2_label.numberOfLines = 0; + [_description_2_label setCornerRadius:11 + cornerMask:kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner]; + +#if DEBUG + _description_2_label.alpha = 0.3; +#endif + } + return _description_2_label; +} + +- (UILabel *)statusLabel { + if (!_statusLabel) { + // TODO: 需要单独处理 + _statusLabel = [UILabel labelInitWithText:@"" font:kFontMedium(12) textColor:UIColorFromRGB(0x51281B)]; + _statusLabel.textAlignment = NSTextAlignmentCenter; + + CAGradientLayer *gradientLayer = [CAGradientLayer layer]; + gradientLayer.colors = @[(__bridge id)UIColorFromRGB(0xE29030).CGColor, + (__bridge id)UIColorFromRGB(0xFCC074).CGColor]; + gradientLayer.startPoint = CGPointMake(0.0, 0.0); // 顶部中央 + gradientLayer.endPoint = CGPointMake(0.0, 1.0); // 底部中央 + gradientLayer.frame = CGRectMake(0, 0, 80, 22); // 设置渐变图层大小 + [_statusLabel.layer insertSublayer:gradientLayer atIndex:0]; + + [_statusLabel setCornerRadius:10 cornerMask:kCALayerMinXMinYCorner | kCALayerMaxXMaxYCorner]; + } + return _statusLabel; +} + @end @interface ShoppingMallCategoryCard : UIView @@ -111,7 +297,7 @@ @property (nonatomic, strong) UIScrollView *container2ScrollView; @property (nonatomic, strong) NSMutableArray *itemViews1; @property (nonatomic, strong) NSMutableArray *itemViews2; -@property (nonatomic, strong) NSMutableDictionary *dataCache; // 缓存每页数据 +@property (nonatomic, strong) NSMutableDictionary*> *dataCache; // 缓存每页数据 @property (nonatomic, strong) NSMutableSet *requestedPages; // 记录已经请求的数据页 @end @@ -190,9 +376,6 @@ // 添加 item view-2 到 container2ScrollView for (int i = 0; i < items.count; i++) { -// UIView *itemView2 = [[UIView alloc] initWithFrame:CGRectMake(i * screenWidth, 0, screenWidth, self.container2ScrollView.frame.size.height)]; -// itemView2.backgroundColor = [UIColor colorWithWhite:0.9 alpha:1]; - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; layout.itemSize = CGSizeMake((screenWidth-30) / 2 - 10, kGetScaleWidth(244)); layout.minimumInteritemSpacing = 10; @@ -206,6 +389,7 @@ collectionView.backgroundColor = [UIColor clearColor]; collectionView.tag = i; [collectionView registerClass:[UICollectionViewCell class] forCellWithReuseIdentifier:@"cell"]; + [collectionView registerClass:[ShoppingMallItemCard class] forCellWithReuseIdentifier:@"ShoppingMallItemCard"]; [self.container2ScrollView addSubview:collectionView]; [self.itemViews2 addObject:collectionView]; } @@ -231,10 +415,13 @@ // 使用外部提供的回调或代理来请求数据 if (self.fetchDataForPage) { + NSDictionary *itemDic = [self.items xpSafeObjectAtIndex:pageIndex]; + NSNumber *type = [itemDic allValues].firstObject; @kWeakify(self); - self.fetchDataForPage(pageIndex, ^(NSArray *data) { + self.fetchDataForPage(type.integerValue, ^(NSArray *data) { @kStrongify(self); if (self) { + // 更新数据到对应的 itemView-2 [self updateContainer2WithData:data atIndex:pageIndex]; self.dataCache[@(pageIndex)] = data; // 缓存数据 @@ -284,8 +471,11 @@ } - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath]; - cell.backgroundColor = [UIColor colorWithRed:arc4random()%255/255.0f green:arc4random()%255/255.0f blue:arc4random()%255/255.0f alpha:1]; // Placeholder color + ShoppingMallItemCard *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ShoppingMallItemCard" + forIndexPath:indexPath]; + NSArray *data = self.dataCache[@(collectionView.tag)]; + cell.cellModel = [data xpSafeObjectAtIndex:indexPath.row]; + return cell; } diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h b/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h index 4a5f0ba5..5662bc54 100644 --- a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h +++ b/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.h @@ -7,13 +7,14 @@ #import "BaseMvpPresenter.h" +#import "DressUpShopModel.h" NS_ASSUME_NONNULL_BEGIN @interface ShoppingMallDataPresent : BaseMvpPresenter /// 获取装扮商城列表 /// @param type 类型 0:铭牌,1:头饰,2:座驾,3:资料卡,4:聊天气泡 - (void)loadCategoryItems:(NSInteger)type - success:(void(^)(id obj))success + success:(void(^)(NSArray * array))success failure:(void(^)(NSError *error))failure; - (void)buyItem:(NSString *)itemID diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m b/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m index d9678a23..081004d4 100644 --- a/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m +++ b/YuMi/Modules/ShoppingMall/ShoppingMallDataPresent.m @@ -11,12 +11,13 @@ @implementation ShoppingMallDataPresent - (void)loadCategoryItems:(NSInteger)type - success:(nonnull void (^)(id _Nonnull))success + success:(nonnull void (^)(NSArray * array))success failure:(nonnull void (^)(NSError * _Nonnull))failure{ [Api requestDressUpShopList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { if (success) { - success(data.data); + NSArray *array = [DressUpShopModel modelsWithArray:data.data]; + success(array); } } fail:^(NSInteger code, NSString * _Nullable msg) { if (failure) { diff --git a/YuMi/Modules/ShoppingMall/ShoppingMallViewController.m b/YuMi/Modules/ShoppingMall/ShoppingMallViewController.m index 8e1aaa02..15823fbe 100644 --- a/YuMi/Modules/ShoppingMall/ShoppingMallViewController.m +++ b/YuMi/Modules/ShoppingMall/ShoppingMallViewController.m @@ -55,16 +55,14 @@ } - (void)fetchDataForPage:(NSInteger)pageIndex completion:(FetchDataCompletion)completion { - // 模拟异步数据请求,并在获取到数据后调用 completion - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - NSMutableArray *data = [NSMutableArray array]; - for (int i = 0; i < 20; i++) { - [data addObject:@(i + arc4random()%100 * 20)]; - } + + [self.presenter loadCategoryItems:pageIndex success:^(NSArray * array) { if (completion) { - completion(data); + completion(array); } - }); + } failure:^(NSError * _Nonnull error) { +// TODO: 增加错误处理 + }]; } @end diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h b/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h index 76b892cc..9dea2ac9 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h +++ b/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.h @@ -28,6 +28,27 @@ NS_ASSUME_NONNULL_BEGIN ///是否限时 0:限时,1:不限时 @property (nonatomic, assign) NSInteger dressLimitStatus; +//"装扮动效图片" +@property (nonatomic, copy) NSString *effect; + +// "折扣价格" +@property (nonatomic, assign) CGFloat discountPrice; + + +// "vip等级" +@property (nonatomic, assign) NSInteger vipLevel; + +// "vip等级对应的折扣百分比 * 100" +@property (nonatomic, assign) CGFloat discount; + +// "贵族限定,0-无限制,1,2,3,4..." +@property (nonatomic, assign) NSInteger vipLimit; + +// "获得方式,1-普通,2-活动" +@property (nonatomic, assign) NSInteger obtainWay; + +- (NSMutableAttributedString *)pricePerDay; + @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m b/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m index 2fe3a57b..5326c669 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m +++ b/YuMi/Modules/YMMine/View/DressUp/Model/DressUpShopModel.m @@ -13,4 +13,38 @@ return @{@"dressUpId": @"id"}; } +- (NSMutableAttributedString *)pricePerDay { + // 创建一个 NSMutableAttributedString 来存放最终的结果 + NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init]; + + // 1. 添加金币图片 + NSTextAttachment *coinAttachment = [[NSTextAttachment alloc] init]; + coinAttachment.image = kImage(@"moli_money_icon"); // 替换为你的金币图片名称 + coinAttachment.bounds = CGRectMake(0, -2, 18, 18); // 设置图片大小和位置,偏移量适当调整 + NSAttributedString *coinString = [NSAttributedString attributedStringWithAttachment:coinAttachment]; + [attributedString appendAttributedString:coinString]; + + // 2. 添加空格 + NSAttributedString *spaceString = [[NSAttributedString alloc] initWithString:@" "]; + [attributedString appendAttributedString:spaceString]; + + // 3. 添加 price 文本,字体加粗,颜色 #F8CE1F,字体大小 25 + NSDictionary *priceAttributes = @{ + NSFontAttributeName: kFontSemibold(15), + NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) + }; + NSAttributedString *priceString = [[NSAttributedString alloc] initWithString:@(self.dressPrice).stringValue attributes:priceAttributes]; + [attributedString appendAttributedString:priceString]; + + // 4. 添加 day 文本,字体常规,颜色 #F8CE1F,字体大小 12 + NSDictionary *dayAttributes = @{ + NSFontAttributeName: kFontRegular(12), + NSForegroundColorAttributeName: UIColorFromRGB(0xF8CE1F) + }; + NSAttributedString *dayString = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"/%ldD", (long)self.dressDay] attributes:dayAttributes]; + [attributedString appendAttributedString:dayString]; + + return attributedString; +} + @end diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m index de9471d4..4e121580 100644 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m +++ b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m @@ -62,9 +62,9 @@ return [RACSignal return:nil]; }]; - RACSignal *bannerSignal_2 = [banner_2 catch:^RACSignal *(NSError *error) { - return [RACSignal return:nil]; - }]; +// RACSignal *bannerSignal_2 = [banner_2 catch:^RACSignal *(NSError *error) { +// return [RACSignal return:nil]; +// }]; RACSignal *menuSignal = [menu catch:^RACSignal *(NSError *error) { return [RACSignal return:nil]; diff --git a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m index 2d69b05d..adaab3a4 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomePagingViewController.m @@ -166,10 +166,11 @@ #pragma mark - - (void)didTapMineButton { +#if DEBUG ShoppingMallViewController *vc = [[ShoppingMallViewController alloc] init]; [self.navigationController pushViewController:vc animated:YES]; return; - +#endif [self.pageContainer setViewControllers:@[self.viewControllers[1]] direction:UIPageViewControllerNavigationDirectionReverse diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 3b9f9a7a..73144420 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -3999,3 +3999,8 @@ ineHeadView12" = "الحمل"; "1.0.18_28" = "كن في اي بي%@، يمكنك الحصول على %@ حصص كل يوم، والدردشة بشكل خاص مع المستخدمين مجانًا، جرب ذلك؟"; "1.0.18_29" = "لقد قمت بالدردشة مع 1000 شخص اليوم، يرجى المحاولة مرة أخرى غدًا."; "1.0.18_30" = "%@كن في اي بي"; + +"1.0.30_text_1" = "VIP Enjoy Discounts"; +"1.0.30_text_2" = "Only get by event, cannot buy"; +"1.0.30_text_3" = "Exclusive for VIP%@"; +"1.0.30_text_4" = "Limited"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index f6067810..69a97174 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -3792,3 +3792,8 @@ "1.0.18_28" = "Be %@, you can get %@ quotas every day, chat privately with users for free, try it?"; "1.0.18_29" = "You have chatted with 1,000 people today, please try again tomorrow."; "1.0.18_30" = "Be VIP%@"; + +"1.0.30_text_1" = "VIP Enjoy Discounts"; +"1.0.30_text_2" = "Only get by event, cannot buy"; +"1.0.30_text_3" = "Exclusive for VIP%@"; +"1.0.30_text_4" = "Limited"; diff --git a/YuMi/tr.lproj/Localizable.strings b/YuMi/tr.lproj/Localizable.strings index 2bd47b00..a6d08244 100644 --- a/YuMi/tr.lproj/Localizable.strings +++ b/YuMi/tr.lproj/Localizable.strings @@ -3578,3 +3578,8 @@ "1.0.18_28" = "%@ olun, her gün %@ kota alabilirsiniz, kullanıcılarla özel olarak ücretsiz sohbet edebilirsiniz, dener misiniz?"; "1.0.18_29" = "Bugün 1000 kişiyle sohbet ettiniz, lütfen yarın tekrar deneyin."; "1.0.18_30" = "VIP%@ olun"; + +"1.0.30_text_1" = "VIP Enjoy Discounts"; +"1.0.30_text_2" = "Only get by event, cannot buy"; +"1.0.30_text_3" = "Exclusive for VIP%@"; +"1.0.30_text_4" = "Limited"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index fd05d869..989e9169 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -3450,3 +3450,8 @@ "1.0.18_28" = "成為%@,每天可獲得%@個配額,免費與用戶私聊,試試看嗎?"; "1.0.18_29" = "你今天已經與1000人聊天,請明天再試。"; "1.0.18_30" = "成為VIP%@"; + +"1.0.30_text_1" = "VIP Enjoy Discounts"; +"1.0.30_text_2" = "Only get by event, cannot buy"; +"1.0.30_text_3" = "Exclusive for VIP%@"; +"1.0.30_text_4" = "Limited";