diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 47ee38be..962b241c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 49.586002} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 254, y: -324} + m_AnchoredPosition: {x: 244, y: -370} m_SizeDelta: {x: 76, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5183137526989206975 @@ -99,17 +99,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3375734387781680871} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 3856012874794846574} - m_RootOrder: 4 + m_Children: + - {fileID: 3856012875694233263} + m_Father: {fileID: 3856012874861365792} + m_RootOrder: 6 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: 60} - m_SizeDelta: {x: 500, y: 200} + m_AnchoredPosition: {x: 0, y: 41} + m_SizeDelta: {x: 580, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4753495964141152955 CanvasRenderer: @@ -182,7 +183,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.318} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -266, y: 273} + m_AnchoredPosition: {x: -245, y: 233} m_SizeDelta: {x: 94, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4835729983519013708 @@ -247,16 +248,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3846129596065133818} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 3856012874794846574} - m_RootOrder: 5 + m_Father: {fileID: 3856012875378235477} + m_RootOrder: 0 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: -181} + m_AnchoredPosition: {x: 0, y: -15.9999695} m_SizeDelta: {x: 640, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1674871521371329343 @@ -426,7 +427,7 @@ RectTransform: - {fileID: 3613327424185171990} - {fileID: 3613327422686341716} m_Father: {fileID: 3856012875378235477} - m_RootOrder: 1 + 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} @@ -508,8 +509,6 @@ RectTransform: - {fileID: 1504859057866268918} - {fileID: 5921543939047703470} - {fileID: 2388270836938668330} - - {fileID: 4383640794170159703} - - {fileID: 4111097017210071838} - {fileID: 3856012874861365792} m_Father: {fileID: 3856012875358022748} m_RootOrder: 1 @@ -517,7 +516,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: 706, y: 856} + m_SizeDelta: {x: 750, y: 950} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5360726889513396134 MonoBehaviour: @@ -569,16 +568,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3856012875199795011} - {fileID: 3856012876379087770} - {fileID: 3856012876249380571} + - {fileID: 3856012875199795011} - {fileID: 3856012876432300748} - {fileID: 3856012875338803179} - {fileID: 3856012876494266538} - - {fileID: 3856012875694233263} + - {fileID: 4383640794170159703} - {fileID: 3856012875378235477} m_Father: {fileID: 3856012874794846574} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -702,7 +701,7 @@ RectTransform: m_GameObject: {fileID: 3856012875007359861} 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: 3856012875338803179} m_RootOrder: 0 @@ -779,7 +778,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3856012875378235477} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -854,11 +853,11 @@ RectTransform: m_Children: - {fileID: 3856012874977579075} m_Father: {fileID: 3856012874861365792} - m_RootOrder: 0 + 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: -291, y: 418} + m_AnchoredPosition: {x: -306, y: 437} m_SizeDelta: {x: 74, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875199795013 @@ -1001,11 +1000,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 25 + m_MinSize: 26 + m_MaxSize: 29 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1140,14 +1139,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4111097017210071838} - {fileID: 3856012875109116651} - {fileID: 3856012874490264331} m_Father: {fileID: 3856012874861365792} m_RootOrder: 7 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: -165} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 274} m_SizeDelta: {x: 650, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3856012875447652418 @@ -1177,7 +1177,7 @@ RectTransform: m_GameObject: {fileID: 3856012875447652418} 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: 3856012876494266538} m_RootOrder: 0 @@ -1334,7 +1334,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: 706, y: 856} + m_SizeDelta: {x: 750, y: 950} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875614048346 CanvasRenderer: @@ -1481,7 +1481,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: 3} + m_AnchoredPosition: {x: 0, y: 7} m_SizeDelta: {x: 584, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875645848066 @@ -1513,8 +1513,8 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 32 - m_FontStyle: 0 + m_FontSize: 35 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 300 @@ -1550,17 +1550,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3856012875694233260} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 3856012874861365792} - m_RootOrder: 6 + m_Father: {fileID: 4383640794170159703} + m_RootOrder: 0 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.3, y: 59} - m_SizeDelta: {x: 450, y: 180} + m_AnchoredPosition: {x: 0.3, y: 0} + m_SizeDelta: {x: 560, y: 198} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875694233249 CanvasRenderer: @@ -1591,10 +1591,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 27 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 2 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1602,7 +1602,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.3 - m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\u7279\u7523\u306E\u5869\r\u3092\n\u3075\u3093\u3060\u3093\u306B\u4F7F\u3063\u305F\u5B9A\u756A\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" + m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\r\n\u7279\u7523\u306E\u5869\u3092\u3075\u3093\u3060\u3093\u306B\u4F7F\u3063\u305F\r\n\u5B9A\u756A\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!1 &3856012875805691664 GameObject: m_ObjectHideFlags: 0 @@ -1669,11 +1669,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 25 + m_MinSize: 26 + m_MaxSize: 29 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1789,8 +1789,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: -17} - m_SizeDelta: {x: 500, y: 6} + m_AnchoredPosition: {x: -3, y: -17} + m_SizeDelta: {x: 670, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875903494667 CanvasRenderer: @@ -1935,7 +1935,7 @@ RectTransform: - {fileID: 3856012875645848064} - {fileID: 3856012875903494665} m_Father: {fileID: 3856012874861365792} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1975,11 +1975,11 @@ RectTransform: m_Children: - {fileID: 3856012875620007257} m_Father: {fileID: 3856012874861365792} - m_RootOrder: 1 + m_RootOrder: 0 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: 82} + m_AnchoredPosition: {x: 0, y: 85} m_SizeDelta: {x: 196, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012876379087775 @@ -2227,7 +2227,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -148, y: -160} + m_AnchoredPosition: {x: -148, y: -163} m_SizeDelta: {x: 185, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7093407406090843726 @@ -2338,7 +2338,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 37.719} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -14, y: -10} + m_AnchoredPosition: {x: -72, y: -44} m_SizeDelta: {x: 76, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5208639211492208993 @@ -2527,6 +2527,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} +--- !u!224 &3084478268397759140 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3271889073656297700} + m_PrefabAsset: {fileID: 0} --- !u!114 &5228864552364374033 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, @@ -2539,12 +2545,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &3084478268397759140 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - m_PrefabInstance: {fileID: 3271889073656297700} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3856012874690155094 PrefabInstance: m_ObjectHideFlags: 0 @@ -2871,6 +2871,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} +--- !u!224 &3613327424014868448 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012875392093600} + m_PrefabAsset: {fileID: 0} --- !u!114 &5799495138696269141 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, @@ -2883,12 +2889,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &3613327424014868448 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - m_PrefabInstance: {fileID: 3856012875392093600} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3856012875404040783 PrefabInstance: m_ObjectHideFlags: 0 @@ -3402,12 +3402,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} ---- !u!224 &3613327422686341716 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - m_PrefabInstance: {fileID: 3856012876160759828} - m_PrefabAsset: {fileID: 0} --- !u!114 &5799495140018518241 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, @@ -3420,3 +3414,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3613327422686341716 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + m_PrefabInstance: {fileID: 3856012876160759828} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab index fd3e4bc6..03418fa6 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/PanTarget.prefab @@ -25,7 +25,7 @@ RectTransform: m_GameObject: {fileID: 2260898471005442072} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.82576, y: 0.82576, z: 0.82576} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 2052273582920901975} m_Father: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index b623b99e..99329af3 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -231,7 +231,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: 4, y: 33} + m_AnchoredPosition: {x: 4, y: 30.999977} m_SizeDelta: {x: 180, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &138926719 @@ -304,7 +304,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: -2, y: -22} + m_AnchoredPosition: {x: -35, y: -28} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &255490368 @@ -712,7 +712,7 @@ RectTransform: m_GameObject: {fileID: 546807793} 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: 1811755283} m_RootOrder: 0 @@ -1159,7 +1159,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: -174, y: 157.99997} + m_AnchoredPosition: {x: -174, y: 138.99997} m_SizeDelta: {x: 230, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &843133640 @@ -1386,7 +1386,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: 47, y: -32} + m_AnchoredPosition: {x: 47, y: -34.000027} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &878944769 @@ -1558,11 +1558,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 1 m_BestFit: 1 - m_MinSize: 22 - m_MaxSize: 27 + m_MinSize: 0 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1740,7 +1740,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: 157, y: 158} + m_AnchoredPosition: {x: 157, y: 139} m_SizeDelta: {x: 230, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1037294272 @@ -1858,7 +1858,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: 170, y: 30} + m_SizeDelta: {x: 185, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1109202679 MonoBehaviour: @@ -1881,11 +1881,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 20 - m_MaxSize: 25 + m_MinSize: 26 + m_MaxSize: 29 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -2088,7 +2088,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: 836, y: 1250} + m_SizeDelta: {x: 900, y: 1250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1157984680 MonoBehaviour: @@ -2220,7 +2220,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -180} - m_SizeDelta: {x: 700, y: 210} + m_SizeDelta: {x: 780, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170636685 MonoBehaviour: @@ -2375,7 +2375,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: -9, y: 152} + m_AnchoredPosition: {x: -9, y: 163.00005} m_SizeDelta: {x: 600, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1408233925 @@ -2620,7 +2620,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: 500, y: 6} + m_SizeDelta: {x: 580, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1484296445 MonoBehaviour: @@ -2686,7 +2686,7 @@ RectTransform: m_GameObject: {fileID: 1487129868} 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: 6717333194433799772} m_Father: {fileID: 230185243} @@ -2847,7 +2847,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.5, y: 33} + m_AnchoredPosition: {x: -0.5, y: 30.999977} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1517415306 @@ -3108,7 +3108,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: 23.00003} + m_AnchoredPosition: {x: 0, y: 21} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1853630202 @@ -3148,7 +3148,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: 157, y: 158} + m_AnchoredPosition: {x: 157, y: 139} m_SizeDelta: {x: 230, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1853630204 @@ -3355,7 +3355,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: -130} + m_AnchoredPosition: {x: 0, y: -116} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2045825932 @@ -3392,8 +3392,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: 75, y: -208} - m_SizeDelta: {x: 370, y: 130} + m_AnchoredPosition: {x: 76, y: -210} + m_SizeDelta: {x: 440, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2045825934 MonoBehaviour: @@ -3416,11 +3416,11 @@ 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: 23 - m_MaxSize: 25 + m_MinSize: 28 + m_MaxSize: 30 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 @@ -3557,7 +3557,7 @@ PrefabInstance: - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} propertyPath: m_AnchoredPosition.x - value: 233 + value: 273 objectReference: {fileID: 0} - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} @@ -3671,7 +3671,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: -36} + m_AnchoredPosition: {x: 0, y: -38.000027} m_SizeDelta: {x: 194, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2124266408 @@ -3744,7 +3744,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: -7, y: -70.00004} + m_AnchoredPosition: {x: -7, y: -48} m_SizeDelta: {x: 700, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &318270869295207907 @@ -3886,7 +3886,7 @@ PrefabInstance: - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} propertyPath: m_AnchoredPosition.x - value: -380 + value: -418 objectReference: {fileID: 0} - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} @@ -4306,12 +4306,12 @@ PrefabInstance: - target: {fileID: 2260898471005442079, guid: 0e260d45e40289046acb4cafebcaa288, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2260898471005442079, guid: 0e260d45e40289046acb4cafebcaa288, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2260898471005442079, guid: 0e260d45e40289046acb4cafebcaa288, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 2a192201..af317d17 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 17.318} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -196, y: 206} + m_AnchoredPosition: {x: -203.99995, y: 206} m_SizeDelta: {x: 94, y: 270} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6457389456100410181 @@ -108,7 +108,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 49.586002} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 184, y: -158} + m_AnchoredPosition: {x: 193, y: -151} m_SizeDelta: {x: 76, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7714467837840468085 @@ -467,7 +467,7 @@ RectTransform: 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: 370, y: 50} + m_SizeDelta: {x: 480, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368460925998 CanvasRenderer: @@ -545,7 +545,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: 370, y: 6} + m_SizeDelta: {x: 500, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368573299229 CanvasRenderer: @@ -575,7 +575,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: ff4296f46be2e7a4583db68be1c12d4c, type: 3} - m_Type: 0 + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -619,7 +619,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: 480, y: 180} + m_SizeDelta: {x: 530, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445368657787313 CanvasRenderer: @@ -792,7 +792,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: 590, y: 622} + m_SizeDelta: {x: 670, y: 622} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1270602098027309814 MonoBehaviour: @@ -846,7 +846,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: 370, y: 50} + m_SizeDelta: {x: 500, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3033445369676262432 GameObject: @@ -1035,7 +1035,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: 590, y: 622} + m_SizeDelta: {x: 670, y: 622} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3033445369979775555 CanvasRenderer: @@ -1109,7 +1109,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: 510, y: 200} + m_SizeDelta: {x: 570, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4339332656958528993 CanvasRenderer: