Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style/UI fixes #6030

Merged
merged 2 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2565392910590902996}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
Expand Down Expand Up @@ -108,7 +107,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4610928374356700704}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -229,7 +227,6 @@ RectTransform:
- {fileID: 6360757553473541128}
- {fileID: 6566000504069361755}
m_Father: {fileID: 6576503548707075487}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
Expand Down Expand Up @@ -267,7 +264,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2565392910590902996}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
Expand Down Expand Up @@ -405,7 +401,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2771610990336384369}
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}
Expand Down Expand Up @@ -486,7 +481,6 @@ RectTransform:
- {fileID: 2565392910590902996}
- {fileID: 2771610990336384369}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -551,7 +545,6 @@ MonoBehaviour:
userNameButton: {fileID: 3992990973798848351}
dropdownArrow: {fileID: 4707442385471252673}
arrowUp: {fileID: 21300000, guid: e0a2bc75af20840e79cb10bba9987431, type: 3}
userNameText: {fileID: 0}
wearableTemplate: {fileID: 4073663603671829108}
wearablesListContainer: {fileID: 3860574518102806846}
emptyWearablesListMessage: {fileID: 3120953965885259730}
Expand Down Expand Up @@ -586,7 +579,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 266098618862954133}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
Expand Down Expand Up @@ -724,7 +716,6 @@ RectTransform:
- {fileID: 7443519174228978123}
- {fileID: 7578984555558092962}
m_Father: {fileID: 6576503548707075487}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
Expand Down Expand Up @@ -803,7 +794,6 @@ RectTransform:
m_Children:
- {fileID: 8421937229900757569}
m_Father: {fileID: 4610928374356700704}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
Expand Down Expand Up @@ -879,7 +869,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3860574518102806846}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
Expand Down Expand Up @@ -1014,7 +1003,6 @@ RectTransform:
m_Children:
- {fileID: 5347255248473635814}
m_Father: {fileID: 6576503548707075487}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand All @@ -1026,6 +1014,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2565392910590902996}
m_Modifications:
- target: {fileID: 1970022800035106642, guid: cf1d9445172f04a47af67e6e9aa11243,
Expand Down Expand Up @@ -1144,6 +1133,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cf1d9445172f04a47af67e6e9aa11243, type: 3}
--- !u!224 &6566000504069361755 stripped
RectTransform:
Expand All @@ -1156,6 +1148,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6576503548707075487}
m_Modifications:
- target: {fileID: 723462149448302663, guid: 17c845a92d1948c4783ccac4b36e7c7f,
Expand All @@ -1166,7 +1159,7 @@ PrefabInstance:
- target: {fileID: 1195385098958599846, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
propertyPath: m_fontSize
value: 16
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1195385098958599846, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
Expand Down Expand Up @@ -1424,30 +1417,35 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379768942098107845, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
propertyPath: m_Maskable
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6413302395850629107, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6413302395850629107, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6413302395850629107, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
propertyPath: m_SizeDelta.x
value: 360.2459
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6413302395850629107, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 360.2459
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6413302395850629107, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -23
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6813884706578007310, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
Expand Down Expand Up @@ -1521,6 +1519,21 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 7528735507517742048, guid: 17c845a92d1948c4783ccac4b36e7c7f, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3337524177640211239, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
insertIndex: -1
addedObject: {fileID: 3008846098519102333}
- targetCorrespondingSourceObject: {fileID: 3337524177640211239, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
insertIndex: -1
addedObject: {fileID: 266098618862954133}
- targetCorrespondingSourceObject: {fileID: 3337524177640211239, guid: 17c845a92d1948c4783ccac4b36e7c7f,
type: 3}
insertIndex: -1
addedObject: {fileID: 6031130232887263320}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 17c845a92d1948c4783ccac4b36e7c7f, type: 3}
--- !u!114 &88618477953342369 stripped
MonoBehaviour:
Expand Down Expand Up @@ -1557,6 +1570,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4610928374356700704}
m_Modifications:
- target: {fileID: 54622623229548845, guid: ab19e19dd7d19cc4c9bb1876293bcd22,
Expand Down Expand Up @@ -1906,7 +1920,16 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 8360437818873036568, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3}
- {fileID: 1727543226122190079, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3}
--- !u!224 &3008846098519102333 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 54622623229548845, guid: ab19e19dd7d19cc4c9bb1876293bcd22,
type: 3}
m_PrefabInstance: {fileID: 2955381054883564112}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4707442385471252673 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7518669975530283665, guid: ab19e19dd7d19cc4c9bb1876293bcd22,
Expand Down Expand Up @@ -1936,6 +1959,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3860574518102806846}
m_Modifications:
- target: {fileID: 1970022800035106642, guid: cf1d9445172f04a47af67e6e9aa11243,
Expand Down Expand Up @@ -2054,6 +2078,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cf1d9445172f04a47af67e6e9aa11243, type: 3}
--- !u!114 &4073663603671829108 stripped
MonoBehaviour:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13514,6 +13514,31 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1841362506460612451, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1841362506460612451, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1841362506460612451, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_SizeDelta.x
value: 1868
objectReference: {fileID: 0}
- target: {fileID: 1841362506460612451, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 26
objectReference: {fileID: 0}
- target: {fileID: 1841362506460612451, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1854165704178043217, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -14734,6 +14759,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2651917917585423078, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_SizeDelta.y
value: 16
objectReference: {fileID: 0}
- target: {fileID: 2678702222230081650, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -16169,6 +16199,27 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3972278431543044391, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 643485b56259a47ff8f14e9b10fd47bb,
type: 3}
- target: {fileID: 3972278431543044391, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_Color.b
value: 0.33333334
objectReference: {fileID: 0}
- target: {fileID: 3972278431543044391, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_Color.g
value: 0.1764706
objectReference: {fileID: 0}
- target: {fileID: 3972278431543044391, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_PreserveAspect
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3995028678990181137, guid: 01095a78852393446834e68bf8628274,
type: 3}
propertyPath: m_Padding.m_Left
Expand Down
Loading