From aab97835901552b776e984b0277e1749861186af Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 3 Dec 2021 12:40:47 +0900 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E3=82=B5=E3=82=A4=E3=82=BA?= =?UTF-8?q?=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 | 20 ++++++------- .../BulkOrder/CanvasAchievement.prefab | 18 ++++++------ .../Prefabs/BulkOrder/CanvasCancel.prefab | 16 +++++------ .../Prefabs/BulkOrder/CanvasTelePhone.prefab | 16 +++++------ .../Scenes/Main/Prefabs/BulkOrder/Orde.prefab | 8 +++--- .../Prefabs/Mission/AchievementCanvas.prefab | 2 +- .../Scenes/Main/WatchMovieCoinGet.unity | 10 +++---- .../shopping/Prefabs/PurchaseView.prefab | 28 +++++++++---------- 8 files changed, 59 insertions(+), 59 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 5b444092..420bd61e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -294,8 +294,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: 139.3, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 145.00002, y: -38.5} + m_SizeDelta: {x: 170, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915277569352109 CanvasRenderer: @@ -326,11 +326,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1880,8 +1880,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: 139.3, y: -38.5} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 145, y: -38.5} + m_SizeDelta: {x: 170, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4082915279101330552 CanvasRenderer: @@ -1912,11 +1912,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index ec966ad6..efa347e8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -653,11 +653,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1021,11 +1021,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1173,11 +1173,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index 95aa2b78..4c16656d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -1041,18 +1041,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 10000 + m_Text: 1000 --- !u!1 &4187074209620482713 GameObject: m_ObjectHideFlags: 0 @@ -1582,18 +1582,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 10000 + m_Text: 1000 --- !u!1001 &4187074208953172333 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 9e567d22..1c954471 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -160,7 +160,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: 128, y: -38.5} + m_AnchoredPosition: {x: 133.00006, y: -38.5} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754686580462761 @@ -192,11 +192,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 @@ -1255,7 +1255,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: 128, y: -38.5} + m_AnchoredPosition: {x: 133, y: -38.5} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4315754688005591444 @@ -1287,11 +1287,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab index 9536d116..89a62320 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab @@ -466,7 +466,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 67, y: -26.6} - m_SizeDelta: {x: 80, y: 30} + m_SizeDelta: {x: 80, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7648231675311400778 CanvasRenderer: @@ -497,11 +497,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 3 - m_MaxSize: 35 + m_MinSize: 30 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 21b85a37..329de0da 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -989,7 +989,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 1 m_MinSize: 35 - m_MaxSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index f596037a..c2156efa 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -619,8 +619,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: 139.3, y: -39.8} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 141, y: -39.8} + m_SizeDelta: {x: 170, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &726079106 MonoBehaviour: @@ -643,11 +643,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 + m_FontSize: 40 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 35 - m_MaxSize: 40 + m_MinSize: 40 + m_MaxSize: 45 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index b896653e..7f7580a9 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -967,7 +967,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 208.2, y: -2.8} - m_SizeDelta: {x: 145, y: 50} + m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304335494687835 CanvasRenderer: @@ -1001,15 +1001,15 @@ MonoBehaviour: m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 32 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 30000 + m_Text: 3000 --- !u!1 &9133304335498336185 GameObject: m_ObjectHideFlags: 0 @@ -1234,7 +1234,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 4, y: 12} - m_SizeDelta: {x: 220, y: 55} + m_SizeDelta: {x: 200, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304335893567705 CanvasRenderer: @@ -1478,9 +1478,9 @@ RectTransform: m_Father: {fileID: 9133304335893567655} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 122.9, y: -29.8} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -97, y: -35} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304336128604241 @@ -1515,15 +1515,15 @@ MonoBehaviour: m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 + m_MinSize: 35 + m_MaxSize: 40 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 10000 + m_Text: 100 --- !u!1 &9133304336153810494 GameObject: m_ObjectHideFlags: 0 @@ -1714,7 +1714,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: 30.3, y: -28.299927} + m_AnchoredPosition: {x: 32, y: -34} m_SizeDelta: {x: 86, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304336235834712 @@ -2046,14 +2046,14 @@ RectTransform: m_GameObject: {fileID: 9133304336647550439} 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} m_Children: [] m_Father: {fileID: 9133304335518990127} m_RootOrder: 0 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: 121.8, y: -0.6} + m_AnchoredPosition: {x: 124, y: -0.6} m_SizeDelta: {x: 36.37037, y: 38.907837} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304336647549976