From 15cd469d5255dc6ab256cd436726e7d1e193775e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Sch=C3=B6ner?= <tobias.stonehead@gmail.com>
Date: Fri, 3 Mar 2023 16:32:08 +0100
Subject: [PATCH] refactor: Scrollscreen anchors set correctly
---
Assets/Resources/Prefabs/Stage_Default.prefab | 61 +++----------------
.../Prefabs/UI/Ingame/HidingCanvas.prefab | 28 ++++-----
2 files changed, 24 insertions(+), 65 deletions(-)
diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index 3aa2dc83..e4525d5d 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -1974,21 +1974,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0.00047302246
objectReference: {fileID: 0}
- - target: {fileID: 861183262117291136, guid: b996060e27da25c498842defc1996d84,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 861183262117291136, guid: b996060e27da25c498842defc1996d84,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 861183262117291137, guid: b996060e27da25c498842defc1996d84,
- type: 3}
- propertyPath: scrollscreenContent
- value:
- objectReference: {fileID: 1871548913918342015}
- target: {fileID: 861183262247596663, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchorMax.x
@@ -2539,11 +2524,21 @@ PrefabInstance:
propertyPath: m_OverrideSorting
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4847292362846859827, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_LocalRotation.x
@@ -2771,12 +2766,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b996060e27da25c498842defc1996d84, type: 3}
---- !u!224 &1871548913918342015 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 4527154854479571703, guid: b996060e27da25c498842defc1996d84,
- type: 3}
- m_PrefabInstance: {fileID: 2822275412857346440}
- m_PrefabAsset: {fileID: 0}
--- !u!114 &3020720018354060034 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1063267682327585418, guid: b996060e27da25c498842defc1996d84,
@@ -3370,36 +3359,6 @@ PrefabInstance:
propertyPath: scrollscreenContent
value:
objectReference: {fileID: 3256699174731649202}
- - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- propertyPath: m_Pivot.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- propertyPath: m_Pivot.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- propertyPath: m_SizeDelta.x
- value: 110
- objectReference: {fileID: 0}
- - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 1080
- objectReference: {fileID: 0}
- - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6368005776962444133, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 6396408984958246870, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
propertyPath: m_IsActive
diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
index fd2e7abf..7c5ca4d9 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
@@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 6500467619489830996}
- component: {fileID: 6592514254180342026}
- - component: {fileID: 8189407137150641278}
+ - component: {fileID: 3111733877815237892}
m_Layer: 5
m_Name: Scrolls
m_TagString: Untagged
@@ -33,10 +33,10 @@ RectTransform:
m_Father: {fileID: 8004702058016740899}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 100, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!114 &6592514254180342026
MonoBehaviour:
@@ -51,7 +51,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
- m_Left: -5
+ m_Left: 5
m_Right: 0
m_Top: 5
m_Bottom: 0
@@ -62,7 +62,7 @@ MonoBehaviour:
m_Spacing: {x: 0, y: 5}
m_Constraint: 0
m_ConstraintCount: 2
---- !u!114 &8189407137150641278
+--- !u!114 &3111733877815237892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -75,7 +75,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
- m_VerticalFit: 1
+ m_VerticalFit: 2
--- !u!1 &1447414525858596195
GameObject:
m_ObjectHideFlags: 0
@@ -1241,7 +1241,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -3887.4707, y: 0.000030517578}
+ m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8004702056565720367
@@ -1617,7 +1617,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 8004702056618112982}
m_Direction: 0
m_Value: 0
- m_Size: 0.39999986
+ m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -2905,7 +2905,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &8004702057932254676
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2959,11 +2959,11 @@ RectTransform:
m_Father: {fileID: 8004702057932254677}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 1}
- m_AnchorMax: {x: 1, y: 1}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 105, y: 1080}
- m_Pivot: {x: 1, y: 1}
+ m_SizeDelta: {x: 110, y: 1080}
+ m_Pivot: {x: 1, y: 0}
--- !u!222 &8004702058016740900
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -3529,7 +3529,7 @@ PrefabInstance:
- target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 4860
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3}
--
GitLab