From 08dd40a1d1f8f9946b34617fb26cb69e74b439fd Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 24 Nov 2021 15:39:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=AD=E3=83=83=E3=83=81=E3=83=B3?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=AD=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Material/cooking/Stove_usually_off.png | Bin 7477 -> 6683 bytes .../Material/cooking/Stove_usually_on.png | Bin 7348 -> 6626 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_off.png b/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_off.png index 32432d14a8413bb67be73b6b8ea138c7ce244e92..af7351d9f53d48db31cdb0fabe0dd210e52e08c2 100644 GIT binary patch delta 6670 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 diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_on.png b/popcorn/Assets/MyGame/Resource/Material/cooking/Stove_usually_on.png index 32f8c139c548d0ab1f98c85cd7f5a80ab212f03c..536f92abfad5c0c6a25ed24f75ec0998ef535eea 100644 GIT binary patch delta 6612 zcmV;_87t75B(2i|lF$InPnGl+IQk1D2j~w4T2Mv{qxBE9Y^O0`ArKuah3&Wy9l4bw z*9t{j5~&BpH@PHtxA(gOR%&_U{neu_0nPA4`Sf!V3v*5V|c=ZXmmwzq51-BB=?cTMMZQHiB?CGnY zf5GnGFVCD9bCb*f`&DiuR&;ze0bZj5jspvN&H1}RcOPS!Cid{d{etP72G+ZB<*Iu? z?|#XQg&EiHiya$-XhHz+WFs=5(Exz!vH*8NTeG!tAn^x&rfz*MbXplmI=8Um`YmkB z=1r`xuYXtiFcSUGaXjg)+bmL&jXlXM;{;@vH;jHfk?Umf`)gPMxs}M4MD=j z?E-YHDQkjY`i}dx8+Vv4cK1%9>7-P2eU#;LOHyD9#w)Cp|31S%C);W=EdN=uZfBIy9kHH_qA6^|>tasoUb$<#t+=xL>z*+1D_JZ4VefiuxGj5N# zwH?@r8|7y2+`Y%HU84g~fZ3S3BV|$YJ zHyKU>I;G~bY-W1a_4JJ!x0Ij@YGA)Y&t9GD#iYB$$KhuQV{ZXoh*r2s0m zwtu!ZmdTjU<>#i^!pN2K7i8PbXx6d~8@gCKe@`x#V-sB0<@0&(K@GroQU;tHcLzRh z?RU5y3loew0UQE|H>@oNjaG&N%z**Y7HU7idsrz~fPE zv1^;Z55npQK5J&8;aqR34nPOja)AV$SbtgAW`d;zbO7Afc5G++9v={SIGI+fnmNEP zz_^qPaCgk_R@~aFa=&7HED4eTFC@?nSbA=NWV!A>!6u~!c6)5#QMO}8Peh{{Zn6Mt z#NvCllM66-Vz8dTmx?*)E-+%b3t$s0=U@V`TmRlYg7F&4z9 zBUd@-a04WI3CUjP(pICHh<>f5Ji<;`L0GIU6T={aUWLG{-@MZ-Pm+KRD-C{ZZhpQ# z(T7}P&(~S%_H}CYfBDlZ?5i6$S>2oM0n|aqg*YagGcf=i z^xUA*t*AAPmd$gw`W0t6XDL%d=spA-%uG5H_A(!5BqvYC#r38l2Hhbg=-^H^ZTAG7 zYDEF-s#iX{Dp;-&L01O8Y`f|uM=kd2io^A0A_U!0PtZA%!YVeq{OSLS{C{00omq9M z&MM)W*^*oE7yYak2eiWGuc-nKW=R>W0DU)V;H6^;I^3uYJ&d)i)Ba2_-t6q02{`_c zmMl5U$S=FyQ>Iy^nY7Hv&5FvGGHdJbVx-E=Nb%sSl^OHXsxqtIC;NMPKfF5j=9+S~ zTA;(aW_v6=LS3d>Y|W=~yMIyV`cgFp-61c~iGlOGn4Vbq#6=CFV;PYE-|2=2p0xxv z=#?HQY~Gn5Ck*gm@_Osz6H%@2rfLMbE(>%@|4CH}Cl)Z+*tA{eWrG$eG#2nmRwUG4 zjtg%M_mG%hz1OK#e0rhQ;Hw4W4SIr(G2H=5%&*JU^CEUxRaZj*&wmOgJljTya&^fX zY+@nmJ#X{Y;Pn8!5?!Y^D-)|~l&hITJXEV-qneEO2Gi(SBJy=fKv8}0=}Vc@R!LR; z0ne(2*q^XnjDQCzqsMw6i_>)nypkR!dM+SgyEwAmp=#IhRfF;LXG_PX1P!%jJ^hJ3 zSU144W{F<&Lp}gWB!3$L_||Dp_TFk1kcQ28+H9vN*-ot55w5-+uU4QD8t|+z+?6Qq z+|Wr!vx(K-;A$mnxY^bgD$p2=HSnl_V%MJC+Fw4g8nK>a(zmo^DU#S<4b}?Uj%U(Gn@_*N*#;@tUJ~8Qi7`=8~5C)<3LS?;*fM?Zk?U%6~F8;OzcrtxaX3L8# zb?g6v9asVY!Ua#Rm_U!g$9iwu9ZiC1Jd@!WE)pI=1H( z@)cc_*-djS0hiL%W~BiJZ0|SwDb_n47vLR|rBCdOmVdh1Of!8kV5$m1w+cR-w6idi zAdDRBv~;7q?WKqax67)rj1G8~n{_3GAWm)b6Ih6Ls~+wZNlpNJ-_zfrqObDL1dzSE zsITql)?tf_<~{4@tVbl34@Mo;N@*7tTuR&83?(^lVl~X?42l^D?O196_Qmt>vyU%+ zL~B0&xqlk_OcPrj)752@%nXNR)7~Teo+! zV<&#Xo_OXd*50vMJkpj<#NT@U#RKg7KYBr__Y&44bY63obhYOFe28+ly^#Qqs?~aQ z-?xKZg+hz{fP<=Y;}(`}>0lYI5An!4RzARlaDTrf_<|ql+4wq7VY~WvX>0phF`g9h zdo4HXI}jj%2S9=G(wXv^S&*>f(+8d*3ldm9VLV+Mzd2T>sWJW%I}#P}4$53&*k)6G zq2ye!JO@!u0#wBynWrWure)40PN%N6Y@kwi8x(l%G)mv@&<7#gYBJpd*J*Pz_rzls z!GA)rAboxJ_N3=Z<-x_Gbn;7Ve@%f$?Kt22NPkraWMw5M9*Nb~AYTYi@?5PMZ$K_Y zcSk-*Q}>f~+Dc6ZvTix>25JqwgR)uS0>OljJRT8Uef<7MK0r4m%Q=~8gQQ|b+gc<^ z2Pfuv3^ai{>W{2t$#=^B}~j)=3wt;D7f)-)a`sR-PqB0HG>VvQH&M7fZix5)tgy-lUgu zh!L%AJNN9;l3vvcE_yX7SpB8Bs4ZsH*K8iL!lT{U33W{!0tn>k(9Sk-t@@Kc;!?3_ z&N9P(S)DWoK*e3A?KYj8w~HtUO;#lWO#JApbs_;C>hFp{v|F+Q5st-R6Ms}R$A)4r zM6v^nt>v+g?!4M$$A2_#7N84h3u#>fPYgh^38(hsJ~tJM>xlG(Zeu=Sy_yA>hhFW4QypuYpnfl z+WPq~E=|?~c)m;re5wutiGPL2b`_2@dgn=OB$gVlTW9uQCMMvE1>3=Vu0+)gc&@7- zS5ybgG5rYsvVLRFgEnhR>4Lg59wVO48=MH#^h9TE_Ni)UjfDXN*b=hu@?{)X< zwF2IVd^Sk^zqF#E!2je@%H1OmdA+2Ob`^kke@r_0b7^<b>huz$OSMiSNX2xdg) zZmG>UvXn}?m}hetqHEN|jl|`K?P4W$ck}5saUc9dv_#vvp;`tPLz@1d>}NuP4pmrlcQ@m#bB5F`cX>@ILVqV927RY$3;HIq+6e?&27OI9?zz zA0{;O4e3+UP3u{6VSiZ~2vWfy;n60!2ON%+@eo{4?p8L7viTe{SdmRN$q!l)tQSsc z_L{WR-LItU;PaU_uCJTK#P<_e5FTx)qHFZ~29EL}9~W2FCA8F9IQUkKjNIkooC|Dq zO!S_A7mIH9lJ!`)Sa=yscuaiveR_xno_yc(Cp85gg?3f1lz)Cn!^W1p$!Hi1S(F>r z(F1D=bdV{;dhBF#Cx@INCcI3GQ%yA$`fex+;Em`q9yObq3rnk!l^7IReviA`B-ro) zIwBVeT?g+1Ys=4T5yJ!E{hrcykpS;KnE<6ay;BEvwB;AXPt3%L<_*3FG%@cnLIjHk zEK^*OMzfE|yMKNPyDDeAa~12*uv{(dH;NV$vc}x49C(Jc`vNm^nhG`&@C5=LBuwd; zwyn%dqgiTw7H*bUm3lK0;8}^}5zW~_&MKo=WbGw`ftfkew2mI&B;Y6?6C9gLfDWlD zNEq87Yg+Se5bb;BJ3-uRWQ+$prgwzaR!NrQ?9o{2!AY%$tI3eC6enh(81O(%eONsj)G^O5^a4eO{0VbJgLZ3^)7z?g#%L7>sXm} z{eC91jtn@&`?#wSt~YMG)g(=ajHSvt)(btyCmRJ|c!+z=8(pBoDg{zkGVenzkwG#M z{iKI1eIG6GEO+Z#ueO6K{*D9xECb2sS5A(Q1kC-oc* zt3R>{3hmsnJS)|9I0=cek1zgKTh~X$c(7MwGe#BRg5qV`V*T=TS)j4{d8w>$A+n-^ zRo6Q?W*#TsDB2H|Iy{OOEJrXpCL;hhOO%jv;(Rp>G(xh>yz_VD- zrGIo)IXzJP6Oup!gVaIj5#;#*J~HUA*iUFbq+OzPzmm05*-44yB;syWu(+bt1lC?v z;{g{d%iF=@s16)d+_zW49HOu``@ABXIhSdH%31FjX{{cjFIn}3xOvQ+;Y!zQr(L*v z3dDe6RK>_Z@73$i1{@;xsXNMG1VPum?0?49WiZ(U?&RJ>WxXc!X8!-rdlM>HE_caw(_zY4sKFcqgdpc%$0J5@V_S8#fR&TuX zSWzRN4}464F>{X@i*7+*+|a|HOg+$V{8~~-0`s6q^dm0P*AI4|=Q<8d5AdlBsgtZE ziUr_a{OiNy`*085d*=ehcE`d7UVoVTYER0v-fu5{q+~tH8*%1C0#-zdJRp%CHwC5)QU#4_8cB4GPNl|j&J2L;zYTWN(4lskgbE;>!GtVP zj6mYgkNi;i-rt;mzv_`}=!{pwdacZH7Dj$$h26Vzk3Br_P4d0p`1Uv0rGF1EiPx6R zief>`UKR7%90|8;CY%k{#ND*v=@JXfSXv;vp9^;hP&T({gN|CxGdRnNwPybJSYbu$ zNIy z-~EmBIbG(ngAXvno$O{&Y=7Y8mOR}iT%pG5NSJHLU^wWw`^{aVOkKwSy7fdbVV{Vk z3Mdrkz*U9qLS?)X)a8G$76A%O@2!8=Uunm3!%=kP31P&74 ztmt5~75@2X69J&lHnp>vOo#Y8_`3xoxU`1W-NZGoEM=k#IuO9W{KHu)+c3;Q_foYd zV%1KV?-ir8)T0n%YooA8hIn zxi)A^0cQRgn13LZ0Ik$eM6qdULR?o+&;e|(|MS1e53)7`!>YR2ssqn*xhR|Zsng|x z-jT3G8bzf+Z16$+%3MMdzY#5kT*WLxYA_BSu$JwX3zp~y-~lKsS>bsE1~VLVWD!G! zCaO%ho$Nx7mqe2#ZZC1R`+uMY%A@-7#yVX25;a4Qo%o68 zXF!j<_K*LnOhm(F>Lgj~&A@Wdb1LRV%H%0UnUig(4*%6#=c%WUQB~!2$9R^@9plW0 zHL*i3u*}Q}%2(}Tw^J>T{qY~MYgey{_fR(osRd}OO7nMdFtO0TGQ%U+S#miLE)~h) z0X{ZfhJOh5-T!!pdircNQzwxC&jR1DY%SMjGk_0U>{M<7&jEb7g&ey%DsM<50uK&8 zfDmr69swvy!#LPFxm#7`9^ozi;>ZuRnkfQwzkK~|>S^Tb4%hs9*6I&&@V%)5AK1)G z^TGNa+9L)VK?jivSl!%GPXH_hTvJiKtcH3ztbe`26I2K~1QCCN#DBvAuOz>RRgG;j zx2p?21RP*LtN~B(hw5emfGwiF&oG08nq=+#X*g^>)B&7bVe*)UYqd3o>w?Q`?)r5;=;tp=;`#TLk+0JLJ~NS=C98SEN{3*l zm%X7W?PJ|othc^!Kzkx;fUf2dY;1s60>0DCTw0TY4+E}R+jSa1haFO0HGmWwE*nh( zhzG)9Agag!taP#Rk|?{S1p1ly0UQiqQ@VLfMLjyi5|b9 zn&?BfXE)o)uR92{IVTYUDOH0c%Z4oX8oM_7M%*sQTHC##0v`;nNwp(Bh)Wh-O(&*A z!K(OO06^k;%;JVlk#EH5MmT6Dtbgl7;ig9L1fadb0r#`G$_pco7v&Z4RucIJWtj0> z>R!y1GO&(Y#oh>wU*YU=Tfv8R zlM@?+dmrhKlnF%|hif)PpJA1qvx0|_de*K+Jzu<~|4vvS^wnht8gN(NF4nz$o7tP0 z|GQec5a1dYZnUE0^;!OSHGeKkUTYe75&#}yl3i_nz}RiM<5EVnPa1dTcJ`l4ch^R>nR790IxE4jC|m8mQ5z?t!)C{wGOldc$K+p*Q!YZs9^U00t^7K&4c^# SMK8zz0000 delta 7340 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 Sh7-mB0000 Date: Wed, 24 Nov 2021 15:44:57 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=82=AD=E3=83=83=E3=83=81=E3=83=B3?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=ADon=E3=81=ABSE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 214 ++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index a6c23150..e280b07c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -2213,6 +2213,119 @@ Transform: type: 3} m_PrefabInstance: {fileID: 715927680} m_PrefabAsset: {fileID: 0} +--- !u!1 &774451456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 774451457} + m_Layer: 0 + m_Name: switch + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &774451457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774451456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.03, y: -3.33, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 779475524} + - {fileID: 1564034575} + m_Father: {fileID: 1448897407} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &779475523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 779475524} + - component: {fileID: 779475525} + m_Layer: 0 + m_Name: off + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &779475524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779475523} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 774451457} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &779475525 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779475523} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -5 + m_Sprite: {fileID: 21300000, guid: e7f5fafa8b1613e49b2ac5da18124fc0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.58, y: 1.38} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &785034261 GameObject: m_ObjectHideFlags: 0 @@ -3471,6 +3584,7 @@ Transform: - {fileID: 1129457738} - {fileID: 162168170} - {fileID: 1295632043} + - {fileID: 774451457} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3624,6 +3738,106 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1508807685} m_PrefabAsset: {fileID: 0} +--- !u!1 &1564034574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1564034575} + - component: {fileID: 1564034576} + - component: {fileID: 1564034577} + m_Layer: 0 + m_Name: on + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1564034575 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564034574} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 774451457} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1564034576 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564034574} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -5 + m_Sprite: {fileID: 21300000, guid: c6d68ba53c0d4384daa747a5aec22e00, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.58, y: 1.38} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1564034577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1564034574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3} + m_Name: + m_EditorClassIdentifier: + seInfoArray: + - delay: 0 + time: 0 + interval: 0 + filename: se_cooking_switch + maxCount: 0 --- !u!1 &1585657223 GameObject: m_ObjectHideFlags: 0 From a91208208d044856ec181207d73f73a090e7b26d Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 24 Nov 2021 16:28:02 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=A8=E8=89=B2=E5=90=88?= =?UTF-8?q?=E3=81=84=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_Main_Mission_MeterFrame_Groundwork.png | Bin 485 -> 497 bytes .../ui_Main_Mission_MeterFrame_fill.png | Bin 214 -> 215 bytes ..._Main_Mission_pop_detail_yellow_Dither.png | Bin 2758 -> 2755 bytes .../ui_button_icon_completion_logo.png | Bin 1668 -> 1697 bytes .../Prefabs/Mission/detail_Mission.prefab | 2 +- .../Mission/detail_Mission_daily.prefab | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png index bc414f4750a3aa04c5c98d06e7142737f87ffcf0..d6f4416e73e6a7c8ef61d8cb5f8a1cd76b6af3f0 100644 GIT binary patch delta 434 zcmV;j0Zsnp1MvfpNq>_`L_t(|+U(r1PJ=)gz;QqyfYl8b=Q26FH)(wXo}k(%Fpf@W zU%qa$yi-{Dc=Bo-_m)Bm4bP|Nho<%FbnzSpwZIF95pvV(qlF=MgL zHf?V9cOZvyNn~8eh_L-L1AZrCDfoG3aKXNm%ax1}%T5{WYkxt%Z3S*;b!ule{lBG* zxjWkr8*Y4Jo$jT?I>yyM2F~oh2fNos*7Wz1A|FiU@_>;_=d!e{+!>zYqE=d4Qe<`~ zJoc#;S>x>tpJ1ZiqzXR8L%qV-m#J=^N-{hKDGqp(9JDaNVAuc$9B=|0Z~`1~0vvF_ z32?v(aKH(0z<&WJzyT+~0Vlu#2b{FPa~K9IFTRjJ8^@nm=(kvBez~Nq;83r&1L6@6 z^$O$a9-nuQT@YGrWH~u@pHk+ysI|2{D1Uf<`*=M)IWjYxZG-)0wu0Z3zclSc&Oq-i zbLc_5>&55H``)%pd(LcYS&PFB6kcw;E{7X9=p5hC;VVhR+voU>2K@3LD(kzmPJ0~= csQD6L0Kb-6nz+CIDgXcg07*qoM6N<$f{U5b=l}o! delta 422 zcmV;X0a^a>1LXsdNq>h)L_t(|+U%UcZG%7%01uP`D1mffO324wI~^do089l@Dj*bK zg%09;{YeQ)2XP5>;OwDu0%sIM!t$DtRwn_k(Q36Pu^X6y?6PGn$HE2t@L^+99*#pk z4z5U!NJi6Np;(myyIgQl8~F^tVAIW<^|yhM>rrH;ec?21HuuGa6mZ1 z0pSP-gd-f`fPZj=1Husw2uC==K}&dzhS{i_AM$tE@`MY0Hsv8Wmy|s^)agt>yy8Qh z#&LVb=hH9+p~X?k$*td|+w5j;O#2@$IAh%6LBfI{G2M3iIkh!dKP;pkd qJqMb_f9QX&`zx#Qr8|$2jX|`F^-3K-cgAT3Anb8siCcI55}h6hCt9QiIrDmUHx3vIVCg!05SVP`~Uy| diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detail_yellow_Dither.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_pop_detail_yellow_Dither.png index 64f915bdfafffd8cab3918c2752875191dbbd79f..27043ba00dc92f8ff00a0cdda489ea33f74eb6fb 100644 GIT binary patch literal 2755 zcmY+Gc{rO{8^%u>LebHVt+hoLdet_DsV%k|s;OEAB`qarsI4d(yL7r!bc|hQZX$>kq}$HH__{w@B8P;Nlwl=&wW3?=e+NIdt0l0BC;X?fPLsQ z77hTwh|qXa7y(5ul8ztraVXpp6Yd!76OQ-1h6ATA2Yca^&_SNQI0u~P<*3jOoDl#b zIJCtnr^t`7lsV!dI_nq}V=@du=cNdy&#W(nEKFCxwdC^Gl&xuWyiTaMbwJvRN#y+S|ppv@m6|hu%AS3DHz>+pPW}T!*4lmAb$W9nu?V3`S z8^=Gr99w7Gv3h$UWV}ByX1~co>(WNZ^cm4l=6?ELWNp>Nkc^A>|{|W$(Oi8YO8sCH)}Hf!F_*duJ~^I3eGL`?M{0vS6#B+2l4g=eAcoN7-GmB?9;Eq&u^P zYo*bjF8Pk6nyQSnYpAe6Wk%-LwXaO(RH~cy8s<;vi?Jr$e5yeQXMUy!-hkQ1 zji6E)4t4~XeU$RuZ(l^TK$^1v2BprV#UluoFDmmCOR_DR4C*mnRpfO6d<2B6v9D6GXBLvcU$dsLzWGXm^k z?#4w8%^GMfgH%`bW0ve5F~VC4KEYHoLhv9s@ntWRj0&B%YWM%UkpSS(TKcqs^bvr* zrfvZq8$!oGN4{KL>h*NHrsVJVni@cB_&`Q)XKUCFph@WRCT)8b}nx%?!SY~{tH@4iORn^4jrO`8IeQQ{KG%3etH3 zf%z5E{R<3Xh8v^MkXiDg2MEV_O8##nW@}QPg!jm!p(k!4fKlu z2Qj{vT9qKcUl4Q%@w$mWi2!KCP!4rJ3I9Vlf}m=MHzDfK;3Hp=eg}XksEeEsLc7#j|5{;B(jBP8dDeFRm+P@M+R9TWQ=_4i4jS}shyicvR+H3m-F zbfDA$0`9c1Uc14S8iATY;KRltamteT5%{;jY9;Ytkywj}5rW46A115nAZs7Rn^79Iq<24he=W@0auAff>XW#b8Osy~VI=B`z9y>` zku7m?kGp=+Ku0T{BOL zb~rciV?cd?Y$ss1XFi#sF7xAx+DTbH2}1w<@y8Gja1 z?!{)c=Oy>7U7>W|xVaKKpBonAr-}Kw_BV#VOGxKb^`hG~lc^0Cw!Uk#Vn(@)<>K1`O6Z^zgO(T()W>)f zUeFSrFQ_pX5_L{CU~5af_@~Sfb$1y<#}qv|orMr1Myu1gwIc6^D+O)k6r6WZdi|Z$ vxeiFD{zRa8YV$XIbE+t8^7%JY=wbBj&}91|8H@__RtnITwiXrU*x&yP`JV1q literal 2758 zcmZ8ic|6qVAAiQ=oUydEt|qigw6tTBM2RgCa;8jWG+4?w zZfl^Qx42U!hWFb(1*sqz|FBDv80pe&Cz|W8sS}Fv55gIPoq>8(j#GBhf`9I1+Mvvf z>0?T_u|~RWWOJoAYLdY8@qysD@_~x>k86)b$MVZK)wkLw*C*$Hn38mgFC^P3hiO3xyK+VF4n;Mk5t;Mx`*Ww@|fJ5!_hMhYu^Pmq!Y^NEAgZlnWhC@@r#>mlS})B0(e?3fP= zKKxgNWibE!cqt$&Sm5W4tQaBSb{lkMdY9A)Wld`-gzeUq;6l#zwhM z>#k2nco7XQkB#N#R1(rrD3tBdb;lU$+bOD6Bco@yam~G|B+YfbUeGwmQLkDfvkn{T z7OgJaO+13Kja-?zm^0GYs=Mn92_=7LG30%0+e*vQzCr4RhVfKv?bsbRr&8BCe8!ql z;Qe|v7Z(1qHaEHr>Ot|(yynXp;ziF(=UsW>F_|Cc_N)ox#h->T1wP$2$kcR+dyqi@jI&)3KDbJ;HTgtgqNw zJfFBUkysW5O=*5@w_q(o+E~9-^>kGv+kmT$@$yax#ux1)+t5R;jCW2T>yWUZftgj0+aQka75q_SIf$l z>Kx1|FuNGhYqS0c9gvkGiqUmHUA=|`bLZT4ALcm`N9Eo-GqM6evs!oPP(S&r zYwJO4x#h(yREoa{lF~+)k49@VL>0h~pP(ICd)XViw!Ytr6aa_zvR4h{z6JJ|v`qo_ zFq8&L**-td@xWZtaR*sQoxC$J)nMqnv<~Q~+$diC4FFd?CYpIg-Gibhc*%I;3V)ak zJ4D}MzMni*zx-<<%+4$_TU^yL0w!j{r4cj|HE1W?;J9gKrTK}X*CP4%(1|@fIPk%5 zAUF709N3ra5C<1`Y(h$lpyo%`N5* z8WAHEQYK%(Op;+f`Y~YmZ;o;Qix-O6k#_N{JQ}%GRjhlQh|q^>y`pdP_Ba3}JImpwVvC1n z7B;m>(S+w`pbO8ADS_=`n3|d$Fh~Yv_tC*YDj$&`%qdhY@y#7rS-Vl29%%A|7*Q3o z@sl(W8vLdXsqMHG$U4|)g95T}sC|9^R=B6*j1ir=(F!S+ID{yHx``H2E2K@6TmRUs zzkh_@AqRo_hw%pa?kAU|DZ<|i&(%5@A?eOvdg8onVeIChd~}jDT{n{XiYdnKvo6_1 z3}}`HxbaCd8TQQ$Z)jG<5f3PB_(ton3g+953G<|-+O|iK+RdQp3dv3HH5;-Y2!}hh zZW_W(VqI|E8%~peHy6vo64cqw!Yr>nBC=z0e|Z!_9SswK1hA~E0PuF9hWC6Fa8zLc zqJ<&}boC)>428pxrn-TqUgi~;opXQxcM!(dvND-k2N%fK*@;kkD93*<0;E%D;K0?5 z(l%Vc-PD2ehB7=6`HwU}@*7Af9v6mm>AD)FeHiyHJz!Zd^K*(Q-#`TFMG*g5Zc76Q zgGgw4SV=&oq}z!83n0{!KLwSAr0Z@uhxPYm)FOs4*8&MYvU`NX8ky7F4PE~WFXYY8 z#zO3Qq}6R5wvtyc0C)*{dweT;ft(>!#?&b4*iQAY=O&U~Y8OswAiCYVB!=1?4%@|>d3hCihFS939paA;i`LSI&878)EA1bxdn;f z3eBp%i~btNA0WK_>cnI#dEIpaq)`i|)<)}+B5N;wa7o}_(|^9QlGoVodyOf5)Yc(wAIo<3egp<07Lmq`rEU0Ry8cuO;9T8%P# zQY%klN7*&pingcb##|KE@~zJtdZgxdd$BZ+_)hSBd^o4*tb9vV%T7hcm)xb|V%EX% zs#76Ul8$RfrhPZQa;`;?$qYX_(#4;jedI+ob4MR&>8L2a+PWTF^mI(FD^J)b@yg|3 zVyKalo;8X2nnY`u_U&L&B~$Cvc=nMi7mO3b`_60Lc2U{e@XKQ5l5(G-1f7&n#aWrn zSQUTh-InwW%O{UU44j-f7SU+5zxGTjxWf@MibM~a-^!fa`hCk_q}mQ zib2n$8>tgfSb5SZah2r19#(9&{%bG`PYqu9qHa|`=O>2@oik9z>=z1TF~VYNE7BJ@ z;X=##LuDQ#{wbl&Li`|eC|1C8e>W01PjD>7dRJ*V^Ud5+Z?7NdVq8oL>m&NKGsa6@ z=U#jDVd^Hxq~*Y8)*}(W>3xX4yM3f3$+sh|gqso7JTW!*IHKGypApwRV{deSaipPD oU$K2;^>eSV9042pW!4z_B^|Qh$Y8?vlmO_lIB8>AcpMk^2iy(hJOBUy diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_button_icon_completion_logo.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_button_icon_completion_logo.png index a0ce2b2951aef9ee0d4ccd9574053ab98a43786c..e587338a3bd75e2d9c0403c4779006f43979859d 100644 GIT binary patch delta 1643 zcmV-x29)`P4WSK?Nq<90L_t(|+U#0AY@0vA zNdSSJuMr@LKp21IDeL|1KYkM}ISj!Xr{p;61R^d75P$#~dw4<|Kl+XWBY}h*o|=DD zj{Ogfh@9LwScrQesnsjuV)YaA_6a8t#D>@>QonjxOn*K39G%Rhy2d>yIk0!1^_i{P z*MrQ#^9LUE>rvp%q zA3f7IkADTQHg9a$Y*@)(JKc-{*qb+g5SzblsEy;==e)Vu;IQHV(UWYnm29J$9U2L4 z4krYKvGC1qDt1v-vuD4Y(*;ER>LoG$=%kvjcBNuc+Y7>Lue{$`1J7BWZTNs_*nx1< zaqCul<56tB6T|~_=M4Db>v!XMTnQ{#tJ#1#R)3@kI&zrkreOk*Fg$idJ5}y9`y~et z6qLDXCO|G$KXx(cd}1Kll)n=^5zt*b(j3KiFbGOLTbS-KqojfjKl5~1`4X5AfH2wQ z@FO4cqA-$afcj=g!{*=vu+i+$2yK2i;6o;r;@o>9q*-K+KIcQB93a@t3;@F%98AC- z7k|9Y5-F$5CA#hbQ5_nw`4@^OQ^j%Ar@0((o>S!}ArG0`eT!+*Els zqvjFIHXyXEA*s?fk9e*lNS`E+(%USPiGQtCldU>&@j5K7DMAIF+Q<(2=5@iB56NEQj{pj!Lr?xzd=)NHtpbuo!UXo)^mAF7Od3lPa2CphZzT+qI z*f=4bL4vv;d^&6O6NoalSZ{NdE+8WK2$6&l4GsiAKuku6(v_dCFHj=$&GOWnXOG*4 zXLmU|-thH>*PeM~FJfxvgwN!THiIq|N7`v}K8%``xG<@+oC^c^_@%tpWX@pZhe{alN^ zzV=J#s&lE?^;%B@M1z_lU4Okl_=q+eE(MjvX#p^p6FOO(EjsLZJbu%6qR<7;J|S5# zrV6bMWnzvbE$GPh1mg8tj6?d}M2p7M`= z$gG)7vOZ?qEH%<|nZW<&e2JCOV^o9kk7iOPAUN5|Z_0QVVuIl8NMuDe4Mxj6B{(@x zfi%Y#WIr%DA^dN*TjYx{z9S$*`oLrt1M~Lilo|-Ou`)Gnvdoz-d&*^Beb9)br00O3 pll~1=lcGcA-}EE4f1KPCU;x@kBN^A1L&yLC002ovPDHLkV1mk97@YtB delta 1614 zcmV-U2C?~}4TKGlNq;6uL_t(|+U#0QY#T)s-X6jouO8=JP^z1x8H^)XWNySEwJuN6Q#vnw=G$}FB;)dl$0s4!) z`GVsz@YE^NWjZks0puG9vmy(YN|e|`ROJ`>^Aago(||n4o6o1{NO;z3PC#(nf6B_} z5YDBf9M+m41%D^m`U?px?jm#atZ^$K7=#6v&7SDpx%BGoT2cke7V(~z45@_PVYu*1 z7Z7?fk9qGE`o;PDjho)(>g^=T6+bThd)vK%C%eV_u8wxEZ-1uoef{r;!YGR? zcXYRpGVo>~$Qy=}#AS88E|eQNa+uCHz3X?^Q!yPjn1A2jB{qEYz~f#P8>Z*jdTCFl z)4R015(~P{BMLh7Ptu}S2w`kkmDSC^yz|$p-iIfj6N--{B-xe zPQhLB_OZM-c<3qP_jvB=gDtTZWMg|<7y)vM?!&z&dY{leCvO8pNC3j?{ZEVITxHqI z6EFuU9DfiJILGEy;Nq+X3uBE7*L>qO*}%H>?T5n4gty&W_x!cG_{=1y7{HB)Yn*`y zisS;5KuHlQYnvfO{q-H?;V}RT7K;Mn((>=Z>R8i-ga_FhAWOe#Iik`s5RwmkvdkZ> zqyWHy6L2qpz$W9KGk>G*q#FQ0NJ*m@$g*q$M1L);cvG2=ul~|95lW^eGF_ z4G_YLB1gJZP4lD+4X|d*Lr0t!|(&4>xtgpdKSob`I zoI!6CRDLR<0R=WFPh*3~<;VARkNosIVfAWEFxa&c+(vzK28ef|aU zN`FK)!UHF4$uguJLIFk60OfI57BMK@+eJ|1%vWy;w*{LUIAV$pl)&gW&IEKCj`C8h zb>T-pDr{?9QP!+`4JxYcMOg%yLzdJ~02@PE3+C~JJc5?_xUEj`2zV!Sc>lZWQ6Vfr zsJN!jvTA{#ApTJ8!8_uZ-%$$aa|{Ys)PIT)WZT2_Oe-Kj+6)cXaHNZKag#C#Qa&<# zzNo8CRpQhb^w~HNOdj!WQUV2eit~NVbF~?gL<$hmplJxxWCTB4Vs8bW->EaqMH463 z05PmfgR-24$nrW^6C?o+T=Ukq72EV22I4_;;{abH*3F|1h!9DB^3qYKO`@U;rhibR zG*u2VkhV1n<_8qEyOCL|@A3#;DborN;o#&#C|LT6&W{dR$>Ew{-|zu-qVN`g64zzM zSw4!Zf^|jO9#K}=dH&~}Se7Ii+^hsfZJx4v#cbqa%oMArn}Y;-D2a3!6e+66tE2`` zkox)Y$7~Q<%fR$G#VbbR)=_6BX_2LrqJR1Uc%fMv zM1ufwMPnw@Ym-DXf@36^Vg{UrYmtkXr!&mtU~}mSK1rC#5KZAe1b| ze7ImP4YHhZRDRk^N2ZjS;#9(QW^6mpNFca}x7}Qc{|7PNA_y3)PO8mT0+7qjLD7s3I@unRNY-s|Bq7F~dd8s7I1Xd@hM64fo`E zwvmef(CPnHoKDABmx96vCDx~$#1) Date: Wed, 24 Nov 2021 17:17:14 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87?= =?UTF-8?q?=E6=96=87=E5=AD=97=E7=AD=89=E3=82=B5=E3=82=A4=E3=82=BA=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/Prefabs/BulkOrder/Canvas.prefab | 22 +++---- .../BulkOrder/CanvasAchievement.prefab | 44 ++++++------- .../Prefabs/BulkOrder/CanvasCancel.prefab | 32 +++++----- .../Prefabs/BulkOrder/CanvasTelePhone.prefab | 64 +++++++++---------- 4 files changed, 81 insertions(+), 81 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index ea643b82..6d2b2077 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -73,7 +73,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 120.00012, y: -58.500034} - m_SizeDelta: {x: 240, y: 112} + m_SizeDelta: {x: 240, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8166373738923674638 CanvasRenderer: @@ -326,11 +326,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -711,7 +711,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: 94, y: -50} + m_AnchoredPosition: {x: 90, y: -50} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278008547943 @@ -1072,7 +1072,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 354} + m_AnchoredPosition: {x: 0, y: 358} m_SizeDelta: {x: 0, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4082915278280054938 @@ -1402,7 +1402,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 240, y: 112} + m_SizeDelta: {x: 240, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278942985869 CanvasRenderer: @@ -1674,7 +1674,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 120.00012, y: -58.500034} - m_SizeDelta: {x: 240, y: 112} + m_SizeDelta: {x: 240, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279019759809 CanvasRenderer: @@ -1912,11 +1912,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index cdc33d30..45542f96 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -414,8 +414,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -226.89996} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823238410846 CanvasRenderer: @@ -621,7 +621,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: 172.99995, y: -38.5} + m_AnchoredPosition: {x: 178.99995, y: -38.5} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823370329762 @@ -653,11 +653,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -799,7 +799,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 304} + m_AnchoredPosition: {x: 0, y: 76} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2377818823724858331 @@ -837,7 +837,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 46, y: 32} + m_SizeDelta: {x: 64, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823724858326 CanvasRenderer: @@ -866,7 +866,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -988,7 +988,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: 173, y: -38.5} + m_AnchoredPosition: {x: 179, y: -38.5} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823802633422 @@ -1020,11 +1020,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1140,7 +1140,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: 173, y: -38.5} + m_AnchoredPosition: {x: 179, y: -38.5} m_SizeDelta: {x: 180, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818823929203718 @@ -1172,11 +1172,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1294,7 +1294,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: 40, y: -37.5} + m_AnchoredPosition: {x: 37, y: -37.5} m_SizeDelta: {x: 54, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824019765599 @@ -1435,14 +1435,14 @@ RectTransform: m_GameObject: {fileID: 2377818824174324137} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 2377818824244898183} m_RootOrder: 3 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: 131, y: -113} + m_AnchoredPosition: {x: 152, y: -113} m_SizeDelta: {x: 206, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824174324132 @@ -1714,14 +1714,14 @@ RectTransform: m_GameObject: {fileID: 2377818824328388907} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 2377818824244898183} m_RootOrder: 0 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: 96.29999, y: 78.00003} + m_AnchoredPosition: {x: 149, y: 78} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2377818824328388902 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index 294bccb9..95aa2b78 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 192.6, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074208586581398 CanvasRenderer: @@ -184,7 +184,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: 40, y: -37.5} + m_AnchoredPosition: {x: 36, y: -37.5} m_SizeDelta: {x: 54, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074208878078349 @@ -362,7 +362,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 140, y: 125.10004} - m_SizeDelta: {x: 240, y: 98} + m_SizeDelta: {x: 240, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209150459481 CanvasRenderer: @@ -575,7 +575,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -38, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209173202452 CanvasRenderer: @@ -726,7 +726,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -159, y: 125.1} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 196, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209291994454 CanvasRenderer: @@ -1009,8 +1009,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: 96.00003, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 130, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074209543196489 CanvasRenderer: @@ -1041,11 +1041,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1402,7 +1402,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: 96.299995, y: -76.00004} + m_AnchoredPosition: {x: 90, y: -76.00004} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074210099131600 @@ -1550,8 +1550,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: 96, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 130, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4187074210139745725 CanvasRenderer: @@ -1582,11 +1582,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index a57788b4..9e567d22 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -160,8 +160,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: 96.00003, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 128, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686580462761 CanvasRenderer: @@ -192,11 +192,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -238,7 +238,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: 96.299995, y: -76.00004} + m_AnchoredPosition: {x: 96.299995, y: -76} m_SizeDelta: {x: 130, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686625492746 @@ -389,7 +389,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 705, y: 794} + m_SizeDelta: {x: 720, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9217531184726761281 MonoBehaviour: @@ -440,7 +440,7 @@ RectTransform: m_GameObject: {fileID: 4315754687099534942} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.15, y: 1.15, z: 1.15} m_Children: - {fileID: 4315754688526726639} - {fileID: 3058138224988021536} @@ -450,7 +450,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: 123} + m_AnchoredPosition: {x: 0, y: 117} m_SizeDelta: {x: 550, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4315754687099534941 @@ -525,7 +525,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 344} + m_AnchoredPosition: {x: 0, y: 95} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4315754687482315020 @@ -565,7 +565,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -38, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687482315027 CanvasRenderer: @@ -638,7 +638,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: 40, y: -37.5} + m_AnchoredPosition: {x: 36, y: -37.5} m_SizeDelta: {x: 54, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687558309304 @@ -894,8 +894,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -226.89996} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687626831808 CanvasRenderer: @@ -1107,8 +1107,8 @@ 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: -125} - m_SizeDelta: {x: 648, y: 156} + m_AnchoredPosition: {x: 0, y: -154} + m_SizeDelta: {x: 668, y: 156} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687736309298 CanvasRenderer: @@ -1182,7 +1182,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 705, y: 794} + m_SizeDelta: {x: 720, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687931289287 CanvasRenderer: @@ -1255,8 +1255,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: 96, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 128, y: -38.5} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688005591444 CanvasRenderer: @@ -1287,11 +1287,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1333,7 +1333,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: 0, y: -79} + m_AnchoredPosition: {x: 0, y: -68} m_SizeDelta: {x: 416, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688123097775 @@ -1410,7 +1410,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 192.6, y: 2.000026} - m_SizeDelta: {x: 210, y: 74} + m_SizeDelta: {x: 220, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688138076305 CanvasRenderer: @@ -1652,7 +1652,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 46, y: 32} + m_SizeDelta: {x: 64, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688581755600 CanvasRenderer: @@ -1681,7 +1681,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 47b10191009972140a30c32a0e7fd9a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2094,12 +2094,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} ---- !u!224 &3058138224889858367 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, - type: 3} - m_PrefabInstance: {fileID: 4315754688263163599} - m_PrefabAsset: {fileID: 0} --- !u!114 &1755114094215964333 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2576005101485369442, guid: 7c3046c0280714d4bb45d41bcbb71ce1, @@ -2112,6 +2106,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6f14cd02713649c5b189cbc9fb0b5bfd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3058138224889858367 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + m_PrefabInstance: {fileID: 4315754688263163599} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4315754688290612432 PrefabInstance: m_ObjectHideFlags: 0