From 628844f527d2e829ce3566e39c6a13feecec72a0 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 30 Aug 2021 15:34:11 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94POP=E5=80=8B?= =?UTF-8?q?=E6=95=B0=E8=A1=A8=E8=A8=98=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...i_Main_recipe_MoneyFrame_text_Quantity.png | Bin 811 -> 820 bytes .../MyGame/Scenes/recipe/Prefabs/Frame.prefab | 81 +++++++++++++++++- .../MyGame/Scenes/recipe/RecipeChoice.unity | 81 +++++++++++++++++- 3 files changed, 156 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png index 1c78f77fba97ae20c39eeeb89b8cdca2d48b34c1..fe9da61b7c0d7b7ea5a58e33a259506299fd1356 100644 GIT binary patch delta 759 zcmVW6kKea90FPh6~#iVW>PVNWYU-prh{PKVw2JH-Q4@Q?>2ca zP4mIw=H7R6zIT4#36KY_rzb34QY=xH;-kXX8uf{Q2gzMt?td7^D=aw{ONzpnu`jcH z;}=`;Bw~_hye!b(QDnKug!Ygh$@t_UA$?++<>d~GnB)d8OKP9FGD}BJOw!h7o$9sU z^sDkyoX19n#Tp%nIlpz_-n;x8{b(Ynk)(8zqvxjtNo%`Fh1@H;eEX`{_k#W72dMGq zFMWCcNgd4uC4Wg&nW!$NFI^BMPwzjbtyMPN#qn7d<($u@NuU% zJ$7!&x#uJfp8<%e>1s1Z@?uN8HPX{mrtnd|b+z(?((^OI@>{cuuDEq0vegD@+|Ig# zU0r~ntAuF!B!DX!SeEq|RAo{6)rm*~86y<7ifvaS?n6b{EPKXbCV}#}ObU>qpyO7; z(;{NB?0;^^Y%Wyb;k5@MJ}6?5gh5Ss$u6<#i>SHX z&NlQz9bPf&iwLa=iBS3c-D$4q7RXptyaviTk?lti;|8i~DgWe!>zPkk*g@kv?+Ron z5;BN}oyx~E^fw)-E0yvFte{uM=!($C(AB%OCU6sRYgD(=MdXZ9b^b&^F=C)lTKga} zYF)M;ai{kdWScWXL(Xu61Y(~wr=aYBN#LcE7`Fl)#;pbUX^(2NSxx&2BWdnwS!%PQ pvN7FS=DF86oRUM!K=5CH0RVPZA5`r)y{Z5J002ovPDHLkV1gwUcDw)p delta 750 zcmV>$Zj(-y|!3aO@^9ajVAerKk zm+ulTcJq9wyeAQpj7gHe!8DVl)MBd_iPg28tQ{78uYTJsQR2X!Nch#eFY|wR#3TsE zvRX%CQ95<`jF>OXKBvn1SK9bdqu%&#(!U983)<_YXNy#Py`r1l$)1%=jRbLj(v0Ns zof$eYo^n0@YJc$qMR^at%Un#;TB&S%#^W~;;}(w?CV@~;Y`{tHPTUqo0C<#pI48U+ ze=3Woj-kZcF0C?Fg!D0!dPYsj#<(CMF$Cx~Oovxm|B=g(tO(e;t{SwtUv=}I0)RP~W?Y8Ei zD1~8>qq_RuH>j~AL@4Io_%4cYIjGLzC5X0&AaO`qYn*m5ca#XZp>+~o>2T|NrdxQ> z_I1GUjhVEMgH-foxEWDF-31VP4!N3NF>Zm=lY5w!`u zOE;pr$0i|uVGYO2DLZtsPV{vfBq@+Iy#=+n0aYE>E?lMF`nUy^yslgL=@^v8v(k8? g6Bo&Uj$Z-{00inM7BKHA{Qv*}07*qoM6N<$g0|LW&;S4c diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index 563abf5c..f8f37e2c 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &829885949630159631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6626877353507539474} + - component: {fileID: 616496518107127084} + - component: {fileID: 9201798278428605049} + m_Layer: 0 + m_Name: text_Quantity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6626877353507539474 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829885949630159631} + 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: 2929932626910560293} + m_RootOrder: 2 + 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: 65.5, y: -10.3} + m_SizeDelta: {x: 26, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &616496518107127084 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829885949630159631} + m_CullTransparentMesh: 0 +--- !u!114 &9201798278428605049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829885949630159631} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 086caf604a7f77e4395bff51404dbb22, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &908060699288711323 GameObject: m_ObjectHideFlags: 0 @@ -149,14 +223,14 @@ RectTransform: m_GameObject: {fileID: 2929932626248606813} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.38, y: 0.38, z: 0.38} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 2929932626910560293} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26.1, y: -24.5} + m_AnchoredPosition: {x: 22.8, y: -25.6} m_SizeDelta: {x: 86, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932626248606808 @@ -415,6 +489,7 @@ RectTransform: m_Children: - {fileID: 2929932626248606812} - {fileID: 2929932627123125674} + - {fileID: 6626877353507539474} m_Father: {fileID: 3275864313872047402} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -494,7 +569,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: 85.6, y: -26} + m_AnchoredPosition: {x: 80.7, y: -26} m_SizeDelta: {x: 95, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932627123125672 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 08b65907..5e71a70d 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -152,6 +152,7 @@ RectTransform: m_Children: - {fileID: 930273407} - {fileID: 498799266} + - {fileID: 359736401} m_Father: {fileID: 1626721124} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -386,6 +387,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326258101} m_CullTransparentMesh: 0 +--- !u!1 &359736400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 359736401} + - component: {fileID: 359736403} + - component: {fileID: 359736402} + m_Layer: 0 + m_Name: text_Quantity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &359736401 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359736400} + 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: 138926718} + m_RootOrder: 2 + 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: 78.1, y: -10.8} + m_SizeDelta: {x: 26, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &359736402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359736400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 086caf604a7f77e4395bff51404dbb22, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &359736403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 359736400} + m_CullTransparentMesh: 0 --- !u!1 &374985848 GameObject: m_ObjectHideFlags: 0 @@ -644,7 +719,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: 98.9, y: -25.4} + m_AnchoredPosition: {x: 92.7, y: -25.4} m_SizeDelta: {x: 115, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &498799267 @@ -1443,14 +1518,14 @@ RectTransform: m_GameObject: {fileID: 930273406} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.38, y: 0.38, z: 0.38} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 138926718} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26.1, y: -24.5} + m_AnchoredPosition: {x: 22.6, y: -24.5} m_SizeDelta: {x: 86, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &930273408