From 2807155ae792087d24794183d0651facc669e9d1 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 29 Nov 2021 17:06:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E7=B8=A6=E9=95=B7=E3=81=AE=E6=99=82=E6=9E=A0=E3=81=8C?= =?UTF-8?q?=E8=A6=8B=E5=88=87=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity | 4 ++-- popcorn/Assets/MyGame/Scenes/recipe/recipe.unity | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 737456be..17cd0475 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -1777,7 +1777,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 20, y: 50} - m_SizeDelta: {x: 920, y: 1300} + m_SizeDelta: {x: 960, y: 1300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1037294270 GameObject: @@ -2163,7 +2163,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: 920, y: 1300} + m_SizeDelta: {x: 960, y: 1300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1157984680 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 87ce1a3f..734a792c 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -836,7 +836,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: 50} + m_AnchoredPosition: {x: -28.000002, y: 50} m_SizeDelta: {x: 1050, y: 1100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &199954322 @@ -2170,7 +2170,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: -610} + m_AnchoredPosition: {x: 36, y: -610} m_SizeDelta: {x: 300, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &968322477 @@ -3121,7 +3121,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -28, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &1455181833 @@ -3424,7 +3424,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: -111} + m_AnchoredPosition: {x: 36, y: -111} m_SizeDelta: {x: 404, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554563050 @@ -3796,7 +3796,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 1300, y: 1550} + m_SizeDelta: {x: 1210, y: 1550} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1594398331 MonoBehaviour: From aee8f0d4f295c9a16989c434b29265ac0d0ffadc Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 29 Nov 2021 17:48:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?POP=E3=80=81=E6=96=87=E5=AD=97=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApplicationExitConfirmDialog.unity | 8 +-- .../Scenes/shopping/Prefabs/ItemDetail.prefab | 56 +++++++++---------- .../Scenes/shopping/ShoppingExplanation.unity | 40 ------------- 3 files changed, 32 insertions(+), 72 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity b/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity index dc2ce08e..3cd317fe 100644 --- a/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/ApplicationExitConfirmDialog/ApplicationExitConfirmDialog.unity @@ -226,7 +226,7 @@ RectTransform: m_GameObject: {fileID: 784374165} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 2067370846} m_RootOrder: 0 @@ -300,7 +300,7 @@ RectTransform: m_GameObject: {fileID: 855971254} 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.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 1561203354} m_RootOrder: 0 @@ -781,7 +781,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -150, y: 154.99994} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1561203355 MonoBehaviour: @@ -1092,7 +1092,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 142, y: 155} - m_SizeDelta: {x: 196, y: 98} + m_SizeDelta: {x: 210, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2067370847 MonoBehaviour: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index bffd744d..331b567d 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -25,16 +25,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2323376334314441088} - m_LocalRotation: {x: -0, y: -0, z: 0.15055302, w: 0.9886019} + m_LocalRotation: {x: -0, y: -0, z: 0.30159217, w: 0.95343703} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 518946834925531999} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.318} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 35.107002} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -203.99995, y: 206} + m_AnchoredPosition: {x: -213, y: 199} m_SizeDelta: {x: 94, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6457389456100410181 @@ -173,17 +173,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2857599454489357223} - m_LocalRotation: {x: -0, y: -0, z: 0.4193403, w: 0.90782917} + m_LocalRotation: {x: -0, y: -0, z: 0.47460666, w: 0.880198} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 518946834925531999} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 49.586002} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 56.667004} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 193, y: -151} - m_SizeDelta: {x: 76, y: 182} + m_AnchoredPosition: {x: 212, y: -178} + m_SizeDelta: {x: 94, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7714467837840468085 CanvasRenderer: @@ -212,7 +212,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 245d0ac586e54e44ab6495f3c075039f, type: 3} + m_Sprite: {fileID: 21300000, guid: d2a0701e3c5905043abb15894ed12baa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -259,8 +259,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: 90} - m_SizeDelta: {x: 196, y: 98} + m_AnchoredPosition: {x: 0, y: 97} + m_SizeDelta: {x: 230, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445367999946803 CanvasRenderer: @@ -385,7 +385,7 @@ RectTransform: m_GameObject: {fileID: 3033445368104864271} 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: 0.9, y: 0.9, z: 0.9} m_Children: [] m_Father: {fileID: 3033445367999946806} m_RootOrder: 0 @@ -393,7 +393,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: 88, y: 36} + m_SizeDelta: {x: 126, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368104864264 CanvasRenderer: @@ -422,7 +422,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -457,7 +457,7 @@ RectTransform: m_GameObject: {fileID: 3033445368367237339} 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: - {fileID: 6761910428096081492} m_Father: {fileID: 3033445369678895481} @@ -465,7 +465,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: 134} + m_AnchoredPosition: {x: 6, y: 172} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3033445368460925997 @@ -502,8 +502,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: 3} - m_SizeDelta: {x: 480, y: 50} + m_AnchoredPosition: {x: 0, y: 12} + m_SizeDelta: {x: 600, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368460925998 CanvasRenderer: @@ -534,11 +534,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 32 + m_FontSize: 40 m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 300 + m_BestFit: 1 + m_MinSize: 32 + m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -581,7 +581,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -17} - m_SizeDelta: {x: 500, y: 6} + m_SizeDelta: {x: 630, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368573299229 CanvasRenderer: @@ -655,7 +655,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: 540, y: 180} + m_SizeDelta: {x: 650, y: 230} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368657787313 CanvasRenderer: @@ -686,7 +686,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 27 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -828,7 +828,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: 670, y: 622} + m_SizeDelta: {x: 770, y: 722} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1270602098027309814 MonoBehaviour: @@ -882,7 +882,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 4, y: -66} - m_SizeDelta: {x: 500, y: 50} + m_SizeDelta: {x: 630, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3033445369676262432 GameObject: @@ -1071,7 +1071,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: 670, y: 622} + m_SizeDelta: {x: 770, y: 722} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445369979775555 CanvasRenderer: @@ -1145,7 +1145,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 1} - m_SizeDelta: {x: 580, y: 210} + m_SizeDelta: {x: 680, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4339332656958528993 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index adcab67c..1b7e9ee6 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -128,46 +128,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3033445368460925996, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_SizeDelta.x - value: 510 - objectReference: {fileID: 0} - - target: {fileID: 3033445368460925999, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_FontData.m_BestFit - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3033445368460925999, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_FontData.m_MaxSize - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 3033445368460925999, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_FontData.m_MinSize - value: 28 - objectReference: {fileID: 0} - - target: {fileID: 3033445368573299218, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_Type - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3033445368573299219, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_SizeDelta.x - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 3033445369043120722, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 3033445369412931226, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - propertyPath: m_SizeDelta.x - value: 512 - objectReference: {fileID: 0} - target: {fileID: 3033445369676262432, guid: a1b406baf09004616b436c242e3a474f, type: 3} propertyPath: m_Name