From e7e1a3a6345f050baee30465f2cd1b06ea978916 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 15 Apr 2022 11:30:16 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E9=81=B8=E6=8A=9E?= =?UTF-8?q?=E6=9D=90=E6=96=99=E6=9E=A0=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/Prefabs/NecessaryMaterial.prefab | 26 ++++----- .../MyGame/Scenes/recipe/RecipeChoice.unity | 55 ++----------------- 2 files changed, 18 insertions(+), 63 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab index 82ce6382..7debb850 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2732939993115001145} - component: {fileID: 8098216484883126110} - component: {fileID: 5789984287278102259} - m_Layer: 0 + m_Layer: 5 m_Name: MaterialFrame_stock m_TagString: Untagged m_Icon: {fileID: 0} @@ -34,8 +34,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: -9.900009, y: 1.2999077} - m_SizeDelta: {x: 164, y: 50} + m_AnchoredPosition: {x: 9, y: 1.2999077} + m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8098216484883126110 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 916c678d8b88d8b48ac3b66f52bae46b, type: 3} - m_Type: 0 + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -85,7 +85,7 @@ GameObject: - component: {fileID: 150415631863662799} - component: {fileID: 1740348503652499160} - component: {fileID: 8656009127678696843} - m_Layer: 0 + m_Layer: 5 m_Name: material (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -159,7 +159,7 @@ GameObject: - component: {fileID: 9162186556783016792} - component: {fileID: 1888226412741393478} - component: {fileID: 4654596183118361121} - m_Layer: 0 + m_Layer: 5 m_Name: TextNumbers m_TagString: Untagged m_Icon: {fileID: 0} @@ -182,7 +182,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: 99.6, y: 0.8999138} + m_AnchoredPosition: {x: 126, y: 0.8999138} m_SizeDelta: {x: 133.7, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1888226412741393478 @@ -214,18 +214,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 - m_MaxSize: 30 + m_MinSize: 30 + m_MaxSize: 35 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 99 / 25 + m_Text: 99 / 99 --- !u!1 &5352886967997046946 GameObject: m_ObjectHideFlags: 0 @@ -235,7 +235,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5352886967997046957} - m_Layer: 0 + m_Layer: 5 m_Name: NecessaryMaterial m_TagString: Untagged m_Icon: {fileID: 0} @@ -273,7 +273,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6739113353957456840} - m_Layer: 0 + m_Layer: 5 m_Name: material m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index cb09c638..156cc119 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -2826,7 +2826,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: 780, y: 200} + m_SizeDelta: {x: 820, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1197864698 MonoBehaviour: @@ -3048,7 +3048,7 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.x - value: 579 + value: 573 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -4678,7 +4678,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 999/250 + m_Text: 9999/2500 --- !u!1 &5352886968946593876 GameObject: m_ObjectHideFlags: 0 @@ -4793,7 +4793,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: 41, y: -90.3} + m_AnchoredPosition: {x: 20, y: -90.3} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0, y: 1} --- !u!1001 &5352886969301700757 @@ -4803,51 +4803,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2086551031} m_Modifications: - - target: {fileID: 2056109400442663925, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2358514311597240715, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4570586286644907414, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_Text - value: 9 / 9 - objectReference: {fileID: 0} - - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_FontData.m_MaxSize - value: 35 - objectReference: {fileID: 0} - - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_FontData.m_MinSize - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_FontData.m_FontSize - value: 30 - objectReference: {fileID: 0} - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_Name value: NecessaryMaterial1 objectReference: {fileID: 0} - - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_Pivot.x @@ -4931,7 +4891,7 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.x - value: 360 + value: 369 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -4953,11 +4913,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8915749249284169289, guid: c84cc6844fe59ef4d8e52438b7bffa42, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} --- !u!114 &5352886969301700758 stripped