From c7932e703ad9cb15763d42fe89b6e7735beb7fd8 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 3 Dec 2021 18:50:17 +0900 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/Prefabs/BulkOrder/Canvas.prefab | 28 ++++++++-------- .../BulkOrder/CanvasAchievement.prefab | 6 ++-- .../Prefabs/BulkOrder/CanvasTelePhone.prefab | 32 +++++++++---------- .../Prefabs/BulkOrder/Frame_BulkOrder.prefab | 10 +++--- .../Scenes/Main/Prefabs/BulkOrder/Orde.prefab | 26 +++++++-------- 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 420bd61e..fa8608a1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -221,7 +221,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: 922, y: 1700} + m_SizeDelta: {x: 930, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277521603128 CanvasRenderer: @@ -446,7 +446,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: -313, y: 0} + m_AnchoredPosition: {x: -331, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915277894373616 @@ -633,8 +633,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: 446, y: -57.6} - m_SizeDelta: {x: 580, y: 100} + m_AnchoredPosition: {x: 453, y: -57.6} + m_SizeDelta: {x: 630, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277970689976 CanvasRenderer: @@ -665,18 +665,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: 0 - m_MaxSize: 28 + m_MinSize: 30 + m_MaxSize: 32 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u305F\u304F\u3055\u3093\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u304C\u6B32\u3057\u3044\u306A" + m_Text: "\u5DEE\u3057\u5165\u308C\u306B\u6301\u3063\u3066\u884C\u304D\u305F\u3044\u304B\u3089\u6CA2\u5C71\u6B32\u3057\u3044\u306D\u3093" --- !u!1 &4082915278008547938 GameObject: m_ObjectHideFlags: 0 @@ -1151,7 +1151,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 52} - m_SizeDelta: {x: 922, y: 1700} + m_SizeDelta: {x: 930, y: 1700} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2145851308931691871 MonoBehaviour: @@ -1212,7 +1212,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: 0} + m_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 118, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915278807493228 @@ -2034,7 +2034,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 635} - m_SizeDelta: {x: 750, y: 116} + m_SizeDelta: {x: 780, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4082915279204653804 GameObject: @@ -2070,8 +2070,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: 43, y: 0} - m_SizeDelta: {x: 656, y: 116} + m_AnchoredPosition: {x: 36.000008, y: 0} + m_SizeDelta: {x: 710, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279204653793 CanvasRenderer: @@ -2340,7 +2340,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 66} - m_SizeDelta: {x: 818, y: 1310} + m_SizeDelta: {x: 830, y: 1310} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5023734004673988866 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index efa347e8..229fa382 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -656,7 +656,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 4 + m_MinSize: 40 m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 4 + m_MinSize: 40 m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 @@ -1176,7 +1176,7 @@ MonoBehaviour: m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 4 + m_MinSize: 40 m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 1c954471..8c27b935 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -86,7 +86,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: -141, y: 62} + m_AnchoredPosition: {x: -141, y: 49} m_SizeDelta: {x: 82, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686575543082 @@ -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: 720, y: 820} + m_SizeDelta: {x: 760, 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.15, y: 1.15, z: 1.15} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: - {fileID: 4315754688526726639} - {fileID: 3058138224988021536} @@ -451,7 +451,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 117} - m_SizeDelta: {x: 550, y: 0} + m_SizeDelta: {x: 600, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4315754687099534941 MonoBehaviour: @@ -466,12 +466,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 24 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 30 + m_Spacing: 35 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -713,7 +713,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 115, y: -17} - m_SizeDelta: {x: 600, y: 125} + m_SizeDelta: {x: 630, y: 125} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687599301558 CanvasRenderer: @@ -746,16 +746,16 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 32 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u305F\u304F\u3055\u3093\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u304C\u6B32\u3057\u3044\u306A" + m_Text: "\u5DEE\u3057\u5165\u308C\u306B\u6301\u3063\u3066\u884C\u304D\u305F\u3044\u304B\u3089\u6CA2\u5C71\u6B32\u3057\u3044\u306D\u3093" --- !u!1 &4315754687615340676 GameObject: m_ObjectHideFlags: 0 @@ -1031,7 +1031,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 548} - m_SizeDelta: {x: 876, y: 234} + m_SizeDelta: {x: 900, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687733902327 CanvasRenderer: @@ -1108,7 +1108,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -154} - m_SizeDelta: {x: 668, y: 156} + m_SizeDelta: {x: 710, 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: 720, y: 820} + m_SizeDelta: {x: 760, y: 820} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754687931289287 CanvasRenderer: @@ -1570,14 +1570,14 @@ RectTransform: m_GameObject: {fileID: 4315754688350645386} m_LocalRotation: {x: -0, y: -0, z: 0.09801341, w: 0.99518514} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: [] m_Father: {fileID: 4315754687733902321} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.250001} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -305.69998, y: -5.9000854} + m_AnchoredPosition: {x: -317, y: -5.9000854} m_SizeDelta: {x: 118, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688350645385 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 437a8ded..fb029f11 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -1219,7 +1219,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 100} - m_SizeDelta: {x: 600, y: 50} + m_SizeDelta: {x: 620, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6701890202664346919 CanvasRenderer: @@ -1250,11 +1250,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: 0 - m_MinSize: 2 - m_MaxSize: 25 + m_MinSize: 0 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1367,7 +1367,7 @@ MonoBehaviour: m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 + m_MinSize: 30 m_MaxSize: 35 m_Alignment: 4 m_AlignByGeometry: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab index 89a62320..acfb6f4b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab @@ -36,7 +36,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: 550, y: 74} + m_SizeDelta: {x: 600, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2576005101485369442 MonoBehaviour: @@ -89,8 +89,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: -12, y: 0} - m_SizeDelta: {x: 345, y: 60} + m_AnchoredPosition: {x: -13, y: 0} + m_SizeDelta: {x: 370, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1266659963782799781 CanvasRenderer: @@ -121,18 +121,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 35 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3" + m_Text: "\u30B9\u30C8\u30ED\u30D9\u30EA\u30FC\u30C1\u30E7\u30B3\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" --- !u!1 &1266659964433289958 GameObject: m_ObjectHideFlags: 0 @@ -243,7 +243,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: 0} + m_AnchoredPosition: {x: -12, y: 0} m_SizeDelta: {x: 550, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6078742360956254766 @@ -280,7 +280,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: 0} + m_AnchoredPosition: {x: -12, y: 0} m_SizeDelta: {x: 524, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6134255696156549157 @@ -353,7 +353,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: 210, y: -10} + m_AnchoredPosition: {x: 241, y: -10} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7526028034810490598 @@ -542,7 +542,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -222.99997, y: 0} + m_AnchoredPosition: {x: -242, y: 0} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8690967114179661769 @@ -580,7 +580,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -50, y: 0} - m_SizeDelta: {x: 426, y: 74} + m_SizeDelta: {x: 470, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1519306445017384389 CanvasRenderer: