matt/RothenburgAR
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Reworked Views to use CanvasScaler on screen size mode

Browse Source
This commit is contained in:
Matt
2018-09-18 16:57:56 +02:00
parent 725aa0d32f
commit fe6ac87282
19 changed files with 924 additions and 1338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Assets/Resources/UI/ARView.prefab
View File

@@ -193,7 +193,6 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 224632685815868688}
- component: {fileID: 114549737417258442}
m_Layer: 5
m_Name: ButtonSettings
m_TagString: Untagged
@@ -263,7 +262,6 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 224954540062687134}
- component: {fileID: 114518976637844802}
m_Layer: 5
m_Name: ButtonSelect
m_TagString: Untagged
@@ -367,7 +365,6 @@ GameObject:
- component: {fileID: 224781237586130416}
- component: {fileID: 95946319316223234}
- component: {fileID: 114954497030479772}
- component: {fileID: 114935104924559364}
m_Layer: 5
m_Name: Reticule
m_TagString: Untagged
@@ -601,7 +598,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8b5529ae19f2154419c212a3cbb23946, type: 3}
m_Sprite: {fileID: 21300000, guid: 25c300b5f8ebb4d4aac98e07ba35ce08, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -994,7 +991,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 6cc2cfaeed321a64eb2b1bca2699b6aa, type: 3}
m_Sprite: {fileID: 21300000, guid: 48ecc8a9d56982a4b9d0c2d373cbcbb5, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1013,12 +1010,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
@@ -1106,30 +1103,6 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &114518976637844802
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1461557036225360}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3}
m_Name:
m_EditorClassIdentifier:
Padding: 0.01
--- !u!114 &114549737417258442
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1386541956847342}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3}
m_Name:
m_EditorClassIdentifier:
Padding: 0.01
--- !u!114 &114591155496247950
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1352,18 +1325,6 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &114935104924559364
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1753054310650300}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa4122a56a9a4e84a923d9e38fba6296, type: 3}
m_Name:
m_EditorClassIdentifier:
Padding: 0.01
--- !u!114 &114941164005360912
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1432,7 +1393,7 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: 122
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_enableKerning: 1
@@ -1804,7 +1765,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 30, y: -30}
m_SizeDelta: {x: 48, y: 48}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224060988043194314
RectTransform:
@@ -1819,10 +1780,10 @@ RectTransform:
m_Father: {fileID: 224620536568054620}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.52, y: 0.5}
m_AnchorMax: {x: 0.905, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 2}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -75.5, y: 0}
m_SizeDelta: {x: -200, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224105959217507050
RectTransform:
@@ -1897,8 +1858,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: 230, y: -317.65}
m_SizeDelta: {x: 460, y: 115.29998}
m_AnchoredPosition: {x: 230, y: -187.65}
m_SizeDelta: {x: 460, y: 375.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224272151730405692
RectTransform:
@@ -1913,11 +1874,11 @@ RectTransform:
m_Father: {fileID: 224620536568054620}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45}
m_AnchorMin: {x: 0.905, y: 0.5}
m_AnchorMax: {x: 0.958, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 2}
m_Pivot: {x: 0, y: 0.5}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -110, y: -66}
m_SizeDelta: {x: 93.8, y: 2}
m_Pivot: {x: 1, y: 0.5}
--- !u!224 &224292492441239568
RectTransform:
m_ObjectHideFlags: 1
@@ -2044,10 +2005,10 @@ RectTransform:
m_Father: {fileID: 224804495073354866}
m_RootOrder: 0
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 &224701352370170208
RectTransform:
@@ -2062,10 +2023,10 @@ RectTransform:
m_Father: {fileID: 224017865803686938}
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_AnchorMin: {x: 0.25, y: 0.25}
m_AnchorMax: {x: 0.75, y: 0.75}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 24, y: 24}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224781237586130416
RectTransform:
@@ -2082,10 +2043,10 @@ RectTransform:
m_Father: {fileID: 224620536568054620}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.47, y: 0.47}
m_AnchorMax: {x: 0.53, y: 0.53}
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: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224804495073354866
RectTransform:
@@ -2181,8 +2142,8 @@ RectTransform:
m_Father: {fileID: 224804495073354866}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.9, y: 0.35}
m_AnchorMax: {x: 1, y: 0.45}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -75, y: -100}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}