From 42767d3b6e6fe9bd87828f33f26cbb519a67f694 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 6 Aug 2021 17:19:29 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/ui_Main_recipe_MoneyFrame.png.meta | 2 +- ...opping_detail_button_icon_facility_off.png | Bin 9440 -> 9474 bytes ...opping_detail_button_icon_material_off.png | Bin 5371 -> 5492 bytes ...shopping_detail_button_icon_recipe_off.png | Bin 4907 -> 5145 bytes .../recipe/Prefabs/MaterialFrame.prefab | 4 +- .../recipe/Prefabs/MaterialFrame_stock.prefab | 8 +- .../recipe/Prefabs/NecessaryMaterial.prefab | 6 +- .../MyGame/Scenes/recipe/RecipeChoice.unity | 102 +++++++++++------- .../Scenes/shopping/Prefabs/Frame.prefab | 20 ++-- .../MyGame/Scenes/shopping/Purchase.unity | 42 ++++---- .../Scenes/shopping/ShoppingExplanation.unity | 6 +- .../MyGame/Scenes/shopping/shopping.unity | 6 +- 12 files changed, 113 insertions(+), 83 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png.meta index 6b4fc80f..6b56bd38 100644 --- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 61, y: 0, z: 60, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_button_icon_facility_off.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_button_icon_facility_off.png index f57bd196a6022c4bc172ad3f90a3da059d4e95e4..b2d15f2977038d4618b4fd2682c7df7360d2c8b7 100644 GIT binary patch literal 9474 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 UzqMI1kpKVy07*qoM6N<$f;8+vGXMYp literal 9440 zcmV<6Bp=&}P)5*L6&anUj)IEtj1WGs=RiXG0lN>rk8jg#1tQd3IBPD05pyUO}ukz+fHGY+XZ zvMQBWqBJghq{&3!XrvLTg&--4q(lk;7i`4Rjc%YDOE+@9^WJ^9{rdF+ph*A(PE}U} z-LKz!eZPCo`Ob206D`PsEXdpy*Id2v=fAVPj-Q_4$3A}eV$o=Ge{UZR4G!V$);y2r zmH+YKwWbAt=N_;J`RPf1G&;TC({+==LqqD{7hgNw{lWskb3X@YBsucCx@fBQk&aPMaF`YHv`Sg4!EN5j@JXHR`Wzj*r-`5Pu$ zX|Dk6a`_ejo>^_(XKHJM{$Bmg4OIX2duipSyXAiX8|`mnwH=fH1ARd{^U)UquD@?W zi-UoIxN9)GZdw3%W=PW^72@dHy5k$$*thN=Z&^8wj}41|9UmFAKHGM=gHHY899=rs z>Ui$akzBrUfQtj9@_cngY;kj{SkRBCpRbVn#196tAo{e*3QUBBSYlx?WgZ< ztMQM=Vn-I&)*fcC{R;qR9^yQsYb!|8j=ft&Tg#U$rSa$}jYk3$(@0a-jb72#Gi-+A z{PLo5+Oz**0T&=o$HyxvDJ_*}1{wEwsJElzaem&q0C4gF-DeJHLWtAw^=(xD;5KsQ zdc^$32HM3OD{cLP&F@JD769uapJTsVw_#P>>z!BI9ZfXCrP>wC>z-e^;&g(Kzi%_` z*nJO`m3irB$3Kus1dyS{;=5z9hTq)2^x6OUQTyQqfHMqn_B`Gw+A0G$)JL&kC$p!R zMVd~s35F>K$hx*RFsM5peITi}wqE#3fx-ZfP+opMm6Vl`x3CZ|AJu*Q&PVQ-__?5{ z$YA3H`4Uv+II?R;p5_*NlJNkSa3;kL`|ap&By zZKG&8p3}+6w|{8?T(zWHK#KG6^=rfxAkAllb$y{{8COc32@%v%#Z=@6%{C9SqX zLw7M@s%KLS&CNub-}{98J%(9D77Guhtwy$M2l=Wh6I_8}^Abw1fl(6inEjkkCV%n!A=}bPv$fGpw=A?|p1( zt@82p_t%T|`)X<&U4dfcm|Sr_o+qY{v$) zjrSWN4x2rDh+{W@N&qH6olJ<+dhsg;_G2-}aXx<8V%jC7X@{dLNaf?#Z?2;)+tqT2@R@KS%0j%x{k}`60V%9UTW&F1;fBuKB$vqE-LezIN&UBZ*cDmbt zM{2Oijs@I*`p+LR%&@0Kv{f|5d`@cqm?%M80dA(+ikKFlUi{>90ogiNWf|>!c$XF8 z*j+&?A1~!a1{L7yf*Nw$l@8Hly!VTrej=fj+ug5|Eo8l3xKmAZqni0JWdKxxnynB= zXTtziPg)2g-?dRdt=qWXa0Oz9yW_Ogspz1Z0e0@*l%TB^z*_3_k$v|Gz(|e&WN5M} zPu|G@Hz93@L4Z~O|hhD`m&}YuuSmZN<3bV4sauDaUFx)ddC6$((50gKDzSzdse?&TvFVK zFaqYZn!}w;z(t5-kf!tT+PZd`rL9&%LJM(HB_yD&Teh!f^0Z{y1CWeI6cras;Xxx? z2j`+M&bX_RXRt57py24@>c#s&L?8%N_U!*h2@E-9h_m%>iCwc9;!H(borqaZUJjMl zlvB^O9>eM|z*^$N&l+5Q#{#V6hx_ksbh}(HtNgPv*C0iap@?Hb0wKg4F)`b?R*Ga%#cd&mgBvU;gg5x7L}Q zr9n^Snn@E_!+=glFmZnLcc+_X4ZtSx@(o8KZ+Hp{8dDvInyZ93_pG%-9K8#2Iw4M` zl8TrqdFa=7legHgLR~leDa6NJc>jX@-`&w=l@FcB76Xbgc-#cEaT>SUWCDJI0Y5&Y z0GlA!jSP>R&iCZUbuC&oSB`@VN=gjU#Qs&+)?}KbLL7TSVk(lX8w6T8&>s-cs%w`> z+`Dq)3fj1HgS;OM4awv46Xz*17?D*HSS_K+%Eh&{_|6Fh7hT*QFXiM|g`v7a8bdSpzs} zUll?e_N{u&Reb9#32|Unp{?2?G$(&|1cZsd+Nh(Y zo1)s}01)1#Ybb|-8Sc435e6b=*HrYH7B1f)zz*@C1KbHe!(78tO5u1bn5RB3-TW0MG>tG#&ujvt+}=*PV^^w0=_^d8_VX zTQrmq;$%{DovtLS6cv{HsL)qNJuPicDMl5F0K{X-%6=*xyPQpQJ)3HO?*N^6>q8nH zHaaw6hKrWpO@r4iOaKclEvcsQqD8EBIoXSAVo`E2$gTj7rRnNmHHuem7SoM;&?anJ zkX_oB1kFF~7~+5l5B6k~EXa0<v189>sf}imEVvaRj#D>? z(pG>dj1^kSS{q_>44|vlu9nw3FI=)hB3oC+%5;SS{{BbDqOpVgurwDU;4+}&i`OOv z111&zQ~c=2(B!{7`)wg*g+B4+juVK_>+ZfNCLAt9fouwv**uq#27?ei%^D2wvQcx* zG$CORaq` zaR0sgMn|J>fcyxHWu_eX{CyehSk;C^^28eIM%xl1h|!7I+U+gjkjl%Zv;+&K#H89K z8XiDby%8%5vC<|qCX=_EXV{{|38jGy>jKgRGNvXmgWQ@5V6d}ym1Y)rJ&rZkY=k(e z!YBY*x}-*klMZj5E8*F;V zCfGT2w^0(4f z01EBI-_TC@UIi>Pd8pqnuS1Iq%gdl4%|)#zld8DLqz1oH>hDyEqSShQEM z+rSO+hoWft9IsZdrrgr1DTA5{?2(?U47fRoiWgJNx7;$_VA!~qLbft7o($09aSrEt zIyw?Iok>V^{Od-z~hQoArwM#Ay%`|FwHQ>J(rDmmBI8Z z-5^?ft0g+fG4Zv}#FT@*#}=)bxS#g35}Oy*Z8ls9OMiDajg5}RP2hy7_vde)Z$7ZK zYHv|V@f-ObPo4BEq2rLr4+hMMgiWUAs!LvhM}Q3V^e|`v0ocj^0`%5XpIVv>jm7&x z?RDi^evQEeqyOu__=%x-i785-1GtS7IpPu;3=df3NB4U<#TDdT(U5hGO(r=-Q`eQ5!Py!84< z$kPI)Iso?Afjy#;$Y^C+bA|T62V#)*ReK@+AC(+P-Hxw`83vIW4u;}D)e{={dw?f| z9av~9iWVS#m|Q=3t;xCvbYtk%BdrXVQAUaUH$;QsXJ-Q3IBUlf3~YO(hoc4Teh@X{ zYot!c<5ROfw!n=lVn}Cekm5UpFzMla_sc+LT5}DV+Uiur;n!OkV3{cZEZ%GzgsXVb zBGKlMO_QB~#RLPe`h5)Wgc%4Vl-`b~%WA>jfn-S~C)jCe&}+qerTf^8m0yKunHZZq42+xt+~dTKezih1AgSyPdb~PU$OkCS=11p3N7}O6iMn4 zCK!IXaN+!tnA`Vt1zg*Uw+vRgJ%84*@ zhp85~;ailfG+CC`M4M*X&t@7XZ65}*tGzcNA(3Gf2Ro!3V_Ztq2WiL%U{kP!avug#H-Y6# z%E?#lqn73t!+fx59g7F2DK{_g6{hXSlML)3^+z&L>&;4(Dq1AVgTr#54aZ@E`OOSg z#@!Im2y|i~=PU7LbZk}u>~b5B!OFlqC(+;&83W8(e2lgDkg5%%q_%GBY8uaRO9x`8 zCrCH1_sE_Ywldv|e|_pkQ;Jj9sqC0lb#l37c_~&)6qJePxY3Tk-Ky$MM6Ppz1T{v7k)*TKE1&H zG~gI+ft@GWZlNj9<9Ts9dqpGUfQc?$ze5uGgJ1qih}P{$Zlp?jgj-KbZVLB>rUQHb zR@7mlX9_U)wG23u#o20~P>@+q3x9+jLB$xVwV^(1wgBiU1sSum7K({bi-4EVsfr}XF zx+38bGFK&Qw#IdotX}G&EA2+e6pcm`NLEIz2=8BLk34X9Et0Yg;ZRuGOeLhr%cam@ zn8st{G|)3Z`K-mEfgp{K8x1MUfCFdSLrqD}`8J;uS*2Z$zL0?&8XTmce}J%)dn6pe zzLQSC94RU-eTsp7<;?Yg)~O8Q$uBznJJ&5if}m#8N-r&4luzxwqZAzq@^=_!(zS)$ zc^(?+Yp2n^Ytnn>_Li#5(JcdZ^kxf1uAUX`Mc%n^**Y=HqXDD&;@@Bvp|mAye5pbaLFnLe1wK?w$TU={y1{PE;Py&W!29PcYaC3H$G<$&`Wv6 zKFN<`f(=~y$jD2Z;QmHq1-<%np8O**v7EzUD>Q84ad~r605ce!3^D@fx={{imYXf6 zXdDj@qjMofA^#xd=I4nPD<;2rNl_bLENOD#)3*MLcQ5v|vHxh~M*;kZvH&(sg(diR z{P=AqPXDXRQFU{o|cJdhcA2 z&Rj7X3_^atZsFd<#Gi~0)-zkufe2F#vQ^+Q`i0ADD`Y(na?Cce^(3X)$i%GC9z%+a z;@9+GVzj2qK4n8tEdSkaZ^eBaeCOi;ZLIUs!`n*b`Pkb%mS4t0bvqWnj@Y5JJez7GOuwt&zA&VWLvRgvp(gOS$|x_PL3h+(1{0czf;}d}nEAghxc){aeUGpuf%d9)X(Nq1~B+44J)EfA6jldaM4C=CV%CGnwc zub-A|%_dn_o^yuD-obp2r(ldNax)Vdd_ROF(4fEi`sa%w`_#$gDOqdUGZ_SD-75CBzYQa50 z8i|ZBiEv9?Yl@Gx_ylWl>s$aC)@Easw~YsKUrt`0L|eqFBUOcn9r; z_GJs$zdseA*Wc?W#O8`E2YP#*vU%`@`<;mFbW$;rDd}wM5}ykxDl+_3^{N_qM!2N5 z_tiqCIU@+)^78VIBSSYaVmZ)P9c_cotTk!ggK53rCbJs0?p?_?DrZ+eP;9_^# zmo0E@OIHM3^hukG%m4~}V;pm3fYo}cTqbC4TV7ffV*u)S=072zTAvP2#>Hi$n+z9y zxsyX9D?eS3pU@0o+i3f7nuXitGq_eGU?$)Kpg><@%M5&{B15(u@l>SQ9OL6t;V#)I zXdW|X7oizIPHHv-lvb5WX%T{!9?NXF-3PIA-mC=|EBvZAqy-n6Ytz71(wYaRAx$vD zCLzTF_G42erdj!cXeY8Y%JJ~c9zS(|)kW7YUKf&u#yHvJ)7T&d8hpm%^|l`SpzYXf z0ykl~XlCGAX+m@Is*Ta=DRH?>ooynVFqNb^+dpQVEr6}!KdYUJkQQFxURvTIB-#KovYwx(?pA@TU2)! zt*YNdBTPiX5$E_1YmkQg{$v>)#K$kpB)GCKm6oAOk}iB|uKY+xwg86jYz&(P{$bnC ztbUh7Qjtexw(@8mTt?zen0hec2i!F5oQ2PfC_N+WuW@{ zVVfMkMc}IaosGRN<_Wl216W_6)_e6Dd3`<_=L?pE67S=yFdYUY&adb&8Ftg*&nBLW&4Cb_{O>y zSX&Pz(N@X&c)Z>t$3AGgts0>=IbYQR9W zVzJm8ZnwKpX>CL}LC`6$d`EzL%K$b(wunu(D+dYs^1$julusY`I^o1`5azv zND(f+nCZ{n%nN|cRN_&G0nVmK!ovOo7JTh}=C!lgBW5+q%{0)iSpx36bPEd&n)pqS zo6Kt;B-;k)x8QpCS-KbIGr;)rhi>B~W%-P0Esox%YaU~eXJi3<&P)TmbKMejf)w1w zOX6Bs9p|W36;(AiQJwVsLx-7upcpMAy z78OxncNhJ`Yp>9auP$eFKb!en-+T7o%C%m4=C`cR0o>pD<3BZGsekcZK5wUW{pXMT zrTncQpUQIFZl65Uad1My0fUJ_P9^~V#9MzWe}C)1lLAUI0RXkDRtqTU1m{)P#RTf> z>a^ao1BVG9=U%zmdJPi|k2RYb=;Y6TN~eDQw*3;SSGs9l0Bn-0m+h}#KG#gI|F^%O zLhJ$`3ek<0D{=4ZgS}>Ry#>gPuddML&zkAWb7uq`fTi9~Cjjd^-~U(E`Jwes|Nb93 z9((Ao{>Jh3ZytCu?!I6>@Lg=uIBx)^6u+LWG}K9;;cDQZNsxc|n^zJ(0~2ikb|vLa zz_i2s;#>gt&wlUUh*d~7IdDwa+#92!x>`ODldWqk+(Z&{ecO{DGYRk>Cr#R-nOvAV z1s2}Z2l@3M|EG!nTdp{2rSV>B|NHds|AFP-0WO{uSkOXsJ!meD!*$gJ`_^}#6wU4H z>XJ#8VSGGq08a3~JJ}C{m1bg6E2^qfYPk}a>|_G7tR}*b|L8wj_>GC(g$CW9NllnO#qGjBxAOi z1ZpxVR-8(}-a*6^@VLHcH1h?e&G;YpjbrrtRiV;M4Dw6@oS<45XbfaJaTvTfDKs1E zaXuWYVq1M8eDB%k6a26q0>LDs>HXZv_bpceMy|+M%GjPKf-?8^uux^u?s$Na{O2!x z$jMaezF4%?jBPPsDz4QvQ~6LQ0tKM(tjDm>UiBKtnO&2u_p2z*Qt0M7?*Gr4$JnlMQ*shj2%z#tv0#R;W1__bxMIoGw2#L1_E7_HeH<>iDH9*?ZL0*}!05{rSKo$yvXpestn}wFZtb)uq`AFTD zBO?XEG_XPg5Aj`Lt5Oa|a&0$~5__l&jPzw^g03&3YT{H1knyq_XH>YJ|`>=<*x zbfzLTKV{Ra^1sj`dnQTuo0-J9$p~HgkZsWN$0|KKn`A}-Hrr+Docvxo#tJ~8r7+b1 z8W}5HOQBs#o32lh{o2VDEC{TEk!V?MYVx1bY?hhU;D%H&u&~ul@rS@9s=@+528%X) z?H`D*RTBgM>*hNfqI@vig-+H~F8n)B|I3t|V8KL_QCHPVZ;9bay;TsvGeV{3fAp84 zRo{E&c>!6^F~55FrAgm|N~}1!1?39hgK;kaS6Pm5;tuTd9^h8{3oy0cJYZ-Zv;)LN znMyUNm0DrfC8K<<>NsAP*v6ld$xq9(HneuG=L);T44lILW=0EWC9p+=GkKD^Cr=O0YimIr3&?OoL(B#bIz|Gc_|Jofc+)=L8Lu#EO9U!B)-ayIs;(%a3jt#dV4BS7HtNv&077kc-pKM@Ezg=&F zh-2`Z2MLR<&0j8ilH!XRvN+rP#c#a+jBO&kX-=R$+VT3NYc`K*)Fu}0;c<%Jh2TxT m#&KGZ1zC^$U0R{j^Q}Cefea&_N0000WY znKEU{lqplDOqnue%9O1h^R2co{N+F0zKuP!8((|+2WN&9z&9qC0CFE|dszdp{Vs>c zSQ}>TG;1dr=)($N?*a=T53#m?5pOdJpjkW0z#dfqdk5TuI=Jmi__hM*Aq8-K!F_&_ zUR%xp@FO>pM}PZP1Go*5CTdyJM@^mG?0JM5TiQzhn@guyOH*okf->`?}5BY2c4P!`VP$NWD(!>6ileI(e@t?lyJxQ17PA?zH7!_}YG- zoy6vgMT*B_yx}>3zU5;(o!%E9KkwB(3f#y5@3?&}z`d^oRwzt;TmOhc?9mL?G-Wes z3I>DZ4}S#6&j1cKG_V$=XmbmH&1mUVic-l0<+<3Jr%+g<@JM?HHMX`DXWOz#@lcm=YcL6SduEwCorJn5bJ^%Ub zYxXOEm)81Cbi}B1j>T2e7xeq2&)qD-QmJOq0r*geH=jgMCE_zQJ2OM`^Yf}=e0Y$llmxY_g9l0(XaYXf)CNwpT3kP?6ZxN-(>M_k4u(k7W9c27-w zz#E<$E!tsDoec5(fTHNyz=e05aQc6CdZP3kz-7`Yclu%;DJVD)kds;7P`1olN|;EW z9ITzu^gab}^>%_>W{Kt!vy_W36fQ(A>wjjQ-96ON)lKbP(n1EOZ43f5D~0{o z0Ym{@g&i^h)7nDKpWI2!pZbKk3dQ1S{Nh_CkkRn~8QzR|yA+1^%B7NS0IL{WrGNLD za^9AE2FVu=QDogswB}FtNI}j{Pns1j1ATIQjDuqpOqCicSToa8{JnBB)8-J7&3dly zf;Wh;GED`BH}*4XUaKkDwqEk@yos{cuF%Z?|JnpH=o%nI*L{fm26_cJXo#!fa3h7n zpy;5Dg00?(b5I!r$asHayjK9%Zh!l&!YZoMa-_M7<)&I{()Zx!$ln;D>0kVh>12R_ z7G^0;Q|~$x&;Uw+ZB2LlKEIwy<)yTq8oOdkr!2?C6u_0)0jsbIv}hHk#;93PgQ~-8 z*U|WYy+TDjCpM-~Xefq+JG=R#o42|ds6R6?W)o``JFNgNPtW_Tu{W}Hi+=`mQwRBc zb_vn8{iD>h;a0l#(tl8DCa>jARCi%%+m z%iCU4%ED5jV0V|)dril+chJpW_#2uz^J|*?*-vP0dfG0Q^cZT4qX5|_NtbYJzD&`C ze{MKTg%m$-_{B5hqY7Ym?|5c&i=~BW+RKs?H~UHwcNRxe2hv9iCGq- zGmE-Dut`Ht7Zs+>S}LP?@TM(mqestQOJYPRwr1@f zF2>-^h|y?Bv1BxE1GS@r$M?`314Lb|lzH=Q%3gGIR_KRg3Sj5LhAGHKwr$qM)zVD0 z0&KL7ou67reI%mH$O1^iIF;wp6rXyZt9cjOs$y`3;tGWgks5^~t&S(HZ(f*yznrMP zYzXgMLffVQb{1ErseiWcCQV!kZ~^4H=t9AwCFG|KtzilW%oF+}@hk^=GLtvGUJLjp zF_zaVRt1MSWZn7|z!k(^Oe(;G1wC)-XrxcyT-nkafR1LhiFBS`zR2>~!hB5^C{|P! zO0M1Sc^VP2d~@{|Y5Dpz5V z`!agIn}LgEv6%vHIq8wEv8q^PF*@J7v7Kgf1)5+KK9Mfao6{NocUd5FTE3j0Fwa(D zU6%s53UP&8Q;4gzZLQQCES5SllbT{6cP;t@TS5WeHn8yik?shO+gDhO)s_0S9s}bYTVDRQ2y&JayU6{-2 z9z5ZBiuOzl*6G=ln&8>@-_mMQ=f%PTi1QW?Rx!BB z+!y6Z%=ZSF!0HSYUBpeAH=jQMiOVTG*bt#mD5|}-NPmz&)*GeQt|WATHE*7~eAQ81 zD-W)Kot`bXf5P$D% zt1(|?V1vHV7HcB+78GsGfs1wpJ)|hw!Fw_1E7UXS`9n>Mqds`?JfrSlFiZsoP$8e; z;3LgyV1G0oY-lQ*a)~%B1Xj*M(FG62UoQc?%bFf(#f>JG8Zj?k0-h-_YAximHV@Bb z6Ev4gmIYc=y#z%UEfihI+fu4w1@M9m%ILWvjQD%~iw8!aA89xRE!XBEH>hWP6>yOd;JnoHks0?U&C2fMpfF0H5RIdIPH_knq)wsu6!N3zf@gY?2!>11#AF;v{*@>JBhA(`IqZ6o*s4`acdd zgbhGGHRi92;6i#Nz(we=PB7%sw#5W5D}W`IO{Gj;jE+pa_6zNQ={Su|j?qh({C~?D zk5Ree3OcPV7RbEuw(0*UPfALZLkeJtWm2h^t?>*UI{VY163CMi@6(U3%+sq^mj~!~ z5?b|2q(_-I-?9!$o0jm(P2XP3gHO)JVlnHYH371q>(~b)G&&VyAp1Db@UZLUy~EQ! zO3hB_;J$5JL77P=t*0F)51J=#0Ds4g(jV@PWDEKHec>kaUKxmex%VznLtiiXBN3)t zQ_Q1hDOvQ>rEDYjH2kzkTLb$tON2LK{!}tS>BJQOJO0C;m;eUbr0oFzE&CoZ1+X*7 zuix1d-d8LX`oh}2%OxwO(v&&>2Jd75O@1Hix15(@KWwtbO#zF@$5SA*=5B-w zut$;sY|VWo`R`HksCn*plYjIr@lOQ;f%cY;4!(1ZlVNc@?j07lmzIP@pn>0w2+;Xs zPy@UmXx|^eNW1MO$0> zk5@TutW`FzuCHAf4x46KY(cEJ65*1-&o-35|cCYu{4fW%cGNAd6?F?l6 zq)jLks@k)i4BncUnGqYC$*6fZ19(^gT!rcTV_}buLH(s6(k9T47=Pi@05p!}5*onb zhpZya&DR@T(!m{ax$c;L?REdvaGytj6+iIkw6_#G>?^FZj(^EwG^6ULmw{>U4&FE5DX3*Jy+k)YorXgu>BG zkjqcySZtJe!hZ(C`Gfl4sK`)(0V%V0x#)e7Etr~+_Jv|bOouD1v8uL4|H zzYeOfLsg|pOpJB*^>MGP0bJ4nJ)sY(!79&vcr{Y=Uh50%HxAI_N1vrb|Mp$}+@X_& z_uD#o%UyTVzx?|v^w>9_qRusaQrdMgocqwhuhPJl>VLPHj6|FHXCD3j&*=WYlw#Rm zj}ET)WP|NXKXl;n60qwx+)9@(UT`|sh5`V6^y~k~pAT%=swwL6$}R-pigWQk&z!3+ z1JVY@R{gpMJd>H!&4cyS!e+*K)(hvPxA;8F&OI!nymT^Q`rBo2*z6_)TUS#(LV+Un83@n+$!1@a{(UWoXm``4{Sb5 z&wsIw#qokN2R3gjDP~#PB4Q-~ym0=kEiS)sw}Z(^s{0%EN&n($;?&u?_^ zRsd^u+8Tp@^xfkn6$?OjeCFPg=YmF^lz%V4!SQ&+xd3H~saKJY;(yljWd<)6^lr3s z65#Op_zXT^SQFQ-0A8?@WGOGAqlAblFN`kGlVAQ~se|2$4do2+6S=P_N{HAk6t?mD z@R^;xef)I{s27er$p(<;r-GMXWIg?ZGw78eH@e=k<8D_qj1G1J7ob&YJMOuUvwr~w z1e#Mk#Wew35u*{WMT)gp{jpMGFnAM%4%;LHVw&ja2w!{ETv1*uz!jcdN#zOR>A^?8 zRH|B~Sd12+fl-Vx8Qv;979tPV#Rtdct@Px9FIM`!G2PkD2KkW{UFgugI3`PzjH;PW zIz0VsS+B(Z#W4V8YHX}xx<`yg9DhYKR?Pse0M$svr(b!A({(i^P>Ve!o6}xV0P8hq z8(qmL51_+4k;=%55f}vczvz4@Vx#J=M#2gwhK2>Pw#_x|g4erwvh12gEPuAlX|J3Z ztj_}3iygZ6@YIKSo>0O_VSe-aYxI%3K56n!0fOkj8a+uG8pPm%kb;*Ez5G&H9e}}c zn?b!BRXDs|qPPcXnQj(eZjp6B=Dh+?D~KW=wdSP8`Z1_^5izk88o(IF>%eCKc(en5 z_GuHCoojk|iiJvAxwOoU?tfPlz&b6pJ9#hcm;e1LFLadixP=*@#T6SwXu$gnz4D(W zu!h*6LGc8igTaI29y<7VMe1BI4}_Y_z#Cq106TTC=u~uu!~Cz!<3xEA-n*FTMKQR* z5XR|3yuT1_cz>r!e_S(a+`nfOjPnIG%b3VuF;L$j^jG_$BT`FBimvfEuasnKar5sSdh-cPOZ;f3V zO@6iXH>g?Wz2ZD=rs=pN%?kyNYY;T-WB}{$|6FL`>OF^-HS(SP?xxw`moLb$H?U;0c7zLw{Ys`R=atbm2HkK^8A$# zux^i30n!utpb!HjCX0t|gQG@8KP1^*04ZOkHRaJth2@F^SO;u3mA^Ubh^z{vcYGy- za~S~S2tl1zX&cU{8o6myW{oyg%9fKh)}Fzk>63H z=R0VD1D2RPTFK|?=N~j&x9NPcY#^gdnKEU{lqplDOqnue%9JTnrmRN$g8%~n>8Le0 Tz3}+=00000NkvXXu0mjflLELz delta 5347 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 Bl1Tsn diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_button_icon_recipe_off.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_button_icon_recipe_off.png index a639bc5dc6bd8db521a2ad9124e6354e8ce883b9..8ec15c1a0d82c5eefdbbd81e101677d9de6bef7b 100644 GIT binary patch delta 5119 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 delta 4880 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 CwVE6N diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab index 4373bda7..078460e9 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab @@ -112,10 +112,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 + m_MinSize: 25 m_MaxSize: 28 m_Alignment: 3 m_AlignByGeometry: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab index 8f04b461..092f85e5 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab @@ -66,11 +66,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 30 + m_MinSize: 25 + m_MaxSize: 28 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -116,7 +116,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 8.8, y: -110} + m_AnchoredPosition: {x: 8.799988, y: -110} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &4307709386842909017 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab index 352ab1ea..52a9fc2d 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab @@ -140,11 +140,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 20 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 25 + m_MinSize: 25 + m_MaxSize: 28 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index d77aa4af..cc28bf3f 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -158,7 +158,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 4, y: 33} - m_SizeDelta: {x: 158, y: 48} + m_SizeDelta: {x: 180, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &138926719 MonoBehaviour: @@ -180,7 +180,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 425f40ed32ef5974bb5fa6b1c836dc80, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -343,7 +343,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 5, y: -30} - m_SizeDelta: {x: 180, y: 34} + m_SizeDelta: {x: 200, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &326258103 MonoBehaviour: @@ -366,11 +366,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 20 + m_FontSize: 26 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 24 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 26 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -570,8 +570,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.18002, y: -26} - m_SizeDelta: {x: 95, y: 50} + m_AnchoredPosition: {x: 98, y: -25.4} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &498799267 MonoBehaviour: @@ -594,18 +594,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 25 - m_Alignment: 4 + m_MinSize: 25 + m_MaxSize: 30 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 10000 + m_Text: 100 --- !u!222 &498799268 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1449,7 +1449,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 6, y: 17} + m_AnchoredPosition: {x: 6, y: 21} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &956402762 @@ -1473,11 +1473,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 20 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 2 - m_MaxSize: 23 + m_MinSize: 22 + m_MaxSize: 27 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1666,11 +1666,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 14 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 22 + m_MinSize: 20 + m_MaxSize: 25 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1982,6 +1982,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2086551031} m_Modifications: + - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 28 + objectReference: {fileID: 0} - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_Name @@ -2368,11 +2383,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 20 + m_FontSize: 26 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 24 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 26 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -2721,7 +2736,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 77, y: -207} + m_AnchoredPosition: {x: 77, y: -204} m_SizeDelta: {x: 370, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2045825934 @@ -2745,18 +2760,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 20 + m_FontSize: 23 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 18 - m_MaxSize: 20 - m_Alignment: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 25 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6642\u9593\u304C\u304B\u304C\u308B\u304C\u7126\u3052\u306B\u304F\u304F\u4F7F\u3044\u3084\u3059\u3044\r\n\u521D\u5FC3\u8005\u5411\u3051\u306E\u30D5\u30E9\u30A4\u30D1\u30F3" + m_Text: "\u6642\u9593\u304C\u5C11\u3057\u304B\u304B\u308B\u304C\n\u7126\u3052\u306B\u304F\u304F\u4F7F\u3044\u3084\u3059\u3044\n\r\u521D\u5FC3\u8005\u5411\u3051\u306E\u30D5\u30E9\u30A4\u30D1\u30F3" --- !u!222 &2045825935 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3442,18 +3457,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 30 + m_MinSize: 25 + m_MaxSize: 28 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 9999/25 + m_Text: 999/250 --- !u!1 &5352886968946593876 GameObject: m_ObjectHideFlags: 0 @@ -3578,6 +3593,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2086551031} m_Modifications: + - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 28 + objectReference: {fileID: 0} - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 4cdc40bf..ad43fe27 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -334,11 +334,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 2 - m_MaxSize: 30 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -985,7 +985,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -21, y: 60} + m_AnchoredPosition: {x: -21, y: 59.4} m_SizeDelta: {x: 380, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424255746890 @@ -1017,11 +1017,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 23 - m_MaxSize: 25 + m_MinSize: 30 + m_MaxSize: 35 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 0 @@ -1170,11 +1170,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 2 - m_MaxSize: 30 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity index be17db0b..6f47c3f4 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity @@ -781,7 +781,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 208.2, y: -1.9} + m_AnchoredPosition: {x: 208.2, y: -2.8} m_SizeDelta: {x: 145, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &174704449 @@ -805,18 +805,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 32 + m_MaxSize: 35 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 3000 + m_Text: 30000 --- !u!222 &174704450 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1011,7 +1011,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 4, y: 26} - m_SizeDelta: {x: 158, y: 48} + m_SizeDelta: {x: 200, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &581137343 MonoBehaviour: @@ -1033,7 +1033,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 425f40ed32ef5974bb5fa6b1c836dc80, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1658,8 +1658,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.18002, y: -26} - m_SizeDelta: {x: 95, y: 50} + m_AnchoredPosition: {x: 109.1, y: -26} + m_SizeDelta: {x: 130, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1352733511 MonoBehaviour: @@ -1682,12 +1682,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 25 - m_Alignment: 4 + m_MinSize: 25 + m_MaxSize: 30 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1760,18 +1760,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 14 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 22 + m_MinSize: 20 + m_MaxSize: 25 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6240\u6301\u6570 :1000" + m_Text: "\u6240\u6301\u6570 :100" --- !u!222 &1361083690 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2117,7 +2117,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -17} + m_AnchoredPosition: {x: 0, y: -23.1} m_SizeDelta: {x: 512, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1640187116 @@ -2215,7 +2215,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2345,7 +2345,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -7, y: -201} + m_AnchoredPosition: {x: -7, y: -207.9} m_SizeDelta: {x: 550, y: 230} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1965424766 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index cfbfbe45..ecadf5e2 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -520,11 +520,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 - m_MaxSize: 40 + m_MaxSize: 300 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -598,7 +598,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 24 + m_FontSize: 27 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index cc98e7d1..b3aa1fe5 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -378,7 +378,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -9.000015} m_SizeDelta: {x: 218, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &225351270 @@ -777,7 +777,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -9} m_SizeDelta: {x: 218, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &432591955 @@ -1961,7 +1961,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -9.000015} m_SizeDelta: {x: 218, y: 114} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1085629574 From d307003f4b86e1a85803e28a700d2cd3b5df4090 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 6 Aug 2021 17:32:10 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=82=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/recipe/Prefabs/Frame.prefab | 38 +++++++++---------- .../MyGame/Scenes/recipe/RecipeChoice.unity | 6 +-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index b5596970..563abf5c 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -338,10 +338,10 @@ RectTransform: m_Father: {fileID: 2646634445844468798} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 83.5, y: -32} - m_SizeDelta: {x: -227, y: 50} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 83.5, y: 68} + m_SizeDelta: {x: 250, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932626752093610 CanvasRenderer: @@ -372,11 +372,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 23 m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 40 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 23 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -494,8 +494,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.18002, y: -26} - m_SizeDelta: {x: 95, y: 50} + m_AnchoredPosition: {x: 85.6, y: -26} + m_SizeDelta: {x: 95, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932627123125672 CanvasRenderer: @@ -529,15 +529,15 @@ MonoBehaviour: m_FontSize: 25 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 0 + m_MinSize: 22 m_MaxSize: 25 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 10000 + m_Text: 100 --- !u!1 &2929932627350163027 GameObject: m_ObjectHideFlags: 0 @@ -1481,12 +1481,6 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} ---- !u!224 &6296255899524172857 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 8101979052737494168} - m_PrefabAsset: {fileID: 0} --- !u!114 &6296255899301773980 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1499,3 +1493,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6296255899524172857 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 8101979052737494168} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index cc28bf3f..ce423e1f 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -570,8 +570,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 98, y: -25.4} - m_SizeDelta: {x: 120, y: 50} + m_AnchoredPosition: {x: 98.9, y: -25.4} + m_SizeDelta: {x: 115, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &498799267 MonoBehaviour: @@ -597,7 +597,7 @@ MonoBehaviour: m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 + m_MinSize: 28 m_MaxSize: 30 m_Alignment: 5 m_AlignByGeometry: 0 From cfa0c67e3634e39ad7a7b350d3aabe812c6e481f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E8=B0=B7=E5=9C=AD=E5=90=BE?= Date: Fri, 6 Aug 2021 18:14:49 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E7=84=A6?= =?UTF-8?q?=E3=81=92=E6=99=82=E9=96=93=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cooking/Scripts/CornPopParameters.cs | 400 +++++++++--------- 1 file changed, 200 insertions(+), 200 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs index 82813c26..0c21e77a 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs @@ -1,208 +1,208 @@ public class CornPopParameters { public static readonly float[] CornPopTimeArray = { -1f, -2.495f, -3.99f, -4.841f, -5.691f, -6.456f, -7.222f, -7.911f, -8.6f, -9.22f, -9.84f, -10.398f, -10.956f, -11.458f, -11.96f, -12.412f, -12.864f, -13.271f, -13.678f, -14.044f, -14.41f, -14.739f, -15.069f, -15.366f, -15.662f, -15.929f, -16.196f, -16.436f, -16.676f, -16.892f, -17.109f, -17.303f, -17.498f, -17.673f, -17.848f, -18.006f, -18.163f, -18.305f, -18.447f, -18.575f, -18.702f, -18.817f, -18.932f, -19.035f, -19.139f, -19.232f, -19.325f, -19.409f, -19.492f, -19.568f, -19.643f, -19.711f, -19.779f, -19.84f, -19.901f, -19.956f, -20.011f, -20.06f, -20.11f, -20.154f, -20.199f, -20.239f, -20.279f, -20.315f, -20.351f, -20.383f, -20.416f, -20.445f, -20.474f, -20.501f, -20.527f, -20.551f, -20.574f, -20.596f, -20.617f, -20.636f, -20.655f, -20.672f, -20.69f, -20.705f, -20.721f, -20.735f, -20.749f, -20.761f, -20.774f, -20.785f, -20.796f, -20.807f, -20.817f, -20.826f, -20.835f, -20.843f, -20.852f, -20.859f, -20.866f, -20.873f, -20.88f, -20.886f, -20.892f, -20.897f, + 1f, + 2.495f, + 3.99f, + 4.841f, + 5.691f, + 6.456f, + 7.222f, + 7.911f, + 8.6f, + 9.22f, + 9.84f, + 10.398f, + 10.956f, + 11.458f, + 11.96f, + 12.412f, + 12.864f, + 13.271f, + 13.678f, + 14.044f, + 14.41f, + 14.739f, + 15.069f, + 15.366f, + 15.662f, + 15.929f, + 16.196f, + 16.436f, + 16.676f, + 16.892f, + 17.109f, + 17.303f, + 17.498f, + 17.673f, + 17.848f, + 18.006f, + 18.163f, + 18.305f, + 18.447f, + 18.575f, + 18.702f, + 18.817f, + 18.932f, + 19.035f, + 19.139f, + 19.232f, + 19.325f, + 19.409f, + 19.492f, + 19.568f, + 19.643f, + 19.711f, + 19.779f, + 19.84f, + 19.901f, + 19.956f, + 20.011f, + 20.06f, + 20.11f, + 20.154f, + 20.199f, + 20.239f, + 20.279f, + 20.315f, + 20.351f, + 20.383f, + 20.416f, + 20.445f, + 20.474f, + 20.501f, + 20.527f, + 20.551f, + 20.574f, + 20.596f, + 20.617f, + 20.636f, + 20.655f, + 20.672f, + 20.69f, + 20.705f, + 20.721f, + 20.735f, + 20.749f, + 20.761f, + 20.774f, + 20.785f, + 20.796f, + 20.807f, + 20.817f, + 20.826f, + 20.835f, + 20.843f, + 20.852f, + 20.859f, + 20.866f, + 20.873f, + 20.88f, + 20.886f, + 20.892f, + 20.897f, }; public static readonly float[] CornBurntTimeArray = { -10f, -9f, -8f, -6.95f, -5.9f, -5.1f, -4.3f, -3.75f, -3.2f, -2.9f, -2.6f, -2.55f, -2.5f, -2.45f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, -2.4f, + 6f, + 5.5f, + 5f, + 4.5f, + 4f, + 3.5f, + 3f, + 6f, + 5.89f, + 5.78f, + 5.67f, + 5.56f, + 5.45f, + 5.34f, + 5.23f, + 5.12f, + 5.01f, + 4.9f, + 4.79f, + 4.68f, + 4.57f, + 4.46f, + 4.35f, + 4.24f, + 4.13f, + 4.02f, + 3.91f, + 3.8f, + 3.69f, + 3.58f, + 3.47f, + 3.36f, + 3.25f, + 3.14f, + 3.03f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, + 3f, }; } \ No newline at end of file