Reworked Views to use CanvasScaler on screen size mode

This commit is contained in:
2018-09-18 16:57:56 +02:00
parent 725aa0d32f
commit fe6ac87282
19 changed files with 924 additions and 1338 deletions

View File

@@ -55,7 +55,6 @@ GameObject:
- component: {fileID: 224562788853542486}
- component: {fileID: 222257107596212176}
- component: {fileID: 114703351711471558}
- component: {fileID: 114541473607554430}
m_Layer: 5
m_Name: TextMeshPro Text
m_TagString: Untagged
@@ -144,7 +143,6 @@ GameObject:
- component: {fileID: 224082682870789258}
- component: {fileID: 222236235550470454}
- component: {fileID: 114304727189119928}
- component: {fileID: 114179659714469870}
m_Layer: 5
m_Name: TextMeshPro Text
m_TagString: Untagged
@@ -196,7 +194,6 @@ GameObject:
- component: {fileID: 224899198735757046}
- component: {fileID: 222430445161218842}
- component: {fileID: 114962239977612638}
- component: {fileID: 114901347835684696}
m_Layer: 5
m_Name: TextMeshPro Text
m_TagString: Untagged
@@ -230,7 +227,6 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 224893211876998240}
- component: {fileID: 114340094141147230}
m_Layer: 5
m_Name: ButtonBack
m_TagString: Untagged
@@ -248,7 +244,6 @@ GameObject:
- component: {fileID: 224220608059838934}
- component: {fileID: 222633703844647490}
- component: {fileID: 114160009348696074}
- component: {fileID: 114455573160240600}
m_Layer: 5
m_Name: TextMeshPro Text
m_TagString: Untagged
@@ -338,7 +333,6 @@ GameObject:
- component: {fileID: 224820400269443288}
- component: {fileID: 222469164334548030}
- component: {fileID: 114339176493472056}
- component: {fileID: 114609205135736288}
m_Layer: 5
m_Name: Icon
m_TagString: Untagged
@@ -477,12 +471,12 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ReferenceResolution: {x: 1024, y: 1024}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_MatchWidthOrHeight: 0.5
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
@@ -771,18 +765,6 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114179659714469870
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1453184506351326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3}
m_Name:
m_EditorClassIdentifier:
SizeClass: 1
--- !u!114 &114189050068526520
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -949,18 +931,6 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114340094141147230
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1593863150254430}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3}
m_Name:
m_EditorClassIdentifier:
Padding: 0.01
--- !u!114 &114402161305082402
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1013,18 +983,6 @@ MonoBehaviour:
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &114455573160240600
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1663770969281230}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3}
m_Name:
m_EditorClassIdentifier:
SizeClass: 1
--- !u!114 &114481541986733408
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1142,18 +1100,6 @@ MonoBehaviour:
m_FlexibleWidth: 1
m_FlexibleHeight: 1
m_LayoutPriority: 1
--- !u!114 &114541473607554430
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1123889251050150}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3}
m_Name:
m_EditorClassIdentifier:
SizeClass: 1
--- !u!114 &114596666055262414
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1181,18 +1127,6 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114609205135736288
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1876542019120094}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3}
m_Name:
m_EditorClassIdentifier:
Padding: 0.02
--- !u!114 &114641077175838792
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1511,18 +1445,6 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114901347835684696
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1566260761276548}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b136c9157840904ba79e96d50f494bc, type: 3}
m_Name:
m_EditorClassIdentifier:
SizeClass: 1
--- !u!114 &114911072403513640
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1848,10 +1770,10 @@ RectTransform:
m_Father: {fileID: 224877065014001232}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.2, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: -70, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224085511031855630
RectTransform:
@@ -1924,10 +1846,10 @@ RectTransform:
m_Father: {fileID: 224696479351442688}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.2, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: -70, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224360344833465170
RectTransform:
@@ -1978,10 +1900,10 @@ RectTransform:
m_Father: {fileID: 224696479351442688}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.2}
m_AnchorMax: {x: 0.2, y: 0.8}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224482497675166948
RectTransform:
@@ -1996,10 +1918,10 @@ RectTransform:
m_Father: {fileID: 224750414370576322}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.2}
m_AnchorMax: {x: 0.2, y: 0.8}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224552794473583084
RectTransform:
@@ -2032,10 +1954,10 @@ RectTransform:
m_Father: {fileID: 224969683658863468}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.2, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: -70, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224696479351442688
RectTransform:
@@ -2092,10 +2014,10 @@ RectTransform:
m_Father: {fileID: 224214707840811800}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.95}
m_AnchorMax: {x: 0.05, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75, y: -75}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224844527725026830
RectTransform:
@@ -2114,10 +2036,10 @@ RectTransform:
m_Father: {fileID: 224214707840811800}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.25, y: 0.1}
m_AnchorMax: {x: 0.75, y: 0.45}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 300}
m_SizeDelta: {x: 400, y: 350}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224877065014001232
RectTransform:
@@ -2153,10 +2075,10 @@ RectTransform:
m_Father: {fileID: 224969683658863468}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.2}
m_AnchorMax: {x: 0.2, y: 0.8}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224893211876998240
RectTransform:
@@ -2173,10 +2095,10 @@ RectTransform:
m_Father: {fileID: 224214707840811800}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.9, y: 0.9}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: -75, y: -75}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224899198735757046
RectTransform:
@@ -2191,10 +2113,10 @@ RectTransform:
m_Father: {fileID: 224750414370576322}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.2, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: -70, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224951293784279432
RectTransform:
@@ -2227,10 +2149,10 @@ RectTransform:
m_Father: {fileID: 224877065014001232}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.2}
m_AnchorMax: {x: 0.2, y: 0.8}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224969683658863468
RectTransform: