From 2763cda7de4112319ac87ef425076a006d3e5c3f Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Tue, 10 Sep 2024 15:45:07 +0200 Subject: [PATCH 01/36] added property HasValidCredentials to layerdata, added script that matches Layer UI components to this state --- Assets/Prefabs/UI/Layers/LayerUI.prefab | 26 ++++++++++++++++++- Assets/Scripts/Layers/LayerTypes/LayerData.cs | 15 +++++++++++ .../LayerTypes/Tile3DLayerGameObject.cs | 15 +++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/Assets/Prefabs/UI/Layers/LayerUI.prefab b/Assets/Prefabs/UI/Layers/LayerUI.prefab index c5ab6178..31b05274 100644 --- a/Assets/Prefabs/UI/Layers/LayerUI.prefab +++ b/Assets/Prefabs/UI/Layers/LayerUI.prefab @@ -1890,6 +1890,7 @@ GameObject: - component: {fileID: 8734394992167256324} - component: {fileID: 2127760596796970168} - component: {fileID: 1244387766270603908} + - component: {fileID: 2493342414096201978} m_Layer: 5 m_Name: LayerUI m_TagString: Untagged @@ -1981,6 +1982,23 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &2493342414096201978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6053239577656790416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 719b8a2e4fde8414383ccb57afe059ab, type: 3} + m_Name: + m_EditorClassIdentifier: + visibilityToggle: {fileID: 5123185631202056315} + warningIcon: {fileID: 7119179143932802346} + propertiesToggle: {fileID: 4687843671706769242} + errorProperties: {fileID: 2318706516266730281} + errorColor: {r: 204, g: 215, b: 228, a: 1} --- !u!1 &6171282763605231320 GameObject: m_ObjectHideFlags: 0 @@ -2377,7 +2395,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: 17, y: -15} + m_AnchoredPosition: {x: 43, y: -15} m_SizeDelta: {x: 18, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7280274287743455690 @@ -3067,6 +3085,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &4687843671706769242 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6976806185474757910, guid: 994a472eae9b932499df188f0a8c6da7, + type: 3} + m_PrefabInstance: {fileID: 2439834691497198156} + m_PrefabAsset: {fileID: 0} --- !u!224 &5525388472463666520 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7886391408953765652, guid: 994a472eae9b932499df188f0a8c6da7, diff --git a/Assets/Scripts/Layers/LayerTypes/LayerData.cs b/Assets/Scripts/Layers/LayerTypes/LayerData.cs index 8b39c520..866fe805 100644 --- a/Assets/Scripts/Layers/LayerTypes/LayerData.cs +++ b/Assets/Scripts/Layers/LayerTypes/LayerData.cs @@ -18,6 +18,7 @@ public class LayerData [SerializeField, JsonProperty] protected List children = new(); [JsonIgnore] protected LayerData parent; //not serialized to avoid a circular reference [SerializeField, JsonProperty] protected List layerProperties = new(); + [JsonIgnore] private bool hasValidCredentials = true; //assume credentials are not needed. not serialized because we don't save credentials [JsonIgnore] public RootLayer Root => ProjectData.Current.RootLayer; [JsonIgnore] public LayerData ParentLayer => parent; @@ -78,6 +79,19 @@ public bool ActiveInHierarchy [JsonIgnore] public List LayerProperties => layerProperties; [JsonIgnore] public bool HasProperties => layerProperties.Count > 0; + [JsonIgnore] + public bool HasValidCredentials + { + get + { + return hasValidCredentials; + } + set + { + hasValidCredentials = value; + HasValidCredentialsChanged.Invoke(value); + } + } [JsonIgnore] public readonly UnityEvent NameChanged = new(); [JsonIgnore] public readonly UnityEvent LayerActiveInHierarchyChanged = new(); @@ -92,6 +106,7 @@ public bool ActiveInHierarchy [JsonIgnore] public readonly UnityEvent ParentOrSiblingIndexChanged = new(); [JsonIgnore] public readonly UnityEvent PropertyAdded = new(); [JsonIgnore] public readonly UnityEvent PropertyRemoved = new(); + [JsonIgnore] public readonly UnityEvent HasValidCredentialsChanged = new(); public void InitializeParent(LayerData initialParent = null) { diff --git a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs index bf068766..324ef292 100644 --- a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs +++ b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs @@ -76,11 +76,25 @@ protected void Awake() private void OnEnable() { tileSet.unsupportedExtensionsParsed.AddListener(InvokeUnsupportedExtensionsMessage); + OnServerResponseReceived.AddListener(ProcessServerResponse); } private void OnDisable() { tileSet.unsupportedExtensionsParsed.RemoveListener(InvokeUnsupportedExtensionsMessage); + OnServerResponseReceived.RemoveListener(ProcessServerResponse); + } + + private void ProcessServerResponse(UnityWebRequest request) + { + if (request.result != UnityWebRequest.Result.Success) + { + LayerData.HasValidCredentials = false; + } + else + { + LayerData.HasValidCredentials = true; + } } protected override void Start() @@ -169,6 +183,7 @@ public void LoadProperties(List properties) var urlProperty = (Tile3DLayerPropertyData)properties.FirstOrDefault(p => p is Tile3DLayerPropertyData); if (urlProperty != null) { + urlPropertyData = urlProperty; //use existing object to overwrite the current instance URL = urlProperty.Url; UpdateURL(urlProperty.Url); } From cbef8543978de843f039351550c650659b46ddd2 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Tue, 10 Sep 2024 16:28:58 +0200 Subject: [PATCH 02/36] added script to change visuals, implemented visual changes according to design --- Assets/Prefabs/UI/Layers/LayerUI.prefab | 84 ++++++++++++++++++- .../Prefabs/UI/Layers/LayersInspector.prefab | 52 ++++++++++-- Assets/Scripts/Layers/LayerUI.cs | 45 +++++----- .../LayerUICredentialsNeededListener.cs | 67 +++++++++++++++ .../LayerUICredentialsNeededListener.cs.meta | 11 +++ Assets/Scripts/Layers/LayerUIManager.cs | 9 ++ 6 files changed, 240 insertions(+), 28 deletions(-) create mode 100644 Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs create mode 100644 Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs.meta diff --git a/Assets/Prefabs/UI/Layers/LayerUI.prefab b/Assets/Prefabs/UI/Layers/LayerUI.prefab index 31b05274..4b5d0a20 100644 --- a/Assets/Prefabs/UI/Layers/LayerUI.prefab +++ b/Assets/Prefabs/UI/Layers/LayerUI.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &256186745068380830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2606073466189798341} + - component: {fileID: 8678242057103712426} + - component: {fileID: 94072058954664853} + m_Layer: 5 + m_Name: ErrorLayerTypeImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2606073466189798341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256186745068380830} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6443985419094450393} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 108, y: -15} + m_SizeDelta: {x: 18, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8678242057103712426 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256186745068380830} + m_CullTransparentMesh: 1 +--- !u!114 &94072058954664853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256186745068380830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8195ba93da7d54414990e31bfc4040cd, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &373698079365107918 GameObject: m_ObjectHideFlags: 0 @@ -1938,6 +2013,7 @@ MonoBehaviour: indentWidth: 24 foldoutToggle: {fileID: 2274689754544140435} layerTypeImage: {fileID: 1356745287749164724} + errorLayerTypeImage: {fileID: 94072058954664853} layerNameText: {fileID: 4813776858706825396} layerNameField: {fileID: 8882207419444401735} childrenPanel: {fileID: 4186340492675122666} @@ -1996,9 +2072,14 @@ MonoBehaviour: m_EditorClassIdentifier: visibilityToggle: {fileID: 5123185631202056315} warningIcon: {fileID: 7119179143932802346} + colorButton: {fileID: 1246104368878952832} + errorColorButton: {fileID: 1364647141408763194} propertiesToggle: {fileID: 4687843671706769242} errorProperties: {fileID: 2318706516266730281} - errorColor: {r: 204, g: 215, b: 228, a: 1} + layerNameText: {fileID: 4813776858706825396} + layerTypeImage: {fileID: 1356745287749164724} + errorLayerTypeImage: {fileID: 94072058954664853} + errorColor: {r: 0.8, g: 0.84313726, b: 0.89411765, a: 1} --- !u!1 &6171282763605231320 GameObject: m_ObjectHideFlags: 0 @@ -2486,6 +2567,7 @@ RectTransform: - {fileID: 6333340918868435643} - {fileID: 5971628678058090479} - {fileID: 8312362831220139269} + - {fileID: 2606073466189798341} - {fileID: 3011691865847377540} - {fileID: 7499595349914018578} - {fileID: 5525388472463666520} diff --git a/Assets/Prefabs/UI/Layers/LayersInspector.prefab b/Assets/Prefabs/UI/Layers/LayersInspector.prefab index a2112055..4abe4c70 100644 --- a/Assets/Prefabs/UI/Layers/LayersInspector.prefab +++ b/Assets/Prefabs/UI/Layers/LayersInspector.prefab @@ -539,7 +539,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 054dbe152f39f4f39b7a492ae71e5987, type: 3} m_Name: m_EditorClassIdentifier: - projectData: {fileID: 11400000, guid: 7ccd35fc676b4ba41b52cfdea07e34ef, type: 2} LayerUIPrefab: {fileID: 2127760596796970168, guid: 67f661495874545c8847acccfa777e7e, type: 3} layerTypeSprites: @@ -553,6 +552,17 @@ MonoBehaviour: - {fileID: 21300000, guid: 4c0989c5e9ec1404ab9e3523c94f6b29, type: 3} - {fileID: 21300000, guid: 1c8435c321d2348d6b890dae0769264b, type: 3} - {fileID: 21300000, guid: 302449484203745dbac0d82605206394, type: 3} + disabledLayerTypeSprites: + - {fileID: 21300000, guid: 8195ba93da7d54414990e31bfc4040cd, type: 3} + - {fileID: 21300000, guid: 564f756d525e542b1a8a4e2f0801dabd, type: 3} + - {fileID: 21300000, guid: 8195ba93da7d54414990e31bfc4040cd, type: 3} + - {fileID: 21300000, guid: 1922596620fa144e6ae6068957587ee9, type: 3} + - {fileID: 21300000, guid: c7c08f8ece25d4fb9bda6ab15c59e8ef, type: 3} + - {fileID: 21300000, guid: 30db9e94c1c4c448dbfd765724679bbf, type: 3} + - {fileID: 21300000, guid: 60568f85042a643e3b319a4b356e7704, type: 3} + - {fileID: 21300000, guid: b4dbc949f58ca6e4c96a1ffdc7c62f63, type: 3} + - {fileID: 21300000, guid: 8195ba93da7d54414990e31bfc4040cd, type: 3} + - {fileID: 21300000, guid: 8195ba93da7d54414990e31bfc4040cd, type: 3} layerUIContainer: {fileID: 4503089938938308058} dragGhostPrefab: {fileID: -5549004017849562441, guid: f37464b169eec47cf8d80ee264145f3f, type: 3} @@ -1413,17 +1423,17 @@ PrefabInstance: - target: {fileID: 6642786459307162966, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6642786459307162966, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6642786459307162966, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 88.46 objectReference: {fileID: 0} - target: {fileID: 6642786459307162966, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} @@ -1433,12 +1443,12 @@ PrefabInstance: - target: {fileID: 6642786459307162966, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.77000046 + value: 957.23 objectReference: {fileID: 0} - target: {fileID: 6642786459307162966, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -9 objectReference: {fileID: 0} - target: {fileID: 6792633624716269715, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} @@ -1470,6 +1480,36 @@ PrefabInstance: propertyPath: layerUIManager value: objectReference: {fileID: 284876463517830170} + - target: {fileID: 7066990467744404531, guid: a1d12948b2baf466d9b8bf9980e98e47, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7066990467744404531, guid: a1d12948b2baf466d9b8bf9980e98e47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7066990467744404531, guid: a1d12948b2baf466d9b8bf9980e98e47, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7066990467744404531, guid: a1d12948b2baf466d9b8bf9980e98e47, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7066990467744404531, guid: a1d12948b2baf466d9b8bf9980e98e47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7066990467744404531, guid: a1d12948b2baf466d9b8bf9980e98e47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7275960957246304947, guid: a1d12948b2baf466d9b8bf9980e98e47, type: 3} propertyPath: layerManager diff --git a/Assets/Scripts/Layers/LayerUI.cs b/Assets/Scripts/Layers/LayerUI.cs index 003f49f9..2ba73edd 100644 --- a/Assets/Scripts/Layers/LayerUI.cs +++ b/Assets/Scripts/Layers/LayerUI.cs @@ -45,6 +45,7 @@ public class LayerUI : MonoBehaviour, IPointerDownHandler, IDragHandler, IBeginD [SerializeField] private float indentWidth = 40f; [SerializeField] private Toggle foldoutToggle; [SerializeField] private Image layerTypeImage; + [SerializeField] private Image errorLayerTypeImage; [SerializeField] private TMP_Text layerNameText; [SerializeField] private TMP_InputField layerNameField; [SerializeField] private RectTransform childrenPanel; @@ -75,7 +76,7 @@ public class LayerUI : MonoBehaviour, IPointerDownHandler, IDragHandler, IBeginD public Sprite LayerTypeSprite => layerTypeImage.sprite; public string LayerName => Layer.Name; public bool PropertiesOpen => propertyToggle.isOn; - + private int Depth => ParentUI ? ParentUI.Depth + 1 : 0; private void Awake() @@ -104,18 +105,18 @@ private void OnEnabledToggleValueChanged(bool isOn) { Layer.ActiveSelf = isOn; } - + private void OnFoldoutToggleValueChanged(bool isOn) { UpdateFoldout(); RecalculateVisibleHierarchyRecursive(); } - + private void OnInputFieldChanged(string newName) { Layer.Name = newName; } - + private void Start() { Layer.NameChanged.AddListener(OnNameChanged); @@ -128,7 +129,7 @@ private void Start() Layer.LayerDestroyed.AddListener(DestroyUI); MarkLayerUIAsDirty(); - + //Match initial layer states SetParent(layerUIManager.GetLayerUI(Layer.ParentLayer), Layer.SiblingIndex); // needed because eventListener is not assigned yet when calling layer.SetParent immediately after creating a layer object if (Layer.IsSelected) @@ -137,27 +138,27 @@ private void Start() UpdateColor(Layer.Color); RegisterWithPropertiesPanel(Properties.Instance); } - + private void OnNameChanged(string newName) { gameObject.name = newName; } - + private void UpdateEnabledToggle(bool isOn) { enabledToggle.SetIsOnWithoutNotify(isOn); RecalculateCurrentTreeStates(); SetEnabledToggleInteractiveStateRecursive(); } - + private void UpdateColor(Color newColor) - { + { var opaqueColor = newColor; opaqueColor.a = 1; colorButton.targetGraphic.color = opaqueColor; } - + private void OnLayerSelected(LayerData layer) { SelectUI(); @@ -167,17 +168,17 @@ private void OnLayerDeselected(LayerData layer) { DeselectUI(); } - + private void OnLayerChildrenChanged() { RecalculateCurrentTreeStates(); } - + private void OnParentOrSiblingIndexChanged(int newSiblingIndex) { SetParent(layerUIManager.GetLayerUI(Layer.ParentLayer), newSiblingIndex); } - + private void DestroyUI() { // Unparent before deleting to avoid UI being destroyed multiple times (through DestroyUI and as a @@ -224,7 +225,7 @@ private void SetEnabledToggleInteractiveStateRecursive() foreach (var child in ChildrenUI) child.SetEnabledToggleInteractiveStateRecursive(); } - + private void SetVisibilitySprite() { debugIndexText.text = State.ToString(); @@ -258,7 +259,7 @@ private void RecalculateState() SetVisibilitySprite(); } - + public void SetParent(LayerUI newParent, int siblingIndex = -1) { if (newParent == this) @@ -348,6 +349,8 @@ private void SetLayerTypeImage() { var sprite = layerUIManager.GetLayerTypeSprite(Layer); layerTypeImage.sprite = sprite; + if (errorLayerTypeImage) + errorLayerTypeImage.sprite = layerUIManager.GetDisabledLayerTypeSprite(sprite); } private void UpdateFoldout() @@ -609,7 +612,7 @@ public void OnDrag(PointerEventData eventData) //has to be here or OnBeginDrag a private void RemoveHoverHighlight(LayerUI ui) { if (!ui) return; - + var state = InteractionState.Default; if (ui.Layer.IsSelected) state = InteractionState.Selected; @@ -691,7 +694,7 @@ private void OnDestroy() Layer.ChildrenChanged.RemoveListener(OnLayerChildrenChanged); Layer.ParentOrSiblingIndexChanged.RemoveListener(OnParentOrSiblingIndexChanged); Layer.LayerDestroyed.RemoveListener(DestroyUI); - + if (ParentUI) ParentUI.RecalculateParentAndChildren(); @@ -703,10 +706,10 @@ private void RegisterWithPropertiesPanel(Properties propertiesPanel) var layerWithProperties = Properties.TryFindProperties(Layer); var hasProperties = layerWithProperties != null && layerWithProperties.GetPropertySections().Count > 0; propertyToggle.gameObject.SetActive(hasProperties); - - if(!hasProperties) + + if (!hasProperties) return; - + propertyToggle.group = propertiesPanel.GetComponent(); propertyToggle.onValueChanged.AddListener((onOrOff) => ToggleProperties(onOrOff, propertiesPanel)); ToggleProperties(propertyToggle.isOn, propertiesPanel); @@ -716,7 +719,7 @@ public void ToggleProperties(bool onOrOff) { propertyToggle.isOn = onOrOff; } - + private void ToggleProperties(bool onOrOff, Properties properties) { var layerWithProperties = Properties.TryFindProperties(Layer); diff --git a/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs b/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs new file mode 100644 index 00000000..ed2b4527 --- /dev/null +++ b/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs @@ -0,0 +1,67 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Netherlands3D.Twin.Layers.LayerTypes; +using Netherlands3D.Twin.UI.LayerInspector; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace Netherlands3D.Twin +{ + public class LayerUICredentialsNeededListener : MonoBehaviour + { + private LayerUI layerUI; + private LayerUIManager layerUIManager; + + [SerializeField] private GameObject visibilityToggle; + [SerializeField] private GameObject warningIcon; + [SerializeField] private GameObject colorButton; + [SerializeField] private GameObject errorColorButton; + [SerializeField] private GameObject propertiesToggle; + [SerializeField] private GameObject errorProperties; + + [SerializeField] private TMP_Text layerNameText; + private Color originalTextColor; + + [SerializeField] private Image layerTypeImage; + [SerializeField] private Image errorLayerTypeImage; + + [SerializeField] private Color errorColor = new Color(0.8f, 0.8431372549019608f, 0.8941176470588236f); + + private void Awake() + { + layerUI = GetComponent(); + layerUIManager = GetComponentInParent(); + } + + private void Start() + { + originalTextColor = layerNameText.color; + + SetUI(layerUI.Layer.HasValidCredentials); //set initial state + layerUI.Layer.HasValidCredentialsChanged.AddListener(SetUI); + } + + private void SetUI(bool hasValidCredentials) + { + visibilityToggle.SetActive(hasValidCredentials); + warningIcon.SetActive(!hasValidCredentials); + colorButton.SetActive(hasValidCredentials); + errorColorButton.SetActive(!hasValidCredentials); + propertiesToggle.SetActive(hasValidCredentials); + errorProperties.SetActive(!hasValidCredentials); + + layerNameText.color = hasValidCredentials ? originalTextColor : errorColor; + + layerTypeImage.gameObject.SetActive(hasValidCredentials); + errorLayerTypeImage.gameObject.SetActive(!hasValidCredentials); + } + + private void OnDestroy() + { + var layerUI = GetComponent(); + layerUI.Layer.HasValidCredentialsChanged.RemoveListener(SetUI); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs.meta b/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs.meta new file mode 100644 index 00000000..ead28267 --- /dev/null +++ b/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 719b8a2e4fde8414383ccb57afe059ab +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Layers/LayerUIManager.cs b/Assets/Scripts/Layers/LayerUIManager.cs index fa344e8b..a9aa600c 100644 --- a/Assets/Scripts/Layers/LayerUIManager.cs +++ b/Assets/Scripts/Layers/LayerUIManager.cs @@ -16,6 +16,7 @@ public class LayerUIManager : MonoBehaviour, IPointerDownHandler [SerializeField] private LayerUI LayerUIPrefab; [SerializeField] private List layerTypeSprites; + [SerializeField] private List disabledLayerTypeSprites; [SerializeField] private RectTransform layerUIContainer; public RectTransform LayerUIContainer => layerUIContainer; @@ -192,6 +193,14 @@ private Sprite GetProxyLayerSprite(LayerGameObject layer) } } + public Sprite GetDisabledLayerTypeSprite(Sprite original) + { + var index = layerTypeSprites.IndexOf(original); + if(index >= 0 && index < disabledLayerTypeSprites.Count) + return disabledLayerTypeSprites[index]; + return disabledLayerTypeSprites[0]; + } + public void EnableContextMenu(bool enable, Vector2 position = default) { if (contextMenu) From c80242de3f4f58fbda8172a7ec546e1213f02899 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 30 Sep 2024 10:43:25 +0200 Subject: [PATCH 03/36] manually re-added missing property and event --- Assets/Scripts/Layers/LayerTypes/LayerData.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Assets/Scripts/Layers/LayerTypes/LayerData.cs b/Assets/Scripts/Layers/LayerTypes/LayerData.cs index 07c03a43..f16189bf 100644 --- a/Assets/Scripts/Layers/LayerTypes/LayerData.cs +++ b/Assets/Scripts/Layers/LayerTypes/LayerData.cs @@ -20,6 +20,7 @@ public class LayerData [SerializeField, DataMember] protected List children = new(); [JsonIgnore] protected LayerData parent; //not serialized to avoid a circular reference [SerializeField, DataMember] protected List layerProperties = new(); + [JsonIgnore] private bool hasValidCredentials = true; //assume credentials are not needed. not serialized because we don't save credentials [JsonIgnore] public RootLayer Root => ProjectData.Current.RootLayer; [JsonIgnore] public LayerData ParentLayer => parent; @@ -92,6 +93,20 @@ [JsonIgnore] public List LayerProperties } } + [JsonIgnore] + public bool HasValidCredentials + { + get + { + return hasValidCredentials; + } + set + { + hasValidCredentials = value; + HasValidCredentialsChanged.Invoke(value); + } + } + [JsonIgnore] public bool HasProperties => layerProperties.Count > 0; [JsonIgnore] public readonly UnityEvent NameChanged = new(); @@ -107,6 +122,7 @@ [JsonIgnore] public List LayerProperties [JsonIgnore] public readonly UnityEvent ParentOrSiblingIndexChanged = new(); [JsonIgnore] public readonly UnityEvent PropertyAdded = new(); [JsonIgnore] public readonly UnityEvent PropertyRemoved = new(); + [JsonIgnore] public readonly UnityEvent HasValidCredentialsChanged = new(); public void InitializeParent(LayerData initialParent = null) { From 4fd75863e09c14f0f01ccefc49ad87a048795856 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 08:27:10 +0200 Subject: [PATCH 04/36] started separating credentials ui and logic --- .../3DTiles/RealityMesh (3D Tiles).prefab | 25 +- .../ObjectLibrary/OBJLayerGameObject.prefab | 118 +++++++++ .../OBJLayerGameObject.prefab.meta | 7 + .../CredentialsPropertySection.prefab | 16 +- ...b => CredentialStatusPropertyPanel.prefab} | 45 ++-- ...CredentialStatusPropertyPanel.prefab.meta} | 0 .../GoogleRealityMeshConfigurationAdapter.cs | 4 +- .../Tiles3DContentOverlayInspector.cs | 16 +- .../LayerTypes/ILayerWithCredentials.cs | 2 +- .../LayerTypes/Tile3DLayerGameObject.cs | 17 +- .../CredentialsInputPropertySection.cs | 106 ++++++++ ...> CredentialsInputPropertySection.cs.meta} | 0 .../CredentialsPropertySection.cs | 245 ------------------ .../CredentialsPropertySectionInstantiator.cs | 18 +- .../CredentialsValidationPropertySection.cs | 56 ++++ ...edentialsValidationPropertySection.cs.meta | 11 + .../PropertyPanels/LayerCredentialsHandler.cs | 224 ++++++++++++++++ .../LayerCredentialsHandler.cs.meta | 11 + 18 files changed, 625 insertions(+), 296 deletions(-) create mode 100644 Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab create mode 100644 Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab.meta rename Assets/Prefabs/UI/Sidebar/SpecificComponents/{Reauthenticate.prefab => CredentialStatusPropertyPanel.prefab} (99%) rename Assets/Prefabs/UI/Sidebar/SpecificComponents/{Reauthenticate.prefab.meta => CredentialStatusPropertyPanel.prefab.meta} (100%) create mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs rename Assets/Scripts/Layers/Properties/PropertyPanels/{CredentialsPropertySection.cs.meta => CredentialsInputPropertySection.cs.meta} (100%) delete mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySection.cs create mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs create mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs.meta create mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs create mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs.meta diff --git a/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab b/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab index 725a8a0f..26d3afc9 100644 --- a/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab +++ b/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab @@ -19,6 +19,7 @@ GameObject: - component: {fileID: -5688274655914667246} - component: {fileID: -3892557586120215936} - component: {fileID: 379969814246679949} + - component: {fileID: 6181233540970977359} m_Layer: 6 m_Name: RealityMesh (3D Tiles) m_TagString: Untagged @@ -79,10 +80,12 @@ MonoBehaviour: boundingVolumeType: 0 values: [] BottomLeft: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] TopRight: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] @@ -156,10 +159,12 @@ MonoBehaviour: boundingVolumeType: 0 values: [] BottomLeft: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] TopRight: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] @@ -329,6 +334,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 284d1c20d5a85488d9fd5444dc075baf, type: 3} m_Name: m_EditorClassIdentifier: + prefabIdentifier: 71fff5c85650fcd4d9f59e4e182b5e95 onShow: m_PersistentCalls: m_Calls: [] @@ -336,7 +342,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] usePropertySections: 1 - openPropertiesOnStart: 1 UnsupportedExtensionsMessage: m_PersistentCalls: m_Calls: [] @@ -352,7 +357,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 630f741154ed48488dc6602ef25dab3a, type: 3} m_Name: m_EditorClassIdentifier: - origin: {fileID: 0} worldTransformShifter: {fileID: -3892557586120215936} referenceCoordinateSystem: 4326 onPreShift: @@ -386,8 +390,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: autoApplyCredentials: 1 - propertySectionPrefab: {fileID: -860560823292524916, guid: f241bd5b609aa4447ae89fb4325470ef, + inputPropertySectionPrefab: {fileID: 4139614324750460760, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} OnCredentialsPropertySectionInstantiated: m_PersistentCalls: m_Calls: [] +--- !u!114 &6181233540970977359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7974831043381414785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3b2880c796b146d191c4b41da5c526b, type: 3} + m_Name: + m_EditorClassIdentifier: + findKeyInVaultOnURLChange: 1 + keyVault: {fileID: 11400000, guid: dc14abcfb42578a4394b67591fc8ad1e, type: 2} + autoApplyCredentials: 1 diff --git a/Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab b/Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab new file mode 100644 index 00000000..b8ab6c0c --- /dev/null +++ b/Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab @@ -0,0 +1,118 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3937650689336427930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3322842894136088838} + - component: {fileID: -18391829949753534} + - component: {fileID: 221556199992705649} + - component: {fileID: 5199055326224624808} + - component: {fileID: -1110989767012178270} + - component: {fileID: -2184178992114909871} + m_Layer: 0 + m_Name: OBJLayerGameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3322842894136088838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3937650689336427930} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-18391829949753534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3937650689336427930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 630f741154ed48488dc6602ef25dab3a, type: 3} + m_Name: + m_EditorClassIdentifier: + worldTransformShifter: {fileID: 0} + referenceCoordinateSystem: 4979 + onPreShift: + m_PersistentCalls: + m_Calls: [] + onPostShift: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &221556199992705649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3937650689336427930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 92795e992dcbe4b3c8ada171c5551674, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabIdentifier: 69439623527f94aeba831877c30c088e + onShow: + m_PersistentCalls: + m_Calls: [] + onHide: + m_PersistentCalls: + m_Calls: [] + objectCreated: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5199055326224624808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3937650689336427930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 374a4172ed370412f9cd812f206f98f0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &-1110989767012178270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3937650689336427930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8cceefce4ff4530b78245056d126688, type: 3} + m_Name: + m_EditorClassIdentifier: + propertySectionPrefab: {fileID: 0} +--- !u!114 &-2184178992114909871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3937650689336427930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 853853f6f5bff49d3bc79215e1ebbea8, type: 3} + m_Name: + m_EditorClassIdentifier: + convertToggle: {fileID: 0} diff --git a/Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab.meta b/Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab.meta new file mode 100644 index 00000000..45de85a3 --- /dev/null +++ b/Assets/Prefabs/ObjectLibrary/OBJLayerGameObject.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69439623527f94aeba831877c30c088e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab index 19a68775..5bd580a2 100644 --- a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab +++ b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab @@ -465,8 +465,6 @@ MonoBehaviour: headerWithCredentialTypeDropdown: {fileID: 8614721123552596982} credentialTypeDropdown: {fileID: 1208963087933705121} errorMessage: {fileID: 8623644015317721457} - findKeyInVaultOnURLChange: 1 - keyVault: {fileID: 11400000, guid: dc14abcfb42578a4394b67591fc8ad1e, type: 2} --- !u!1001 &8099856209361245446 PrefabInstance: m_ObjectHideFlags: 0 @@ -888,17 +886,17 @@ PrefabInstance: - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 68.32 objectReference: {fileID: 0} - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -913,7 +911,7 @@ PrefabInstance: - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 4190861408758051029, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -993,7 +991,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1003,7 +1001,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1058,7 +1056,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -105.3429 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Reauthenticate.prefab b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab similarity index 99% rename from Assets/Prefabs/UI/Sidebar/SpecificComponents/Reauthenticate.prefab rename to Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab index 01f173a9..7cb1e922 100644 --- a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Reauthenticate.prefab +++ b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab @@ -35,10 +35,10 @@ RectTransform: - {fileID: 4021479921507654788} m_Father: {fileID: 8214791640540355321} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 172.01585, y: 0} - m_SizeDelta: {x: 308.0317, y: 48.7211} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3784876728717632333 CanvasRenderer: @@ -3892,8 +3892,9 @@ GameObject: - component: {fileID: 8900216667368085455} - component: {fileID: 1537685062570398413} - component: {fileID: 7740096372769682743} + - component: {fileID: 4139614324750460760} m_Layer: 5 - m_Name: Reauthenticate + m_Name: CredentialStatusPropertyPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4016,6 +4017,20 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!114 &4139614324750460760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6130069684234356313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b8a8ed3eaf9144115a10483962e11053, type: 3} + m_Name: + m_EditorClassIdentifier: + validCredentialsPanel: {fileID: 6362988405208082338} + invalidCredentialsPanel: {fileID: 7898008316363899058} --- !u!1 &6362988405208082338 GameObject: m_ObjectHideFlags: 0 @@ -4035,7 +4050,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8214791640540355321 RectTransform: m_ObjectHideFlags: 0 @@ -4051,10 +4066,10 @@ RectTransform: - {fileID: 2581016988260149482} m_Father: {fileID: 5507835546160925638} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 172.01585, y: -92.55635} - m_SizeDelta: {x: 344.0317, y: 62.7211} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 62.7211} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1241544358955960822 CanvasRenderer: @@ -7530,7 +7545,7 @@ PrefabInstance: - target: {fileID: 1518934753131645070, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_SizeDelta.y - value: 15.74 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1518934753131645070, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -7741,22 +7756,22 @@ PrefabInstance: - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchoredPosition.x - value: 21.924149 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchoredPosition.y - value: -18.6494 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Reauthenticate.prefab.meta b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Sidebar/SpecificComponents/Reauthenticate.prefab.meta rename to Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab.meta diff --git a/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs b/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs index b24e7c26..7c7829da 100644 --- a/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs +++ b/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs @@ -30,9 +30,9 @@ private void Awake() read3DTileset.enabled = true; } - private void CredentialsPropertySectionInstantiated(CredentialsPropertySection credentialsPropertySection) + private void CredentialsPropertySectionInstantiated(CredentialsValidationPropertySection credentialsInputPropertySection) { - credentialsPropertySection.SetInputFieldsValues(key: configuration.ApiKey); + // credentialsInputPropertySection.SetInputFieldsValues(key: configuration.ApiKey); } } } \ No newline at end of file diff --git a/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs b/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs index c678099d..7a586e19 100644 --- a/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs +++ b/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs @@ -1,6 +1,8 @@ using Netherlands3D.Twin.Layers; +using Netherlands3D.Twin.Layers.Properties; using UnityEngine; using UnityEngine.Networking; +using UnityEngine.Serialization; namespace Netherlands3D.Twin.UI.LayerInspector { @@ -11,8 +13,8 @@ public class Tiles3DContentOverlayInspector : OverlayInspector [Tooltip("The same URL input is used here, as the one used in the property panel")] [SerializeField] private Tile3DLayerPropertySection tile3DLayerPropertySection; - [Tooltip("The same credentials input is used here, as the one used in the property panel")] [SerializeField] - private CredentialsPropertySection credentialsPropertySection; + [FormerlySerializedAs("credentialsPropertySection")] [Tooltip("The same credentials input is used here, as the one used in the property panel")] + [SerializeField] private LayerCredentialsHandler credentialsHandler; [SerializeField] private RectTransform credentialExplanation; @@ -45,7 +47,7 @@ private void ServerResponseReceived(UnityWebRequest webRequestResult) if (webRequestResult.ReturnedServerError()) { credentialExplanation.gameObject.SetActive(false); - credentialsPropertySection.gameObject.SetActive(false); + credentialsHandler.gameObject.SetActive(false); } } @@ -54,7 +56,7 @@ private void OnEnable() keyVault.OnAuthorizationTypeDetermined.AddListener(DeterminedAuthorizationType); //Hide the credentials section by default. Only activated if we determine the URL needs credentials - credentialsPropertySection.gameObject.SetActive(false); + credentialsHandler.gameObject.SetActive(false); credentialExplanation.gameObject.SetActive(false); } @@ -95,9 +97,9 @@ private void DeterminedAuthorizationType(string url, AuthorizationType authoriza default: //Something went wrong, show the credentials section, starting with a default authentication input type var startingAuthenticationType = keyVault.GetKnownAuthorizationTypeForURL(url); - credentialsPropertySection.LayerWithCredentials = layerGameObjectWithCredentials; - credentialsPropertySection.SetAuthorizationInputType(startingAuthenticationType); - credentialsPropertySection.gameObject.SetActive(true); + // credentialsHandler.LayerWithCredentials = layerGameObjectWithCredentials; + credentialsHandler.SetAuthorizationInputType(startingAuthenticationType); + // credentialsHandler.gameObject.SetActive(true); credentialExplanation.gameObject.SetActive(true); break; } diff --git a/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs b/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs index 7e635a4d..4a61fc7a 100644 --- a/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs +++ b/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs @@ -9,7 +9,7 @@ namespace Netherlands3D.Twin.Layers.LayerTypes { public interface ILayerWithCredentials { - public CredentialsPropertySection PropertySection { get; set; } + // public CredentialsInputPropertySection InputPropertySection { get; set; } public UnityEvent OnServerResponseReceived { get; } public UnityEvent OnURLChanged { get; } diff --git a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs index 324ef292..3dcebffe 100644 --- a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs +++ b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs @@ -54,13 +54,13 @@ private void EnableTileset() tileSet.RefreshTiles(); } - private CredentialsPropertySection propertySection; - - public CredentialsPropertySection PropertySection - { - get => propertySection; - set => propertySection = value; - } + // private CredentialsInputPropertySection inputPropertySection; + // + // public CredentialsInputPropertySection InputPropertySection + // { + // get => inputPropertySection; + // set => inputPropertySection = value; + // } protected void Awake() { @@ -71,6 +71,9 @@ protected void Awake() propertySections = GetComponents().ToList(); else propertySections = new(); + + if (!GetComponent()) + gameObject.AddComponent(); } private void OnEnable() diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs new file mode 100644 index 00000000..96da1acd --- /dev/null +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs @@ -0,0 +1,106 @@ +using System; +using TMPro; +using UnityEngine; + +namespace Netherlands3D.Twin.Layers.Properties +{ + public class CredentialsInputPropertySection : MonoBehaviour + { + private LayerCredentialsHandler handler; + + [SerializeField] private TMP_InputField userNameInputField; + [SerializeField] private TMP_InputField passwordInputField; + [SerializeField] private TMP_InputField keyTokenOrCodeInputField; + [SerializeField] private TMP_Text keyTokenOrCodeLabel; + + [SerializeField] private Transform headerDefault; + [SerializeField] private Transform headerWithCredentialTypeDropdown; + [SerializeField] private TMP_Dropdown credentialTypeDropdown; + [SerializeField] private Transform errorMessage; + private bool skipFirstCredentialErrorMessage = true; + + private void Awake() + { + handler = GetComponent(); + if (!handler) + handler = gameObject.AddComponent(); + } + + private void OnEnable() + { + errorMessage.gameObject.SetActive(false); + } + + private void OnDisable() + { + } + + public void ShowCredentialsWarning() + { + //First failure from server may be ignored, because we want to give the user a chance to fill in the credentials via the credentials panel + if(skipFirstCredentialErrorMessage) + { + skipFirstCredentialErrorMessage = false; + return; + } + + //For now a standard text is shown. + errorMessage.gameObject.SetActive(true); + } + + public void CloseFailedFeedback() + { + errorMessage.gameObject.SetActive(false); + } + + /// + /// Apply the credentials input fields and start checking our authorization vault + /// + public void ApplyCredentials() + { + errorMessage.gameObject.SetActive(false); + + switch(handler.AuthorizationType) + { + case AuthorizationType.UsernamePassword: + handler.UserName = userNameInputField.text; + handler.PasswordOrKeyOrTokenOrCode = passwordInputField.text; + break; + case AuthorizationType.InferableSingleKey: + handler.PasswordOrKeyOrTokenOrCode = keyTokenOrCodeInputField.text; + break; + } + + handler.ApplyCredentials(); + } + + /// + /// Set the authorization input type and update the UI + /// + public void SetAuthorizationInputType(int type) + { + handler.SetAuthorizationInputType((AuthorizationType)type); + } + + public void SetAuthorizationInputType(AuthorizationType type) + { + handler.SetAuthorizationInputType(type); + + credentialTypeDropdown.value = (int)type; + + //Similar values are not reapplied, so make sure to the dropdown items appear + if (credentialTypeDropdown.TryGetComponent(out DropdownSelection dropdownSelection)) + dropdownSelection.DropdownSelectItem(credentialTypeDropdown.value); + } + + /// + /// Fill the inputs with predefined values + /// + public void SetInputFieldsValues(string username = "", string password = "", string key = "") + { + if(username.Length > 0) userNameInputField.text = username; + if(password.Length > 0) passwordInputField.text = password; + if(key.Length > 0) keyTokenOrCodeInputField.text = key; + } + } +} diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySection.cs.meta b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs.meta similarity index 100% rename from Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySection.cs.meta rename to Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs.meta diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySection.cs deleted file mode 100644 index e048ed1b..00000000 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySection.cs +++ /dev/null @@ -1,245 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Netherlands3D.Twin.Layers.LayerTypes; -using TMPro; -using UnityEngine; -using UnityEngine.Networking; -using Netherlands3D.Web; -using System; -using System.Collections.Specialized; -using UnityEngine.Events; - -namespace Netherlands3D.Twin -{ - public class CredentialsPropertySection : MonoBehaviour - { - [SerializeField] private TMP_InputField userNameInputField; - [SerializeField] private TMP_InputField passwordInputField; - [SerializeField] private TMP_InputField keyTokenOrCodeInputField; - [SerializeField] private TMP_Text keyTokenOrCodeLabel; - - [SerializeField] private Transform headerDefault; - [SerializeField] private Transform headerWithCredentialTypeDropdown; - [SerializeField] private TMP_Dropdown credentialTypeDropdown; - [SerializeField] private Transform errorMessage; - private bool skipFirstCredentialErrorMessage = true; - - [Header("Settings")] - [SerializeField] private bool findKeyInVaultOnURLChange = true; - - [Tooltip("KeyVault Scriptable Object")] [SerializeField] private KeyVault keyVault; - private AuthorizationType authorizationType = AuthorizationType.Public; - private StoredAuthorization storedAuthorization; - - private bool autoApplyCredentials = false; - public bool AutoApplyCredentials - { - get => autoApplyCredentials; - set => autoApplyCredentials = value; - } - - private ILayerWithCredentials layerWithCredentials; - public ILayerWithCredentials LayerWithCredentials { - get - { - return layerWithCredentials; - } - set - { - if(layerWithCredentials != null) - { - layerWithCredentials.OnURLChanged.RemoveListener(UrlHasChanged); - layerWithCredentials.OnServerResponseReceived.RemoveListener(HandleServerResponse); - } - layerWithCredentials = value; - - if(layerWithCredentials != null) - { - layerWithCredentials.OnURLChanged.AddListener(UrlHasChanged); - layerWithCredentials.OnServerResponseReceived.AddListener(HandleServerResponse); - - UrlHasChanged(layerWithCredentials.URL); - } - } - } - - private void OnEnable() { - errorMessage.gameObject.SetActive(false); - - keyVault.OnAuthorizationTypeDetermined.AddListener(OnCredentialTypeDetermined); - } - - private void OnDisable() - { - keyVault.OnAuthorizationTypeDetermined.RemoveListener(OnCredentialTypeDetermined); - - if(LayerWithCredentials != null) - LayerWithCredentials.OnURLChanged.RemoveListener(UrlHasChanged); - } - - public void ShowCredentialsWarning() - { - //First failure from server may be ignored, because we want to give the user a chance to fill in the credentials via the credentials panel - if(skipFirstCredentialErrorMessage) - { - skipFirstCredentialErrorMessage = false; - return; - } - - //For now a standard text is shown. - errorMessage.gameObject.SetActive(true); - } - - public void HandleServerResponse(UnityWebRequest webRequest) - { - if(webRequest.ReturnedServerError()) - { - //Disable credentials property section if we get a server error (not tied to credentials) - Debug.LogWarning("Server request failed: " + webRequest); - gameObject.SetActive(false); - } - else if(webRequest.RequiresCredentials()) - { - Debug.LogWarning("Credentials required: " + webRequest); - //Show a credentials warning if the server request failed for another reason (probably tied to credential failure) - ShowCredentialsWarning(); - } - } - - public void CloseFailedFeedback() - { - errorMessage.gameObject.SetActive(false); - - //Gob back to our generic guess field type so we can retry again - authorizationType = AuthorizationType.InferableSingleKey; - SetAuthorizationInputType(authorizationType); - } - - private void UrlHasChanged(string newURL) - { - //New url. If we already got this one in the vault, apply the credentials - if(findKeyInVaultOnURLChange) - { - storedAuthorization = keyVault.GetStoredAuthorization(newURL); - - if(storedAuthorization != null) - { - Debug.Log("Found stored authorization for: " + newURL + " with type: " + storedAuthorization.authorizationType); - authorizationType = storedAuthorization.authorizationType; - userNameInputField.text = storedAuthorization.username; - passwordInputField.text = storedAuthorization.password; - keyTokenOrCodeInputField.text = storedAuthorization.key; - } - else - { - authorizationType = keyVault.GetKnownAuthorizationTypeForURL(newURL); - } - - SetAuthorizationInputType(authorizationType); - - if(AutoApplyCredentials) - ApplyCredentials(); - } - } - - /// - /// Apply the credentials input fields and start checking our authorization vault - /// - public void ApplyCredentials() - { - errorMessage.gameObject.SetActive(false); - - switch(authorizationType) - { - case AuthorizationType.UsernamePassword: - keyVault.TryBasicAuthentication( - LayerWithCredentials.URL, - userNameInputField.text, - passwordInputField.text - ); - break; - case AuthorizationType.InferableSingleKey: - keyVault.TryToFindSpecificCredentialType( - LayerWithCredentials.URL, - keyTokenOrCodeInputField.text - ); - break; - } - } - - private void OnCredentialTypeDetermined(string url, AuthorizationType type) - { - credentialTypeDropdown.value = (int)type; - authorizationType = type; - - switch(type) - { - case AuthorizationType.UsernamePassword: - layerWithCredentials.SetCredentials(userNameInputField.text, passwordInputField.text); - break; - case AuthorizationType.BearerToken: - layerWithCredentials.SetBearerToken(keyTokenOrCodeInputField.text); - break; - case AuthorizationType.Key: - layerWithCredentials.SetKey(keyTokenOrCodeInputField.text); - break; - case AuthorizationType.Code: - layerWithCredentials.SetCode(keyTokenOrCodeInputField.text); - break; - case AuthorizationType.Token: - layerWithCredentials.SetToken(keyTokenOrCodeInputField.text); - break; - case AuthorizationType.Public: - layerWithCredentials.ClearCredentials(); - break; - case AuthorizationType.Unknown: - layerWithCredentials.ClearCredentials(); - ShowCredentialsWarning(); - break; - } - } - - /// - /// Set the authorization input type and update the UI - /// - public void SetAuthorizationInputType(int type) - { - authorizationType = (AuthorizationType)type; - Debug.Log("Force AuthorizationType to: " + authorizationType); - - SetAuthorizationInputType(authorizationType); - } - - /// - /// Fill the inputs with predefined values - /// - public void SetInputFieldsValues(string username = "", string password = "", string key = "") - { - if(username.Length > 0) userNameInputField.text = username; - if(password.Length > 0) passwordInputField.text = password; - if(key.Length > 0) keyTokenOrCodeInputField.text = key; - } - - /// - /// Set the authorization input type and update the UI - /// - public void SetAuthorizationInputType(AuthorizationType type) - { - if( - type == AuthorizationType.Key - || type == AuthorizationType.Token - || type == AuthorizationType.BearerToken - || type == AuthorizationType.Code - ) - type = AuthorizationType.InferableSingleKey; - - credentialTypeDropdown.value = (int)type; - - //Similar values are not reapplied, so make sure to the dropdown items appear - if (credentialTypeDropdown.TryGetComponent(out DropdownSelection dropdownSelection)) - dropdownSelection.DropdownSelectItem(credentialTypeDropdown.value); - - authorizationType = type; - } - } -} diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs index f25fe9a1..9634b696 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs @@ -1,3 +1,4 @@ +using System; using Netherlands3D.Twin.Layers.LayerTypes; using Netherlands3D.Twin.UI.LayerInspector; using UnityEngine; @@ -8,16 +9,19 @@ namespace Netherlands3D.Twin.Layers.Properties public class CredentialsPropertySectionInstantiator : MonoBehaviour, IPropertySectionInstantiator { [SerializeField] private bool autoApplyCredentials = false; - [SerializeField] private CredentialsPropertySection propertySectionPrefab; - [HideInInspector] public UnityEvent OnCredentialsPropertySectionInstantiated = new(); - + [SerializeField] private CredentialsValidationPropertySection inputPropertySectionPrefab; + [HideInInspector] public UnityEvent OnCredentialsPropertySectionInstantiated = new(); + public void AddToProperties(RectTransform properties) { - if (!propertySectionPrefab) return; + if (!inputPropertySectionPrefab) return; + + var settings = Instantiate(inputPropertySectionPrefab, properties); - var settings = Instantiate(propertySectionPrefab, properties); - settings.AutoApplyCredentials = autoApplyCredentials; - settings.LayerWithCredentials = GetComponent(); + settings.Handler = GetComponent(); + if (settings.Handler == null) + gameObject.AddComponent(); + OnCredentialsPropertySectionInstantiated.Invoke(settings); } } diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs new file mode 100644 index 00000000..c0ce4ca2 --- /dev/null +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Netherlands3D.Twin.Layers.LayerTypes; +using UnityEngine; + +namespace Netherlands3D.Twin.Layers.Properties +{ + public class CredentialsValidationPropertySection : MonoBehaviour + { + private LayerCredentialsHandler handler; + + [SerializeField] private GameObject validCredentialsPanel; + [SerializeField] private GameObject invalidCredentialsPanel; + + public LayerCredentialsHandler Handler + { + get => handler; + set + { + if (handler) + handler.CredentialsAccepted.RemoveListener(OnCredentialsAccepted); + + handler = value; + + OnCredentialsAccepted(handler.HasValidCredentials); + + handler.CredentialsAccepted.AddListener(OnCredentialsAccepted); + } + } + + private void OnEnable() + { + if (handler) + handler.CredentialsAccepted.AddListener(OnCredentialsAccepted); + } + + private void OnDisable() + { + if (handler) + handler.CredentialsAccepted.RemoveListener(OnCredentialsAccepted); + } + + private void OnCredentialsAccepted(bool accepted) + { + validCredentialsPanel.SetActive(accepted); + invalidCredentialsPanel.SetActive(!accepted); + if (accepted) + { + print("accepted"); + } + else + print("rejected"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs.meta b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs.meta new file mode 100644 index 00000000..d8831e55 --- /dev/null +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b8a8ed3eaf9144115a10483962e11053 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs new file mode 100644 index 00000000..f3ecb870 --- /dev/null +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs @@ -0,0 +1,224 @@ +using System; +using Netherlands3D.Twin.Layers.LayerTypes; +using UnityEngine; +using UnityEngine.Networking; +using UnityEngine.Events; + +namespace Netherlands3D.Twin.Layers.Properties +{ + [RequireComponent(typeof(ILayerWithCredentials))] + [RequireComponent(typeof(LayerGameObject))] + public class LayerCredentialsHandler : MonoBehaviour + { + public string UserName { get; set; } + public string PasswordOrKeyOrTokenOrCode { get; set; } + + [Header("Settings")] + [SerializeField] private bool findKeyInVaultOnURLChange = true; + + [Tooltip("KeyVault Scriptable Object")] + [SerializeField] private KeyVault keyVault; + + private AuthorizationType authorizationType = AuthorizationType.Public; + private StoredAuthorization storedAuthorization; + + [SerializeField] private bool autoApplyCredentials = false; + + public bool AutoApplyCredentials + { + get => autoApplyCredentials; + set => autoApplyCredentials = value; + } + + public AuthorizationType AuthorizationType => authorizationType; + + private ILayerWithCredentials layerWithCredentials; + private LayerGameObject layerGameObject; + + // public ILayerWithCredentials LayerWithCredentials + // { + // get { return layerWithCredentials; } + // set + // { + // if (layerWithCredentials != null) + // { + // layerWithCredentials.OnURLChanged.RemoveListener(UrlHasChanged); + // layerWithCredentials.OnServerResponseReceived.RemoveListener(HandleServerResponse); + // } + // + // layerWithCredentials = value; + // + // if (layerWithCredentials != null) + // { + // layerWithCredentials.OnURLChanged.AddListener(UrlHasChanged); + // layerWithCredentials.OnServerResponseReceived.AddListener(HandleServerResponse); + // + // UrlHasChanged(layerWithCredentials.URL); + // } + // } + // } + + public bool HasValidCredentials => layerGameObject && layerGameObject.LayerData.HasValidCredentials; + public UnityEvent CredentialsAccepted => layerGameObject.LayerData.HasValidCredentialsChanged; + + private void Awake() + { + layerWithCredentials = GetComponent(); + layerGameObject = GetComponent(); + } + + private void OnEnable() + { + keyVault.OnAuthorizationTypeDetermined.AddListener(OnCredentialTypeDetermined); + layerWithCredentials.OnURLChanged.AddListener(UrlHasChanged); + layerWithCredentials.OnServerResponseReceived.AddListener(HandleServerResponse); + + UrlHasChanged(layerWithCredentials.URL); + } + + private void OnDisable() + { + keyVault.OnAuthorizationTypeDetermined.RemoveListener(OnCredentialTypeDetermined); + + layerWithCredentials.OnURLChanged.RemoveListener(UrlHasChanged); + layerWithCredentials.OnServerResponseReceived.RemoveListener(HandleServerResponse); + } + + public void HandleServerResponse(UnityWebRequest webRequest) + { + + if (webRequest.result != UnityWebRequest.Result.Success) + { + layerGameObject.LayerData.HasValidCredentials = false; + // CredentialsAccepted.Invoke(false); + } + else + { + layerGameObject.LayerData.HasValidCredentials = true; + // CredentialsAccepted.Invoke(true); + } + + // if(webRequest.ReturnedServerError()) + // { + // //Disable credentials property section if we get a server error (not tied to credentials) + // Debug.LogWarning("Server request failed: " + webRequest); + // gameObject.SetActive(false); + // } + // else + if (webRequest.RequiresCredentials()) + { + Debug.LogWarning("Credentials required: " + webRequest); + //Show a credentials warning if the server request failed for another reason (probably tied to credential failure) + } + } + + public void CloseFailedFeedback() + { + CredentialsAccepted.Invoke(false); + + //Gob back to our generic guess field type so we can retry again + authorizationType = AuthorizationType.InferableSingleKey; + SetAuthorizationInputType(authorizationType); + } + + private void UrlHasChanged(string newURL) + { + //New url. If we already got this one in the vault, apply the credentials + if (findKeyInVaultOnURLChange) + { + storedAuthorization = keyVault.GetStoredAuthorization(newURL); + + if (storedAuthorization != null) + { + Debug.Log("Found stored authorization for: " + newURL + " with type: " + storedAuthorization.authorizationType); + authorizationType = storedAuthorization.authorizationType; + CredentialsAccepted.Invoke(true); + } + else + { + authorizationType = keyVault.GetKnownAuthorizationTypeForURL(newURL); + CredentialsAccepted.Invoke(false); + } + + SetAuthorizationInputType(authorizationType); + + if (AutoApplyCredentials) + ApplyCredentials(); + } + } + + public void ApplyCredentials() + { + switch (authorizationType) + { + case AuthorizationType.UsernamePassword: + keyVault.TryBasicAuthentication( + layerWithCredentials.URL, + UserName, + PasswordOrKeyOrTokenOrCode + ); + break; + case AuthorizationType.InferableSingleKey: + keyVault.TryToFindSpecificCredentialType( + layerWithCredentials.URL, + PasswordOrKeyOrTokenOrCode + ); + break; + } + } + + private void OnCredentialTypeDetermined(string url, AuthorizationType type) + { + // credentialTypeDropdown.value = (int)type; + authorizationType = type; + + switch (type) + { + case AuthorizationType.UsernamePassword: + layerWithCredentials.SetCredentials(UserName, PasswordOrKeyOrTokenOrCode); + break; + case AuthorizationType.BearerToken: + layerWithCredentials.SetBearerToken(PasswordOrKeyOrTokenOrCode); + break; + case AuthorizationType.Key: + layerWithCredentials.SetKey(PasswordOrKeyOrTokenOrCode); + break; + case AuthorizationType.Code: + layerWithCredentials.SetCode(PasswordOrKeyOrTokenOrCode); + break; + case AuthorizationType.Token: + layerWithCredentials.SetToken(PasswordOrKeyOrTokenOrCode); + break; + case AuthorizationType.Public: + layerWithCredentials.ClearCredentials(); + break; + case AuthorizationType.Unknown: + layerWithCredentials.ClearCredentials(); + CredentialsAccepted.Invoke(false); + break; + } + } + + /// + /// Set the authorization input type and update the UI + /// + public void SetAuthorizationInputType(AuthorizationType type) + { + if ( + type == AuthorizationType.Key + || type == AuthorizationType.Token + || type == AuthorizationType.BearerToken + || type == AuthorizationType.Code + ) + type = AuthorizationType.InferableSingleKey; + + // credentialTypeDropdown.value = (int)type; + + //Similar values are not reapplied, so make sure to the dropdown items appear + // if (credentialTypeDropdown.TryGetComponent(out DropdownSelection dropdownSelection)) + // dropdownSelection.DropdownSelectItem(credentialTypeDropdown.value); + + authorizationType = type; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs.meta b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs.meta new file mode 100644 index 00000000..69168e6c --- /dev/null +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3b2880c796b146d191c4b41da5c526b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 7e5862be9f08db3b5e6a3b22c18830e754c25407 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 09:14:38 +0200 Subject: [PATCH 05/36] added switching between panels --- .../3DTiles/RealityMesh (3D Tiles).prefab | 2 +- .../CredentialsPropertySection.prefab | 926 ++++++++++++++++-- ...entials.prefab => CredentialsInput.prefab} | 2 +- ...efab.meta => CredentialsInput.prefab.meta} | 0 .../GoogleRealityMeshConfigurationAdapter.cs | 2 +- .../CredentialsInputPropertySection.cs | 63 +- .../CredentialsPropertySectionInstantiator.cs | 18 +- .../CredentialsValidationPropertySection.cs | 2 +- .../ILayerCredentialInterface.cs | 11 + .../ILayerCredentialInterface.cs.meta | 11 + 10 files changed, 950 insertions(+), 87 deletions(-) rename Assets/Prefabs/UI/Sidebar/SpecificComponents/{Credentials.prefab => CredentialsInput.prefab} (99%) rename Assets/Prefabs/UI/Sidebar/SpecificComponents/{Credentials.prefab.meta => CredentialsInput.prefab.meta} (100%) create mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs create mode 100644 Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs.meta diff --git a/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab b/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab index 26d3afc9..952e09bb 100644 --- a/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab +++ b/Assets/Prefabs/3DTiles/RealityMesh (3D Tiles).prefab @@ -390,7 +390,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: autoApplyCredentials: 1 - inputPropertySectionPrefab: {fileID: 4139614324750460760, guid: d01d03b127df7b34cacbb24ee8f84d28, + inputPropertySectionPrefab: {fileID: 7185160580400989932, guid: f241bd5b609aa4447ae89fb4325470ef, type: 3} OnCredentialsPropertySectionInstantiated: m_PersistentCalls: diff --git a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab index 5bd580a2..43c46df5 100644 --- a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab +++ b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab @@ -423,48 +423,829 @@ PrefabInstance: - {fileID: 7289922747376281107, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} - {fileID: 5860769146520701561, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, + type: 3} + insertIndex: -1 + addedObject: {fileID: 104037215242160405} - targetCorrespondingSourceObject: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} insertIndex: -1 addedObject: {fileID: 4325632064885432000} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 6482568267866771571, guid: e3342ba09b3c3e245ac1e7d9f4102026, + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} +--- !u!224 &5031956645437580411 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, + type: 3} + m_PrefabInstance: {fileID: 4197464824920921759} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5556982845011854035 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5031956645437580411} + m_Modifications: + - target: {fileID: 87272986951737192, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 87272986951737192, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 87272986951737192, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 87272986951737192, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 338865832173675934, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 338865832173675934, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1732829855796495498} + - target: {fileID: 338865832173675934, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2700499138114884447} + - target: {fileID: 343472854245994991, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 343472854245994991, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 343472854245994991, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 25.642 + objectReference: {fileID: 0} + - target: {fileID: 343472854245994991, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.51200485 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 363.37 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.685 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -143.86679 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 363.37 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.685 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30.5979 + objectReference: {fileID: 0} + - target: {fileID: 1045388463160105844, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1432072964548747754, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 113.95 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 15.74 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 72.90835 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.649399 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 25.642 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 33.9605 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 68.32 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 15.74 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 45.41615 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.37435 + objectReference: {fileID: 0} + - target: {fileID: 2581016988260149482, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581016988260149482, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581016988260149482, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581016988260149482, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581016988260149482, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2933829340102187548, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 25.642 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 34.2987 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -12.821 + objectReference: {fileID: 0} + - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 45.25 + objectReference: {fileID: 0} + - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 58.54915 + objectReference: {fileID: 0} + - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.6494 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 65.69 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 45.41615 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.37435 + objectReference: {fileID: 0} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1732829855796495498} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2700499138114884447} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 2343282219573609057} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 363.37 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.685 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -101.319 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5542418784093371826, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 5542418784093371826, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[1] + value: + objectReference: {fileID: 0} + - target: {fileID: 5542418784093371826, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[2] + value: + objectReference: {fileID: 0} + - target: {fileID: 5542418784093371826, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[3] + value: + objectReference: {fileID: 0} + - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 363.37 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.685 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -117.13655 + objectReference: {fileID: 0} + - target: {fileID: 6130069684234356313, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Name + value: CredentialStatusPropertyPanel + objectReference: {fileID: 0} + - target: {fileID: 6130069684234356313, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} - insertIndex: -1 - addedObject: {fileID: -860560823292524916} - m_SourcePrefab: {fileID: 100100000, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} ---- !u!224 &5031956645437580411 stripped + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6711146262947774155, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6711146262947774155, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6711146262947774155, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 77.95 + objectReference: {fileID: 0} + - target: {fileID: 6711146262947774155, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 30.26 + objectReference: {fileID: 0} + - target: {fileID: 6711146262947774155, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 53.5166 + objectReference: {fileID: 0} + - target: {fileID: 6711146262947774155, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.79815 + objectReference: {fileID: 0} + - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 45.25 + objectReference: {fileID: 0} + - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 58.54915 + objectReference: {fileID: 0} + - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -18.6494 + objectReference: {fileID: 0} + - target: {fileID: 7902590509517085297, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7999732362807906592, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 7999732362807906592, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[1] + value: + objectReference: {fileID: 0} + - target: {fileID: 7999732362807906592, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[2] + value: + objectReference: {fileID: 0} + - target: {fileID: 7999732362807906592, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: ToHide.Array.data[3] + value: + objectReference: {fileID: 0} + - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8310904887951563914, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681879202439052226, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 77.95 + objectReference: {fileID: 0} + - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 53.5166 + objectReference: {fileID: 0} + - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.79815 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7999732362807906592, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} + - {fileID: 5542418784093371826, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} + m_RemovedGameObjects: + - {fileID: 7902590509517085297, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} + - {fileID: 8310904887951563914, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} + - {fileID: 8681879202439052226, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} + - {fileID: 1045388463160105844, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} +--- !u!224 &104037215242160405 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, + m_CorrespondingSourceObject: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} - m_PrefabInstance: {fileID: 4197464824920921759} + m_PrefabInstance: {fileID: 5556982845011854035} m_PrefabAsset: {fileID: 0} ---- !u!1 &7185160580400989932 stripped +--- !u!1 &1732829855796495498 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 6482568267866771571, guid: e3342ba09b3c3e245ac1e7d9f4102026, + m_CorrespondingSourceObject: {fileID: 6130069684234356313, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} - m_PrefabInstance: {fileID: 4197464824920921759} + m_PrefabInstance: {fileID: 5556982845011854035} m_PrefabAsset: {fileID: 0} ---- !u!114 &-860560823292524916 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!1 &2343282219573609057 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7898008316363899058, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + m_PrefabInstance: {fileID: 5556982845011854035} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185160580400989932} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 270603827f3fb58429af99e4bc145f4e, type: 3} - m_Name: - m_EditorClassIdentifier: - userNameInputField: {fileID: 7815930717502173902} - passwordInputField: {fileID: 6635604337044698613} - keyTokenOrCodeInputField: {fileID: 3691211174450802003} - keyTokenOrCodeLabel: {fileID: 8070722842369899825} - headerDefault: {fileID: 697813566398056393} - headerWithCredentialTypeDropdown: {fileID: 8614721123552596982} - credentialTypeDropdown: {fileID: 1208963087933705121} - errorMessage: {fileID: 8623644015317721457} --- !u!1001 &8099856209361245446 PrefabInstance: m_ObjectHideFlags: 0 @@ -496,27 +1277,27 @@ PrefabInstance: - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 363.37 objectReference: {fileID: 0} - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 181.685 objectReference: {fileID: 0} - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -127.9408 objectReference: {fileID: 0} - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -551,27 +1332,27 @@ PrefabInstance: - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 363.37 objectReference: {fileID: 0} - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 181.685 objectReference: {fileID: 0} - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -30.5979 objectReference: {fileID: 0} - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -628,11 +1409,6 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 1397398524552466745, guid: 63fccc9491de61645b43763357399bad, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: -860560823292524916} - target: {fileID: 1397398524552466745, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -901,7 +1677,7 @@ PrefabInstance: - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 15.74 objectReference: {fileID: 0} - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -932,7 +1708,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: -860560823292524916} + objectReference: {fileID: 7812538328515808688} - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -946,7 +1722,8 @@ PrefabInstance: - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Netherlands3D.Twin.CredentialsPropertySection, Assembly-CSharp + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1011,7 +1788,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 194.6858 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1056,7 +1833,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -105.3429 + value: -295.9809 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1112,7 +1889,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: -860560823292524916} + objectReference: {fileID: 7812538328515808688} - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -1126,7 +1903,8 @@ PrefabInstance: - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Netherlands3D.Twin.CredentialsPropertySection, Assembly-CSharp + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1173,6 +1951,11 @@ PrefabInstance: propertyPath: m_Name value: Credentials objectReference: {fileID: 0} + - target: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size @@ -1183,11 +1966,6 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 0 objectReference: {fileID: 0} - - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, - type: 3} - propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: -860560823292524916} - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -1372,7 +2150,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target value: - objectReference: {fileID: -860560823292524916} + objectReference: {fileID: 0} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName @@ -1431,7 +2209,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7812538328515808688} m_SourcePrefab: {fileID: 100100000, guid: 63fccc9491de61645b43763357399bad, type: 3} --- !u!224 &697813566398056393 stripped RectTransform: @@ -1451,6 +2233,32 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2700499138114884447 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 8099856209361245446} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7812538328515808688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2700499138114884447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 270603827f3fb58429af99e4bc145f4e, type: 3} + m_Name: + m_EditorClassIdentifier: + userNameInputField: {fileID: 7815930717502173902} + passwordInputField: {fileID: 6635604337044698613} + keyTokenOrCodeInputField: {fileID: 3691211174450802003} + keyTokenOrCodeLabel: {fileID: 8070722842369899825} + headerDefault: {fileID: 697813566398056393} + headerWithCredentialTypeDropdown: {fileID: 8614721123552596982} + credentialTypeDropdown: {fileID: 1208963087933705121} + errorMessage: {fileID: 8623644015317721457} --- !u!114 &3691211174450802003 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4850844431071295573, guid: 63fccc9491de61645b43763357399bad, diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Credentials.prefab b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab similarity index 99% rename from Assets/Prefabs/UI/Sidebar/SpecificComponents/Credentials.prefab rename to Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab index f3c12ec0..e7a79a8d 100644 --- a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Credentials.prefab +++ b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab @@ -3346,7 +3346,7 @@ GameObject: - component: {fileID: 1537685062570398413} - component: {fileID: 7740096372769682743} m_Layer: 5 - m_Name: Credentials + m_Name: CredentialsInput m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Credentials.prefab.meta b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab.meta similarity index 100% rename from Assets/Prefabs/UI/Sidebar/SpecificComponents/Credentials.prefab.meta rename to Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab.meta diff --git a/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs b/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs index 7c7829da..9c5540e5 100644 --- a/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs +++ b/Assets/Scripts/Configuration/GoogleRealityMesh/GoogleRealityMeshConfigurationAdapter.cs @@ -30,7 +30,7 @@ private void Awake() read3DTileset.enabled = true; } - private void CredentialsPropertySectionInstantiated(CredentialsValidationPropertySection credentialsInputPropertySection) + private void CredentialsPropertySectionInstantiated(GameObject credentialsInputPropertySection) { // credentialsInputPropertySection.SetInputFieldsValues(key: configuration.ApiKey); } diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs index 96da1acd..4ab630a7 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs @@ -4,10 +4,10 @@ namespace Netherlands3D.Twin.Layers.Properties { - public class CredentialsInputPropertySection : MonoBehaviour + public class CredentialsInputPropertySection : MonoBehaviour, ILayerCredentialInterface { private LayerCredentialsHandler handler; - + [SerializeField] private TMP_InputField userNameInputField; [SerializeField] private TMP_InputField passwordInputField; [SerializeField] private TMP_InputField keyTokenOrCodeInputField; @@ -19,13 +19,42 @@ public class CredentialsInputPropertySection : MonoBehaviour [SerializeField] private Transform errorMessage; private bool skipFirstCredentialErrorMessage = true; - private void Awake() + public LayerCredentialsHandler Handler { - handler = GetComponent(); - if (!handler) - handler = gameObject.AddComponent(); + get => handler; + set + { + if (handler) + handler.CredentialsAccepted.RemoveListener(OnCredentialsAccepted); + + handler = value; + + OnCredentialsAccepted(handler.HasValidCredentials); + + handler.CredentialsAccepted.AddListener(OnCredentialsAccepted); + } } - + + private void OnCredentialsAccepted(bool accepted) + { + if (accepted) + { + print("success"); + } + else + { + print("fail"); + ShowCredentialsWarning(); + } + } + + // private void Awake() + // { + // handler = GetComponent(); + // if (!handler) + // handler = gameObject.AddComponent(); + // } + private void OnEnable() { errorMessage.gameObject.SetActive(false); @@ -38,7 +67,7 @@ private void OnDisable() public void ShowCredentialsWarning() { //First failure from server may be ignored, because we want to give the user a chance to fill in the credentials via the credentials panel - if(skipFirstCredentialErrorMessage) + if (skipFirstCredentialErrorMessage) { skipFirstCredentialErrorMessage = false; return; @@ -47,7 +76,7 @@ public void ShowCredentialsWarning() //For now a standard text is shown. errorMessage.gameObject.SetActive(true); } - + public void CloseFailedFeedback() { errorMessage.gameObject.SetActive(false); @@ -59,8 +88,8 @@ public void CloseFailedFeedback() public void ApplyCredentials() { errorMessage.gameObject.SetActive(false); - - switch(handler.AuthorizationType) + + switch (handler.AuthorizationType) { case AuthorizationType.UsernamePassword: handler.UserName = userNameInputField.text; @@ -70,7 +99,7 @@ public void ApplyCredentials() handler.PasswordOrKeyOrTokenOrCode = keyTokenOrCodeInputField.text; break; } - + handler.ApplyCredentials(); } @@ -81,7 +110,7 @@ public void SetAuthorizationInputType(int type) { handler.SetAuthorizationInputType((AuthorizationType)type); } - + public void SetAuthorizationInputType(AuthorizationType type) { handler.SetAuthorizationInputType(type); @@ -98,9 +127,9 @@ public void SetAuthorizationInputType(AuthorizationType type) /// public void SetInputFieldsValues(string username = "", string password = "", string key = "") { - if(username.Length > 0) userNameInputField.text = username; - if(password.Length > 0) passwordInputField.text = password; - if(key.Length > 0) keyTokenOrCodeInputField.text = key; + if (username.Length > 0) userNameInputField.text = username; + if (password.Length > 0) passwordInputField.text = password; + if (key.Length > 0) keyTokenOrCodeInputField.text = key; } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs index 9634b696..526a789f 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs @@ -9,19 +9,23 @@ namespace Netherlands3D.Twin.Layers.Properties public class CredentialsPropertySectionInstantiator : MonoBehaviour, IPropertySectionInstantiator { [SerializeField] private bool autoApplyCredentials = false; - [SerializeField] private CredentialsValidationPropertySection inputPropertySectionPrefab; - [HideInInspector] public UnityEvent OnCredentialsPropertySectionInstantiated = new(); - + [SerializeField] private GameObject inputPropertySectionPrefab; + [HideInInspector] public UnityEvent OnCredentialsPropertySectionInstantiated = new(); + public void AddToProperties(RectTransform properties) { if (!inputPropertySectionPrefab) return; var settings = Instantiate(inputPropertySectionPrefab, properties); + var handler = GetComponent(); + foreach (var credentialInterface in settings.GetComponentsInChildren()) + { + print(credentialInterface); + credentialInterface.Handler = handler; + } + // if (settings.Handler == null) + // gameObject.AddComponent(); - settings.Handler = GetComponent(); - if (settings.Handler == null) - gameObject.AddComponent(); - OnCredentialsPropertySectionInstantiated.Invoke(settings); } } diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs index c0ce4ca2..6c7cf9d2 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs @@ -6,7 +6,7 @@ namespace Netherlands3D.Twin.Layers.Properties { - public class CredentialsValidationPropertySection : MonoBehaviour + public class CredentialsValidationPropertySection : MonoBehaviour, ILayerCredentialInterface { private LayerCredentialsHandler handler; diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs new file mode 100644 index 00000000..6b976a58 --- /dev/null +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Netherlands3D.Twin.Layers.Properties +{ + public interface ILayerCredentialInterface + { + public LayerCredentialsHandler Handler { get; set; } + } +} diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs.meta b/Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs.meta new file mode 100644 index 00000000..90815165 --- /dev/null +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/ILayerCredentialInterface.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e6957b7e28ead43179dc1d5986a3f9bb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From a7e8f57e51f2f7942b0f76b97cbd28e355076ce0 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 09:44:53 +0200 Subject: [PATCH 06/36] credentials are now applied --- .../CredentialsPropertySection.prefab | 35 ++++++++++++++++--- .../CredentialsPropertySectionInstantiator.cs | 2 +- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab index 43c46df5..78a8ceb8 100644 --- a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab +++ b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab @@ -1966,6 +1966,11 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7812538328515808688} - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState @@ -1979,7 +1984,8 @@ PrefabInstance: - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: Netherlands3D.Twin.CredentialsPropertySection, Assembly-CSharp + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -2146,20 +2152,35 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 157.61 objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 582164384827256516} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName - value: CloseFailedFeedback + value: SetActive objectReference: {fileID: 0} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName - value: Netherlands3D.Twin.CredentialsPropertySection, Assembly-CSharp + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument + value: 0 objectReference: {fileID: 0} - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -2215,6 +2236,12 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 7812538328515808688} m_SourcePrefab: {fileID: 100100000, guid: 63fccc9491de61645b43763357399bad, type: 3} +--- !u!1 &582164384827256516 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8681879202439052226, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 8099856209361245446} + m_PrefabAsset: {fileID: 0} --- !u!224 &697813566398056393 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs index 526a789f..22eb6832 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs @@ -18,7 +18,7 @@ public void AddToProperties(RectTransform properties) var settings = Instantiate(inputPropertySectionPrefab, properties); var handler = GetComponent(); - foreach (var credentialInterface in settings.GetComponentsInChildren()) + foreach (var credentialInterface in settings.GetComponentsInChildren(true)) { print(credentialInterface); credentialInterface.Handler = handler; From fb0a7b9f8de13c50db86c6cdd97e10df2c628616 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 10:51:44 +0200 Subject: [PATCH 07/36] fixed ui enabling/disabling, this broke the layout --- .../CredentialsPropertySection.prefab | 169 +++++++++++++----- .../CredentialsInput.prefab | 99 ++++++++-- .../CredentialsInputPropertySection.cs | 58 +++--- .../CredentialsPropertySectionInstantiator.cs | 5 +- .../CredentialsValidationPropertySection.cs | 7 +- 5 files changed, 238 insertions(+), 100 deletions(-) diff --git a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab index 78a8ceb8..24410936 100644 --- a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab +++ b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab @@ -313,6 +313,11 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8597775257156953464, guid: e3342ba09b3c3e245ac1e7d9f4102026, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8597775257156953464, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} propertyPath: m_ChildForceExpandHeight @@ -336,7 +341,7 @@ PrefabInstance: - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} @@ -346,7 +351,7 @@ PrefabInstance: - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} @@ -356,7 +361,7 @@ PrefabInstance: - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 466.4 objectReference: {fileID: 0} - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} @@ -401,7 +406,7 @@ PrefabInstance: - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -2160 objectReference: {fileID: 0} - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} @@ -835,7 +840,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -845,12 +850,12 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.x - value: 363.37 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -895,12 +900,12 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x - value: 181.685 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.y - value: -101.319 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -1032,6 +1037,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1102,6 +1112,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -18.6494 objectReference: {fileID: 0} + - target: {fileID: 7740096372769682743, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7902590509517085297, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_IsActive @@ -1142,6 +1157,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1177,6 +1197,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x @@ -1187,6 +1212,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMax.y @@ -1220,6 +1250,7 @@ PrefabInstance: m_RemovedComponents: - {fileID: 7999732362807906592, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} - {fileID: 5542418784093371826, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} + - {fileID: 7740096372769682743, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} m_RemovedGameObjects: - {fileID: 7902590509517085297, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} - {fileID: 8310904887951563914, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -1297,7 +1328,7 @@ PrefabInstance: - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -127.9408 + value: -174.28365 objectReference: {fileID: 0} - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1788,7 +1819,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 194.6858 + value: 287.3715 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1833,7 +1864,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -295.9809 + value: -322.71426 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -2155,33 +2186,99 @@ PrefabInstance: - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 3 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 objectReference: {fileID: 0} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode value: 6 objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7812538328515808688} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 582164384827256516} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target value: objectReference: {fileID: 582164384827256516} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ShowCredentialsWarning + objectReference: {fileID: 0} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName value: SetActive objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName value: UnityEngine.GameObject, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument value: 0 objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 363.37 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 287.3715 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.685 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -143.68575 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_Pivot.x @@ -2227,7 +2324,9 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 12.5 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7740096372769682743, guid: 63fccc9491de61645b43763357399bad, type: 3} + - {fileID: 4187864944359192514, guid: 63fccc9491de61645b43763357399bad, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -2242,12 +2341,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 8099856209361245446} m_PrefabAsset: {fileID: 0} ---- !u!224 &697813566398056393 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, - type: 3} - m_PrefabInstance: {fileID: 8099856209361245446} - m_PrefabAsset: {fileID: 0} --- !u!114 &1208963087933705121 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, @@ -2260,6 +2353,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2608707940637768593 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6078599741548818071, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 8099856209361245446} + m_PrefabAsset: {fileID: 0} --- !u!1 &2700499138114884447 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, @@ -2278,14 +2377,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 270603827f3fb58429af99e4bc145f4e, type: 3} m_Name: m_EditorClassIdentifier: + inputPanel: {fileID: 2608707940637768593} + errorMessage: {fileID: 582164384827256516} userNameInputField: {fileID: 7815930717502173902} passwordInputField: {fileID: 6635604337044698613} keyTokenOrCodeInputField: {fileID: 3691211174450802003} - keyTokenOrCodeLabel: {fileID: 8070722842369899825} - headerDefault: {fileID: 697813566398056393} - headerWithCredentialTypeDropdown: {fileID: 8614721123552596982} credentialTypeDropdown: {fileID: 1208963087933705121} - errorMessage: {fileID: 8623644015317721457} --- !u!114 &3691211174450802003 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4850844431071295573, guid: 63fccc9491de61645b43763357399bad, @@ -2328,27 +2425,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8070722842369899825 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 29431609655470135, guid: 63fccc9491de61645b43763357399bad, - type: 3} - m_PrefabInstance: {fileID: 8099856209361245446} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &8614721123552596982 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, - type: 3} - m_PrefabInstance: {fileID: 8099856209361245446} - m_PrefabAsset: {fileID: 0} ---- !u!224 &8623644015317721457 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, - type: 3} - m_PrefabInstance: {fileID: 8099856209361245446} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab index e7a79a8d..9ed0e674 100644 --- a/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab +++ b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab @@ -35,12 +35,12 @@ RectTransform: - {fileID: 3242178298523629546} - {fileID: 8434915098655300317} - {fileID: 5928856013968725252} - m_Father: {fileID: 5507835546160925638} + m_Father: {fileID: 8896109635212039299} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 61.1958} + m_SizeDelta: {x: 363.37, y: 61.1958} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2588160458890705291 CanvasRenderer: @@ -264,11 +264,11 @@ RectTransform: - {fileID: 4914164692928791554} - {fileID: 5973822145176917461} - {fileID: 638865021547080224} - m_Father: {fileID: 5507835546160925638} + m_Father: {fileID: 8896109635212039299} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 259.48386, y: -91.7937} + m_AnchoredPosition: {x: 259.48386, y: 41.696304} m_SizeDelta: {x: 518.9677, y: 61.1958} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &316792131737819284 @@ -745,9 +745,9 @@ RectTransform: - {fileID: 4980294939815449265} m_Father: {fileID: 1795870347060740615} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 34.2987, y: -12.821} m_SizeDelta: {x: 68.7619, y: 25.642} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7256452770066529162 @@ -1156,7 +1156,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0.51200485, y: 0} - m_SizeDelta: {x: 67.921, y: 0} + m_SizeDelta: {x: 67.921, y: 25.642} m_Pivot: {x: 0, y: 1} --- !u!114 &6572781630536300697 MonoBehaviour: @@ -3289,7 +3289,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 33.9605, y: 0} - m_SizeDelta: {x: 68.5974, y: 0} + m_SizeDelta: {x: 68.5974, y: 25.642} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5623014676983450825 MonoBehaviour: @@ -3331,6 +3331,72 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &6078599741548818071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8896109635212039299} + - component: {fileID: 4863835000429805149} + m_Layer: 5 + m_Name: InputFields + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8896109635212039299 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6078599741548818071} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 569102230516401904} + - {fileID: 8775081300947292879} + - {fileID: 542988683384133124} + - {fileID: 5726705694416920182} + m_Father: {fileID: 5507835546160925638} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 194} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4863835000429805149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6078599741548818071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &6130069684234356313 GameObject: m_ObjectHideFlags: 0 @@ -3364,10 +3430,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 569102230516401904} - - {fileID: 8775081300947292879} - - {fileID: 542988683384133124} - - {fileID: 5726705694416920182} + - {fileID: 8896109635212039299} - {fileID: 559905148040098935} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4265,12 +4328,12 @@ RectTransform: - {fileID: 1837078586063499586} - {fileID: 2333311903956717364} - {fileID: 8998842710411304694} - m_Father: {fileID: 5507835546160925638} + m_Father: {fileID: 8896109635212039299} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 133.49} + m_SizeDelta: {x: 363.37, y: 133.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1590259709932231782 CanvasRenderer: @@ -4451,7 +4514,7 @@ RectTransform: - {fileID: 6993355133725796145} - {fileID: 4872188634005605099} - {fileID: 8167795785696828845} - m_Father: {fileID: 5507835546160925638} + m_Father: {fileID: 8896109635212039299} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4504,8 +4567,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: 199.26186, y: -279.3828} - m_SizeDelta: {x: 398.5237, y: 169.394} + m_AnchoredPosition: {x: 181.685, y: -279.3828} + m_SizeDelta: {x: 363, y: 169} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1831621874971572128 CanvasRenderer: diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs index 4ab630a7..0e2bd73b 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs @@ -8,15 +8,13 @@ public class CredentialsInputPropertySection : MonoBehaviour, ILayerCredentialIn { private LayerCredentialsHandler handler; + [SerializeField] private GameObject inputPanel; + [SerializeField] private GameObject errorMessage; + [SerializeField] private TMP_InputField userNameInputField; [SerializeField] private TMP_InputField passwordInputField; [SerializeField] private TMP_InputField keyTokenOrCodeInputField; - [SerializeField] private TMP_Text keyTokenOrCodeLabel; - - [SerializeField] private Transform headerDefault; - [SerializeField] private Transform headerWithCredentialTypeDropdown; [SerializeField] private TMP_Dropdown credentialTypeDropdown; - [SerializeField] private Transform errorMessage; private bool skipFirstCredentialErrorMessage = true; public LayerCredentialsHandler Handler @@ -29,7 +27,8 @@ public LayerCredentialsHandler Handler handler = value; - OnCredentialsAccepted(handler.HasValidCredentials); + skipFirstCredentialErrorMessage = true; + // OnCredentialsAccepted(handler.HasValidCredentials); handler.CredentialsAccepted.AddListener(OnCredentialsAccepted); } @@ -37,14 +36,10 @@ public LayerCredentialsHandler Handler private void OnCredentialsAccepted(bool accepted) { + ShowCredentialsWarning(!accepted); if (accepted) { - print("success"); - } - else - { - print("fail"); - ShowCredentialsWarning(); + gameObject.SetActive(false); } } @@ -57,37 +52,42 @@ private void OnCredentialsAccepted(bool accepted) private void OnEnable() { - errorMessage.gameObject.SetActive(false); + ShowCredentialsWarning(false); } - private void OnDisable() - { - } - - public void ShowCredentialsWarning() + public void ShowCredentialsWarning(bool show) { + print("shjowing warning:" + show); //First failure from server may be ignored, because we want to give the user a chance to fill in the credentials via the credentials panel - if (skipFirstCredentialErrorMessage) - { - skipFirstCredentialErrorMessage = false; - return; - } + // if (skipFirstCredentialErrorMessage) + // { + // print("skipping"); + // skipFirstCredentialErrorMessage = false; + // return; + // } //For now a standard text is shown. - errorMessage.gameObject.SetActive(true); - } + inputPanel.SetActive(!show); + errorMessage.SetActive(show); - public void CloseFailedFeedback() - { - errorMessage.gameObject.SetActive(false); + if (!show) + SetAuthorizationInputType(credentialTypeDropdown.value); } + // public void CloseFailedFeedback() + // { + // inputPanel.SetActive(true); + // errorMessage.gameObject.SetActive(false); + // } + /// /// Apply the credentials input fields and start checking our authorization vault /// public void ApplyCredentials() { - errorMessage.gameObject.SetActive(false); + print(" applying"); + + // ShowCredentialsWarning(false); switch (handler.AuthorizationType) { diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs index 22eb6832..46e0c883 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs @@ -18,14 +18,13 @@ public void AddToProperties(RectTransform properties) var settings = Instantiate(inputPropertySectionPrefab, properties); var handler = GetComponent(); + foreach (var credentialInterface in settings.GetComponentsInChildren(true)) { print(credentialInterface); credentialInterface.Handler = handler; } - // if (settings.Handler == null) - // gameObject.AddComponent(); - + OnCredentialsPropertySectionInstantiated.Invoke(settings); } } diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs index 6c7cf9d2..ae864f97 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs @@ -29,13 +29,13 @@ public LayerCredentialsHandler Handler } } - private void OnEnable() + private void Start() { if (handler) handler.CredentialsAccepted.AddListener(OnCredentialsAccepted); } - private void OnDisable() + private void OnDestroy() { if (handler) handler.CredentialsAccepted.RemoveListener(OnCredentialsAccepted); @@ -43,6 +43,9 @@ private void OnDisable() private void OnCredentialsAccepted(bool accepted) { + if(accepted) + gameObject.SetActive(true); + validCredentialsPanel.SetActive(accepted); invalidCredentialsPanel.SetActive(!accepted); if (accepted) From a2d02b29e7606f3672f29783f0837b8260611eb2 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 11:05:28 +0200 Subject: [PATCH 08/36] fixed layout of status credentials indicator banners --- .../CredentialsPropertySection.prefab | 148 +++++++++++++++--- Assets/Scripts/KeyVault/KeyVault.cs | 1 + 2 files changed, 125 insertions(+), 24 deletions(-) diff --git a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab index 24410936..5bbad7af 100644 --- a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab +++ b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab @@ -361,7 +361,7 @@ PrefabInstance: - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} propertyPath: m_SizeDelta.y - value: 466.4 + value: 155.2 objectReference: {fileID: 0} - target: {fileID: 9193392669041292004, guid: e3342ba09b3c3e245ac1e7d9f4102026, type: 3} @@ -472,6 +472,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 91097826413237493, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Name + value: Successbanner + objectReference: {fileID: 0} - target: {fileID: 338865832173675934, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -592,6 +597,31 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1695388392469619316, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1695388392469619316, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: -45.999973 + objectReference: {fileID: 0} + - target: {fileID: 1695388392469619316, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1695388392469619316, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 23.000013 + objectReference: {fileID: 0} + - target: {fileID: 1695388392469619316, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1736263572779044457, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMax.y @@ -740,17 +770,17 @@ PrefabInstance: - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 15.74 objectReference: {fileID: 0} - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x - value: 58.54915 + value: 58.5 objectReference: {fileID: 0} - target: {fileID: 3082500189012022098, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.y - value: -18.6494 + value: -19 objectReference: {fileID: 0} - target: {fileID: 3259352152404739228, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -782,6 +812,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.37435 objectReference: {fileID: 0} + - target: {fileID: 4021479921507654788, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4021479921507654788, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 94 + objectReference: {fileID: 0} + - target: {fileID: 4021479921507654788, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 4021479921507654788, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5215792701007245346, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -945,22 +995,22 @@ PrefabInstance: - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 21.875 objectReference: {fileID: 0} - target: {fileID: 5613698658048985812, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -19 objectReference: {fileID: 0} - target: {fileID: 5726705694416920182, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -987,6 +1037,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -117.13655 objectReference: {fileID: 0} + - target: {fileID: 5853740481641482654, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Name + value: ErrorTitle + objectReference: {fileID: 0} - target: {fileID: 6130069684234356313, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_Name @@ -1000,57 +1055,57 @@ PrefabInstance: - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 327.37 objectReference: {fileID: 0} - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 36 objectReference: {fileID: 0} - target: {fileID: 6142442543201151741, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 181.685 objectReference: {fileID: 0} - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 363.37 objectReference: {fileID: 0} - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 181.685 objectReference: {fileID: 0} - target: {fileID: 6327921756129461789, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -79 objectReference: {fileID: 0} - target: {fileID: 6711146262947774155, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -1105,18 +1160,23 @@ PrefabInstance: - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.x - value: 58.54915 + value: 58.5 objectReference: {fileID: 0} - target: {fileID: 7356329727973705454, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_AnchoredPosition.y - value: -18.6494 + value: -19 objectReference: {fileID: 0} - target: {fileID: 7740096372769682743, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 7898008316363899058, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7902590509517085297, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_IsActive @@ -1160,7 +1220,7 @@ PrefabInstance: - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8214791640540355321, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -1200,7 +1260,7 @@ PrefabInstance: - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 54 objectReference: {fileID: 0} - target: {fileID: 8775081300947292879, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} @@ -1212,10 +1272,50 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8871802991950317880, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8871802991950317880, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.x + value: 94 + objectReference: {fileID: 0} + - target: {fileID: 8871802991950317880, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 8871802991950317880, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8871802991950317880, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8900216667368085455, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_ChildControlHeight - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8960671930166252824, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_text + value: "Authenticatie \nvoltooid" + objectReference: {fileID: 0} + - target: {fileID: 9065204554582670577, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 9117331064681798365, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_Name + value: ErrorBanner objectReference: {fileID: 0} - target: {fileID: 9117639121747927105, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} diff --git a/Assets/Scripts/KeyVault/KeyVault.cs b/Assets/Scripts/KeyVault/KeyVault.cs index f3191483..9e050557 100644 --- a/Assets/Scripts/KeyVault/KeyVault.cs +++ b/Assets/Scripts/KeyVault/KeyVault.cs @@ -140,6 +140,7 @@ private IEnumerator AccessWithUsernameAndPassword(string url, string username,st else { Debug.LogError("Access denied with username and password for: " + url); + //todo: send an event here so UI can update } } From 7e0f8b6b32fa1fcfa4d43f5a65a39f6b5513c1d1 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 11:19:17 +0200 Subject: [PATCH 09/36] fixed layout --- .../CredentialsPropertySection.prefab | 150 ++++++++++++++++-- .../CredentialsInput.prefab | 48 +++++- 2 files changed, 177 insertions(+), 21 deletions(-) diff --git a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab index 5bbad7af..10ad317a 100644 --- a/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab +++ b/Assets/Prefabs/UI/PropertySections/CredentialsPropertySection.prefab @@ -1297,6 +1297,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: d01d03b127df7b34cacbb24ee8f84d28, + type: 3} + propertyPath: m_ChildScaleWidth + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8900216667368085455, guid: d01d03b127df7b34cacbb24ee8f84d28, type: 3} propertyPath: m_ChildControlHeight @@ -1428,7 +1433,7 @@ PrefabInstance: - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -174.28365 + value: -127.9408 objectReference: {fileID: 0} - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1448,7 +1453,7 @@ PrefabInstance: - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 165.342 + value: 174 objectReference: {fileID: 0} - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1458,7 +1463,7 @@ PrefabInstance: - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -370.0038 + value: -281.6858 objectReference: {fileID: 0} - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1485,6 +1490,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -30.5979 objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMax.y @@ -1498,17 +1508,22 @@ PrefabInstance: - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.x - value: 298.37 + value: 297.37 objectReference: {fileID: 0} - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 46.931 + value: 24 objectReference: {fileID: 0} - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.x - value: 199.185 + value: 198.685 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -10 objectReference: {fileID: 0} - target: {fileID: 823784681733214707, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1565,6 +1580,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchorMax.y @@ -1578,22 +1598,22 @@ PrefabInstance: - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.x - value: 298.37 + value: 297.37 objectReference: {fileID: 0} - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 96.08099 + value: 84 objectReference: {fileID: 0} - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.x - value: 199.185 + value: 198.685 objectReference: {fileID: 0} - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -103.3015 + value: -76 objectReference: {fileID: 0} - target: {fileID: 1736263572779044457, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1660,6 +1680,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 33.9605 objectReference: {fileID: 0} + - target: {fileID: 1892504834166725439, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1892504834166725439, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1892504834166725439, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -21.4 + objectReference: {fileID: 0} - target: {fileID: 2026544915462219720, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_GlobalPointSize @@ -1871,6 +1906,16 @@ PrefabInstance: propertyPath: m_fontSizeBase value: 12.5 objectReference: {fileID: 0} + - target: {fileID: 4863835000429805149, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.x @@ -1881,6 +1926,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 40 objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_Pivot.x @@ -1919,7 +1974,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 287.3715 + value: 368.6858 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -1964,7 +2019,7 @@ PrefabInstance: - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -322.71426 + value: -300.3429 objectReference: {fileID: 0} - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -2198,6 +2253,31 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 297.37 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 198.685 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -138 + objectReference: {fileID: 0} - target: {fileID: 7902590509517085297, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_IsActive @@ -2251,7 +2331,7 @@ PrefabInstance: - target: {fileID: 8681879202439052226, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -2362,7 +2442,7 @@ PrefabInstance: - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_SizeDelta.y - value: 287.3715 + value: 194.6858 objectReference: {fileID: 0} - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -2372,7 +2452,17 @@ PrefabInstance: - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, type: 3} propertyPath: m_AnchoredPosition.y - value: -143.68575 + value: -97.3429 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildScaleWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildScaleHeight + value: 0 objectReference: {fileID: 0} - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, type: 3} @@ -2434,6 +2524,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 7812538328515808688} + - targetCorrespondingSourceObject: {fileID: 8681879202439052226, guid: 63fccc9491de61645b43763357399bad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8396949950907479114} m_SourcePrefab: {fileID: 100100000, guid: 63fccc9491de61645b43763357399bad, type: 3} --- !u!1 &582164384827256516 stripped GameObject: @@ -2441,6 +2535,32 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 8099856209361245446} m_PrefabAsset: {fileID: 0} +--- !u!114 &8396949950907479114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 582164384827256516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 16 + m_Top: 10 + m_Bottom: 16 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1208963087933705121 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab index 9ed0e674..d8f69a8b 100644 --- a/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab +++ b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialsInput.prefab @@ -1878,6 +1878,42 @@ MonoBehaviour: isAlert: 0 m_InputValidator: {fileID: 0} m_ShouldActivateOnSelect: 1 +--- !u!1 &3357793810572437091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7878319315528369777} + m_Layer: 5 + m_Name: ButtonRow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7878319315528369777 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3357793810572437091} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5314729983332226051} + m_Father: {fileID: 559905148040098935} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3380512735125174224 GameObject: m_ObjectHideFlags: 0 @@ -4163,7 +4199,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2933829340102187548 RectTransform: m_ObjectHideFlags: 0 @@ -4562,7 +4598,7 @@ RectTransform: m_Children: - {fileID: 666286390342822967} - {fileID: 1694517969475855548} - - {fileID: 5314729983332226051} + - {fileID: 7878319315528369777} m_Father: {fileID: 5507835546160925638} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -4995,7 +5031,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 559905148040098935} + m_TransformParent: {fileID: 7878319315528369777} m_Modifications: - target: {fileID: 309393778111507294, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -5125,12 +5161,12 @@ PrefabInstance: - target: {fileID: 4957780787399807716, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchoredPosition.x - value: -16 + value: 347 objectReference: {fileID: 0} - target: {fileID: 4957780787399807716, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchoredPosition.y - value: 53.3 + value: 73.3 objectReference: {fileID: 0} - target: {fileID: 4957780787399807716, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -5611,7 +5647,7 @@ PrefabInstance: - target: {fileID: 1518934753131645070, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_SizeDelta.x - value: 68.32 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1518934753131645070, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} From bbdfa31f13ae9e822b84c4913c9eb822e31ff60e Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 11:49:52 +0200 Subject: [PATCH 10/36] added functionality to layer error property toggle --- Assets/Prefabs/UI/Layers/LayerUI.prefab | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/UI/Layers/LayerUI.prefab b/Assets/Prefabs/UI/Layers/LayerUI.prefab index 454a4e5e..880d115a 100644 --- a/Assets/Prefabs/UI/Layers/LayerUI.prefab +++ b/Assets/Prefabs/UI/Layers/LayerUI.prefab @@ -2014,7 +2014,6 @@ MonoBehaviour: indentWidth: 24 foldoutToggle: {fileID: 2274689754544140435} layerTypeImage: {fileID: 1356745287749164724} - errorLayerTypeImage: {fileID: 94072058954664853} layerNameText: {fileID: 4813776858706825396} layerNameField: {fileID: 8882207419444401735} childrenPanel: {fileID: 4186340492675122666} @@ -2441,7 +2440,19 @@ MonoBehaviour: m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1850104207184435544} + m_TargetAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI + m_MethodName: set_isOn + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_IsOn: 1 --- !u!1 &7119179143932802346 GameObject: From cb3098bf272b374f24826712ce80b586ded53b01 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 13:04:52 +0200 Subject: [PATCH 11/36] fixed overlay panel when adding a custom 3d tile layer --- .../3DTiles/Nieuwe laag (3D Tiles).prefab | 35 +- .../Tile3DLayerPropertySection.prefab | 6 +- .../ImportFromURLContentOverlay.prefab | 2 +- .../Overlays/Tiles3DContentOverlay.prefab | 1766 ++++++++++++----- .../Tiles3DContentOverlayInspector.cs | 15 +- .../LayerTypes/Tile3DLayerGameObject.cs | 13 +- .../CredentialsInputPropertySection.cs | 29 +- 7 files changed, 1315 insertions(+), 551 deletions(-) diff --git a/Assets/Prefabs/3DTiles/Nieuwe laag (3D Tiles).prefab b/Assets/Prefabs/3DTiles/Nieuwe laag (3D Tiles).prefab index 1d6a39ca..b77e97d5 100644 --- a/Assets/Prefabs/3DTiles/Nieuwe laag (3D Tiles).prefab +++ b/Assets/Prefabs/3DTiles/Nieuwe laag (3D Tiles).prefab @@ -19,6 +19,7 @@ GameObject: - component: {fileID: 1194273570138351517} - component: {fileID: 2740582493697960923} - component: {fileID: 1859171214202950123} + - component: {fileID: -3598923106467742640} m_Layer: 7 m_Name: Nieuwe laag (3D Tiles) m_TagString: Untagged @@ -64,10 +65,12 @@ MonoBehaviour: boundingVolumeType: 0 values: [] BottomLeft: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] TopRight: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] @@ -141,10 +144,12 @@ MonoBehaviour: boundingVolumeType: 0 values: [] BottomLeft: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] TopRight: + coordinateSystem: 0 extraLongitudeRotation: 0 extraLattitudeRotation: 0 Points: [] @@ -192,6 +197,7 @@ MonoBehaviour: boundingRegion: [] tileCount: 0 nestingDepth: 0 + parseAssetMetadata: 0 parseSubObjects: 0 maxScreenHeightInPixels: 1080 maximumScreenSpaceError: 5 @@ -201,9 +207,15 @@ MonoBehaviour: unsupportedExtensionsParsed: m_PersistentCalls: m_Calls: [] + OnServerResponseReceived: + m_PersistentCalls: + m_Calls: [] OnServerRequestFailed: m_PersistentCalls: m_Calls: [] + OnLoadAssetMetadata: + m_PersistentCalls: + m_Calls: [] --- !u!114 &7109194962515795805 MonoBehaviour: m_ObjectHideFlags: 0 @@ -263,6 +275,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 284d1c20d5a85488d9fd5444dc075baf, type: 3} m_Name: m_EditorClassIdentifier: + prefabIdentifier: 395dd4e52bd3b42cfb24f183f3839bba onShow: m_PersistentCalls: m_Calls: [] @@ -270,7 +283,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] usePropertySections: 1 - openPropertiesOnStart: 0 UnsupportedExtensionsMessage: m_PersistentCalls: m_Calls: @@ -344,7 +356,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 217db7c8cb91f974daf1e7f820fb6a30, type: 3} m_Name: m_EditorClassIdentifier: - propertySectionPrefab: {fileID: -860560823292524916, guid: f241bd5b609aa4447ae89fb4325470ef, + autoApplyCredentials: 1 + inputPropertySectionPrefab: {fileID: 7185160580400989932, guid: f241bd5b609aa4447ae89fb4325470ef, type: 3} OnCredentialsPropertySectionInstantiated: m_PersistentCalls: @@ -363,7 +376,7 @@ MonoBehaviour: m_EditorClassIdentifier: overlayPrefab: {fileID: -5551926652888725166, guid: 3242028f86f3dad4a8d336a5e171cab1, type: 3} - referencedLayer: {fileID: 4142489338678956943} + layerGameObject: {fileID: 4142489338678956943} instantiateOnStart: 1 --- !u!114 &2740582493697960923 MonoBehaviour: @@ -377,7 +390,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 630f741154ed48488dc6602ef25dab3a, type: 3} m_Name: m_EditorClassIdentifier: - origin: {fileID: 0} worldTransformShifter: {fileID: 1859171214202950123} referenceCoordinateSystem: 4326 onPreShift: @@ -398,3 +410,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 89676a9f69324d308c537c8970b47571, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &-3598923106467742640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7974831043381414785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3b2880c796b146d191c4b41da5c526b, type: 3} + m_Name: + m_EditorClassIdentifier: + findKeyInVaultOnURLChange: 1 + keyVault: {fileID: 11400000, guid: dc14abcfb42578a4394b67591fc8ad1e, type: 2} + autoApplyCredentials: 1 diff --git a/Assets/Prefabs/UI/PropertySections/Tile3DLayerPropertySection.prefab b/Assets/Prefabs/UI/PropertySections/Tile3DLayerPropertySection.prefab index 45337a10..248c6308 100644 --- a/Assets/Prefabs/UI/PropertySections/Tile3DLayerPropertySection.prefab +++ b/Assets/Prefabs/UI/PropertySections/Tile3DLayerPropertySection.prefab @@ -38,9 +38,9 @@ RectTransform: - {fileID: 8217279611143772481} m_Father: {fileID: 5031956645437580411} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 150, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -88.50725} m_SizeDelta: {x: 300, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7934904425108834114 diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/ImportFromURLContentOverlay.prefab b/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/ImportFromURLContentOverlay.prefab index d9a9c38a..998b8d00 100644 --- a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/ImportFromURLContentOverlay.prefab +++ b/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/ImportFromURLContentOverlay.prefab @@ -2418,7 +2418,7 @@ PrefabInstance: - target: {fileID: 2925110442081368954, guid: eb072abfa5c622d4ba5e8e89f7f570d8, type: 3} propertyPath: m_SizeDelta.x - value: 1870 + value: 3790 objectReference: {fileID: 0} - target: {fileID: 2925110442081368954, guid: eb072abfa5c622d4ba5e8e89f7f570d8, type: 3} diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/Tiles3DContentOverlay.prefab b/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/Tiles3DContentOverlay.prefab index 4943c23b..6703a8dc 100644 --- a/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/Tiles3DContentOverlay.prefab +++ b/Assets/Prefabs/UI/Sidebar/SpecificComponents/Overlays/Tiles3DContentOverlay.prefab @@ -510,7 +510,7 @@ MonoBehaviour: m_EditorClassIdentifier: keyVault: {fileID: 11400000, guid: dc14abcfb42578a4394b67591fc8ad1e, type: 2} tile3DLayerPropertySection: {fileID: 8668067226482503201} - credentialsPropertySection: {fileID: 5881392315390237125} + credentialsPropertySection: {fileID: 5331133225744667385} credentialExplanation: {fileID: 7453908474343751450} --- !u!1 &8803879125735878052 GameObject: @@ -545,7 +545,7 @@ RectTransform: - {fileID: 948087542003093289} - {fileID: 7831682911984662105} - {fileID: 7453908474343751450} - - {fileID: 6937041731330063154} + - {fileID: 1844206636198855049} m_Father: {fileID: 820124582701762969} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -661,7 +661,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1001 &2706746233543991113 +--- !u!1001 &2988881578902327842 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -669,663 +669,314 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5270838650158361526} m_Modifications: - - target: {fileID: 457337991215462847, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.35998535 - objectReference: {fileID: 0} - - target: {fileID: 858942511908143817, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 858942511908143817, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_ChildScaleWidth + - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 858942511908143817, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_ChildControlWidth - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 858942511908143817, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_ChildForceExpandWidth - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 858942511908143817, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_ChildForceExpandHeight + - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 903595744795413488, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} + - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 903595744795413488, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -15.630981 - objectReference: {fileID: 0} - - target: {fileID: 1808317813446948740, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} + - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x - value: 28.599976 - objectReference: {fileID: 0} - - target: {fileID: 2144800274430791543, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2463468375141203970, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -30.199951 + - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4325632064885432000, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4325632064885432000, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4325632064885432000, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4325632064885432000, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4325632064885432000, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4325632064885432000, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_AnchorMin.x + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalPosition.x + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalPosition.y + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalPosition.z + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalRotation.x - value: -0 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalRotation.y - value: -0 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalRotation.z - value: -0 + propertyPath: m_SizeDelta.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalEulerAnglesHint.x + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalEulerAnglesHint.y + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5553231978802738151, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_ChildForceExpandHeight + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6724986731248308634, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6724986731248308634, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6724986731248308634, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.x - value: 68.32 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6724986731248308634, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6724986731248308634, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x - value: 44.16 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6724986731248308634, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 7185160580400989932, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - propertyPath: m_Name - value: CredentialsPropertySection + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8614721123552596982, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8614721123552596982, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8614721123552596982, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8614721123552596982, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8614721123552596982, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8638305519189295874, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8638305519189295874, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8638305519189295874, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8638305519189295874, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8638305519189295874, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9144997791536975474, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2384019302986958145, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_IsActive + propertyPath: m_PreserveAspect value: 1 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 1946154181870084145, guid: f241bd5b609aa4447ae89fb4325470ef, type: 3} - - {fileID: 5553231978802738151, guid: f241bd5b609aa4447ae89fb4325470ef, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7185160580400989932, guid: f241bd5b609aa4447ae89fb4325470ef, + - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - insertIndex: -1 - addedObject: {fileID: 8915943888527365103} - m_SourcePrefab: {fileID: 100100000, guid: f241bd5b609aa4447ae89fb4325470ef, type: 3} ---- !u!1 &5054897100231596453 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7185160580400989932, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - m_PrefabInstance: {fileID: 2706746233543991113} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8915943888527365103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5054897100231596453} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &5881392315390237125 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -860560823292524916, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - m_PrefabInstance: {fileID: 2706746233543991113} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5054897100231596453} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 270603827f3fb58429af99e4bc145f4e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &6937041731330063154 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5031956645437580411, guid: f241bd5b609aa4447ae89fb4325470ef, - type: 3} - m_PrefabInstance: {fileID: 2706746233543991113} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2988881578902327842 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5270838650158361526} - m_Modifications: - - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} + - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} + - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} + - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5518186736488111, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} + - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, + - target: {fileID: 2705361841668718935, guid: b70ba99e2cae844148e2ee6cddc2f301, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 2.3221436 + objectReference: {fileID: 0} + - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, + - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, + - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, + - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, + - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 77.5 objectReference: {fileID: 0} - - target: {fileID: 307941749747760438, guid: b70ba99e2cae844148e2ee6cddc2f301, + - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, + - target: {fileID: 3038298757064949646, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 393263175333225219, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 499123391680855826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 612959882518268165, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1855845078453230826, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1952289899379981489, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2009674742884281298, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2311015621590479488, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2384019302986958145, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2698778837446636164, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2705361841668718935, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 2.3221436 - objectReference: {fileID: 0} - - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 77.5 - objectReference: {fileID: 0} - - target: {fileID: 2787395471364433667, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3038298757064949646, guid: b70ba99e2cae844148e2ee6cddc2f301, - type: 3} - propertyPath: m_Pivot.x + propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - target: {fileID: 3038298757064949646, guid: b70ba99e2cae844148e2ee6cddc2f301, @@ -1776,7 +1427,7 @@ PrefabInstance: - target: {fileID: 6010885692309314774, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_SizeDelta.x - value: 1880 + value: 3791 objectReference: {fileID: 0} - target: {fileID: 6010885692309314774, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} @@ -1786,7 +1437,7 @@ PrefabInstance: - target: {fileID: 6010885692309314774, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} propertyPath: m_AnchoredPosition.x - value: 940 + value: 1895.5 objectReference: {fileID: 0} - target: {fileID: 6010885692309314774, guid: b70ba99e2cae844148e2ee6cddc2f301, type: 3} @@ -2232,32 +1883,32 @@ PrefabInstance: - target: {fileID: 578852039906225675, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 578852039906225675, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 578852039906225675, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 3784 objectReference: {fileID: 0} - target: {fileID: 578852039906225675, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 16.83 objectReference: {fileID: 0} - target: {fileID: 578852039906225675, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1908 objectReference: {fileID: 0} - target: {fileID: 578852039906225675, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -16.415 objectReference: {fileID: 0} - target: {fileID: 1123882199740587310, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} @@ -2267,37 +1918,37 @@ PrefabInstance: - target: {fileID: 1123882199740587310, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2552906593152444971, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2552906593152444971, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2552906593152444971, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 3784 objectReference: {fileID: 0} - target: {fileID: 2552906593152444971, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 33.65 objectReference: {fileID: 0} - target: {fileID: 2552906593152444971, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1908 objectReference: {fileID: 0} - target: {fileID: 2552906593152444971, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50.365 objectReference: {fileID: 0} - target: {fileID: 2644651578902084786, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} @@ -2330,7 +1981,7 @@ PrefabInstance: - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} @@ -2340,17 +1991,17 @@ PrefabInstance: - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 3800 objectReference: {fileID: 0} - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 73.19 objectReference: {fileID: 0} - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} @@ -2390,12 +2041,12 @@ PrefabInstance: - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1920 objectReference: {fileID: 0} - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -262.5595 objectReference: {fileID: 0} - target: {fileID: 5888758541032348987, guid: aa9cb35fedee1e64b99dc08ddf7bbcbc, type: 3} @@ -2440,7 +2091,7 @@ PrefabInstance: - target: {fileID: 1781802643554129927, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} @@ -2540,12 +2191,12 @@ PrefabInstance: - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} @@ -2585,3 +2236,1128 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &6194757454769424975 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5270838650158361526} + m_Modifications: + - target: {fileID: 343472854245994991, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 343472854245994991, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 343472854245994991, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 343472854245994991, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.51200104 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3791 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1895.5 + objectReference: {fileID: 0} + - target: {fileID: 542988683384133124, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -127.9408 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3800 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 174 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1900 + objectReference: {fileID: 0} + - target: {fileID: 559905148040098935, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -281.6858 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3791 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1895.5 + objectReference: {fileID: 0} + - target: {fileID: 569102230516401904, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30.5979 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3734 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1917 + objectReference: {fileID: 0} + - target: {fileID: 666286390342822967, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 1045388463160105844, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1432072964548747754, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3734 + objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 84 + objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1917 + objectReference: {fileID: 0} + - target: {fileID: 1694517969475855548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -76 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 113.95 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 15.74 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 66.975 + objectReference: {fileID: 0} + - target: {fileID: 1736263572779044457, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1795870347060740615, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 33.9605 + objectReference: {fileID: 0} + - target: {fileID: 1892504834166725439, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1892504834166725439, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 1892504834166725439, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -21.400024 + objectReference: {fileID: 0} + - target: {fileID: 2026544915462219720, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_GlobalPointSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 2026544915462219720, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 8756736721020988092} + - target: {fileID: 2026544915462219720, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Navigation.m_SelectOnRight + value: + objectReference: {fileID: 8756736721020988092} + - target: {fileID: 2341892395940235207, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 68.32 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 15.74 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2341892395940235207, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 2933829340102187548, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2978081655934536939, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3100782809805767299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 3100782809805767299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSizeBase + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 3152190557745971673, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3206033736352080115, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_GlobalPointSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 3206033736352080115, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 5325375478947900807} + - target: {fileID: 3206033736352080115, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Navigation.m_SelectOnLeft + value: + objectReference: {fileID: 5325375478947900807} + - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 68.32 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 15.74 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 44.16 + objectReference: {fileID: 0} + - target: {fileID: 3259352152404739228, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4190861408758051029, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_FillCenter + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 5331133225744667385} + - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ApplyCredentials + objectReference: {fileID: 0} + - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4766243256714044599, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4801465871055755664, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 4801465871055755664, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSizeBase + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 4863835000429805149, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 133.95 + objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5314729983332226051, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3791 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 194.6858 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1915.5 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -406.49738 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 363.37 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.685 + objectReference: {fileID: 0} + - target: {fileID: 5726705694416920182, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -241.00931 + objectReference: {fileID: 0} + - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 5331133225744667385} + - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ApplyCredentials + objectReference: {fileID: 0} + - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5737165667657000940, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5856099899943891420, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 5856099899943891420, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSizeBase + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 5928856013968725252, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.199951 + objectReference: {fileID: 0} + - target: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Name + value: Credentials + objectReference: {fileID: 0} + - target: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 5331133225744667385} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetAuthorizationInputType + objectReference: {fileID: 0} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7399221374800930897, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 7399221374800930897, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSizeBase + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 7597598095647187586, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 28.599976 + objectReference: {fileID: 0} + - target: {fileID: 7749322667523914015, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 7749322667523914015, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSizeBase + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 7821597135550254961, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3734 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1917 + objectReference: {fileID: 0} + - target: {fileID: 7878319315528369777, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -138 + objectReference: {fileID: 0} + - target: {fileID: 7902590509517085297, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8005117802335864549, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 8005117802335864549, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSizeBase + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 8167795785696828845, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Pivot.x + value: 0.99999964 + objectReference: {fileID: 0} + - target: {fileID: 8167795785696828845, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8167795785696828845, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8167795785696828845, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -15.631012 + objectReference: {fileID: 0} + - target: {fileID: 8167795785696828845, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8310904887951563914, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8516502833477463225, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.35998535 + objectReference: {fileID: 0} + - target: {fileID: 8681879202439052226, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 363.37 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.685 + objectReference: {fileID: 0} + - target: {fileID: 8775081300947292879, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -91.7937 + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 5331133225744667385} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 582164384827256516, guid: f241bd5b609aa4447ae89fb4325470ef, + type: 3} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 582164384827256516, guid: f241bd5b609aa4447ae89fb4325470ef, + type: 3} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: ShowCredentialsWarning + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Netherlands3D.Twin.Layers.Properties.CredentialsInputPropertySection, + Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8844358016171797785, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 3791 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 194.6858 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1895.5 + objectReference: {fileID: 0} + - target: {fileID: 8896109635212039299, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -97.3429 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildScaleWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildScaleHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildForceExpandWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8900216667368085455, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_Pivot.x + value: 0.99999964 + objectReference: {fileID: 0} + - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -15.630981 + objectReference: {fileID: 0} + - target: {fileID: 8998842710411304694, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 9060425072226539604, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSize + value: 12.5 + objectReference: {fileID: 0} + - target: {fileID: 9060425072226539604, guid: 63fccc9491de61645b43763357399bad, + type: 3} + propertyPath: m_fontSizeBase + value: 12.5 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7740096372769682743, guid: 63fccc9491de61645b43763357399bad, type: 3} + - {fileID: 4187864944359192514, guid: 63fccc9491de61645b43763357399bad, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5331133225744667385} + - targetCorrespondingSourceObject: {fileID: 8681879202439052226, guid: 63fccc9491de61645b43763357399bad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5843348112207702787} + m_SourcePrefab: {fileID: 100100000, guid: 63fccc9491de61645b43763357399bad, type: 3} +--- !u!1 &65956349255748630 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6130069684234356313, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5331133225744667385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65956349255748630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 270603827f3fb58429af99e4bc145f4e, type: 3} + m_Name: + m_EditorClassIdentifier: + inputPanel: {fileID: 118137401312830680} + errorMessage: {fileID: 3279755463851717005} + userNameInputField: {fileID: 5325375478947900807} + passwordInputField: {fileID: 8756736721020988092} + keyTokenOrCodeInputField: {fileID: 1633006052839764506} + credentialTypeDropdown: {fileID: 3843631921114191080} +--- !u!1 &118137401312830680 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6078599741548818071, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1633006052839764506 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4850844431071295573, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1844206636198855049 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5507835546160925638, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3279755463851717005 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8681879202439052226, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5843348112207702787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3279755463851717005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 16 + m_Top: 10 + m_Bottom: 16 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &3843631921114191080 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6966894674420244135, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5325375478947900807 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2026544915462219720, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8756736721020988092 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3206033736352080115, guid: 63fccc9491de61645b43763357399bad, + type: 3} + m_PrefabInstance: {fileID: 6194757454769424975} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs b/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs index 7a586e19..65a3ca3f 100644 --- a/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs +++ b/Assets/Scripts/Interface/ContentOverlay/Tiles3DContentOverlayInspector.cs @@ -13,8 +13,8 @@ public class Tiles3DContentOverlayInspector : OverlayInspector [Tooltip("The same URL input is used here, as the one used in the property panel")] [SerializeField] private Tile3DLayerPropertySection tile3DLayerPropertySection; - [FormerlySerializedAs("credentialsPropertySection")] [Tooltip("The same credentials input is used here, as the one used in the property panel")] - [SerializeField] private LayerCredentialsHandler credentialsHandler; + [Tooltip("The same credentials input is used here, as the one used in the property panel")] + [SerializeField] private CredentialsInputPropertySection credentialsPropertySection; [SerializeField] private RectTransform credentialExplanation; @@ -24,12 +24,12 @@ public class Tiles3DContentOverlayInspector : OverlayInspector public override void SetReferencedLayer(LayerGameObject layerGameObject) { base.SetReferencedLayer(layerGameObject); + credentialsPropertySection.Handler = layerGameObject.GetComponent(); layerGameObjectWithCredentials = layerGameObject as Tile3DLayerGameObject; CloseRightProperties(layerGameObject.LayerData); tile3DLayerPropertySection.Tile3DLayerGameObject = layerGameObjectWithCredentials; - layerGameObjectWithCredentials.OnURLChanged.AddListener(UrlHasChanged); layerGameObjectWithCredentials.OnServerResponseReceived.AddListener(ServerResponseReceived); } @@ -47,7 +47,7 @@ private void ServerResponseReceived(UnityWebRequest webRequestResult) if (webRequestResult.ReturnedServerError()) { credentialExplanation.gameObject.SetActive(false); - credentialsHandler.gameObject.SetActive(false); + credentialsPropertySection.gameObject.SetActive(false); } } @@ -56,7 +56,7 @@ private void OnEnable() keyVault.OnAuthorizationTypeDetermined.AddListener(DeterminedAuthorizationType); //Hide the credentials section by default. Only activated if we determine the URL needs credentials - credentialsHandler.gameObject.SetActive(false); + credentialsPropertySection.gameObject.SetActive(false); credentialExplanation.gameObject.SetActive(false); } @@ -97,9 +97,8 @@ private void DeterminedAuthorizationType(string url, AuthorizationType authoriza default: //Something went wrong, show the credentials section, starting with a default authentication input type var startingAuthenticationType = keyVault.GetKnownAuthorizationTypeForURL(url); - // credentialsHandler.LayerWithCredentials = layerGameObjectWithCredentials; - credentialsHandler.SetAuthorizationInputType(startingAuthenticationType); - // credentialsHandler.gameObject.SetActive(true); + credentialsPropertySection.SetAuthorizationInputType(startingAuthenticationType); + credentialsPropertySection.gameObject.SetActive(true); credentialExplanation.gameObject.SetActive(true); break; } diff --git a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs index 3dcebffe..7e14c9fd 100644 --- a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs +++ b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs @@ -53,15 +53,7 @@ private void EnableTileset() else tileSet.RefreshTiles(); } - - // private CredentialsInputPropertySection inputPropertySection; - // - // public CredentialsInputPropertySection InputPropertySection - // { - // get => inputPropertySection; - // set => inputPropertySection = value; - // } - + protected void Awake() { tileSet = GetComponent(); @@ -71,9 +63,6 @@ protected void Awake() propertySections = GetComponents().ToList(); else propertySections = new(); - - if (!GetComponent()) - gameObject.AddComponent(); } private void OnEnable() diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs index 0e2bd73b..a801f8d5 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs @@ -43,13 +43,6 @@ private void OnCredentialsAccepted(bool accepted) } } - // private void Awake() - // { - // handler = GetComponent(); - // if (!handler) - // handler = gameObject.AddComponent(); - // } - private void OnEnable() { ShowCredentialsWarning(false); @@ -57,38 +50,18 @@ private void OnEnable() public void ShowCredentialsWarning(bool show) { - print("shjowing warning:" + show); - //First failure from server may be ignored, because we want to give the user a chance to fill in the credentials via the credentials panel - // if (skipFirstCredentialErrorMessage) - // { - // print("skipping"); - // skipFirstCredentialErrorMessage = false; - // return; - // } - - //For now a standard text is shown. inputPanel.SetActive(!show); errorMessage.SetActive(show); if (!show) SetAuthorizationInputType(credentialTypeDropdown.value); } - - // public void CloseFailedFeedback() - // { - // inputPanel.SetActive(true); - // errorMessage.gameObject.SetActive(false); - // } - + /// /// Apply the credentials input fields and start checking our authorization vault /// public void ApplyCredentials() { - print(" applying"); - - // ShowCredentialsWarning(false); - switch (handler.AuthorizationType) { case AuthorizationType.UsernamePassword: From 5263401acd1a82122d7d25983b1d76fc74250c97 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 16:26:19 +0200 Subject: [PATCH 12/36] manually copied SunInspector.prefab from fix/Zonnestand_UI --- .../Sun/Prefabs/SunInspector.prefab | 141 +++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab b/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab index a7b9dbff..e2c1f638 100644 --- a/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab +++ b/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab @@ -1217,6 +1217,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1511401292902390516, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.23657227 + objectReference: {fileID: 0} - target: {fileID: 1806970590246025315, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchorMax.y @@ -1242,6 +1247,76 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -19.599976 objectReference: {fileID: 0} + - target: {fileID: 1935274140574512048, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.2364502 + objectReference: {fileID: 0} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_Target + value: + objectReference: {fileID: 2189983922252319120} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_MethodName + value: + objectReference: {fileID: 0} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_TargetAssemblyTypeName + value: Netherlands3D.Twin.UIButtonLogic, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2069054919531214468, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2069054919531214468, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2069054919531214468, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2069054919531214468, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2215818943602047383, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -55.73889 + objectReference: {fileID: 0} - target: {fileID: 2347405141916446194, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchoredPosition.x @@ -1252,6 +1327,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -23.699951 objectReference: {fileID: 0} + - target: {fileID: 2589442006332427558, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: Icon + value: + objectReference: {fileID: 5755817726856049363} - target: {fileID: 3452715905981332367, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchoredPosition.x @@ -1412,6 +1492,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 22.900024 objectReference: {fileID: 0} + - target: {fileID: 6375273232136385425, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6375273232136385425, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6375273232136385425, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6375273232136385425, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6772410837783005543, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6774450118841271536, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchoredPosition.x @@ -1497,10 +1602,20 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8757346257185307457, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_SizeDelta.x + value: -100.5964 + objectReference: {fileID: 0} - target: {fileID: 8757346257185307457, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchoredPosition.x - value: 28.092041 + value: 50.298218 + objectReference: {fileID: 0} + - target: {fileID: 8757346257185307457, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 9122291440695536421, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} @@ -1527,9 +1642,33 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} +--- !u!114 &2189983922252319120 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2589442006332427558, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + m_PrefabInstance: {fileID: 4434894509721109686} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bf1a1308af559e47a8cc837e50d8707, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4321994905311160222 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 464194535855973160, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} m_PrefabInstance: {fileID: 4434894509721109686} m_PrefabAsset: {fileID: 0} +--- !u!114 &5755817726856049363 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8244732699360065125, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + m_PrefabInstance: {fileID: 4434894509721109686} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: From ebb933d26b96ee75d39af2b0c87f289f29619822 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Mon, 7 Oct 2024 16:28:10 +0200 Subject: [PATCH 13/36] manually copied SunSettingsPanel.prefab from fix/Zonnestand_UI --- .../Sun/Prefabs/SunSettingsPanel.prefab | 626 +++++++++++++++--- 1 file changed, 518 insertions(+), 108 deletions(-) diff --git a/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab b/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab index 742c6fcc..bec0d5a8 100644 --- a/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab +++ b/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab @@ -187,8 +187,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 27.86, y: -9.703992} - m_SizeDelta: {x: -56.67, y: 19.418} + m_AnchoredPosition: {x: 50, y: -10} + m_SizeDelta: {x: -100, y: 19.4505} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3838426337568890623 CanvasRenderer: @@ -315,12 +315,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 4 m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} + m_SelectOnUp: {fileID: 1718158523197767743} + m_SelectOnDown: {fileID: 1718158523197767743} + m_SelectOnLeft: {fileID: 1718158523197767743} + m_SelectOnRight: {fileID: 1718158523197767743} m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} @@ -961,16 +961,16 @@ RectTransform: m_GameObject: {fileID: 1855400196271172582} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.45558614, y: 0.45558614, z: 0.45558614} + m_LocalScale: {x: 0.67812884, y: 0.67812884, z: 0.67812884} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6840221707609125860} - {fileID: 9196894221326461299} - m_Father: {fileID: 7234754521722894092} + m_Father: {fileID: 1511401292902390516} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -64.6, y: -109} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 50, y: 42.09349} m_SizeDelta: {x: 164, y: 80.5392} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6413837394061747773 @@ -1042,8 +1042,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.4999924, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchoredPosition: {x: -12.5, y: -0.5} + m_SizeDelta: {x: -25, y: -13} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7071881973489213349 CanvasRenderer: @@ -1073,7 +1073,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "re\xEBel tijdverloop" + m_text: realtime m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 32ddfb0cac272234c9b6f41500eb9afb, type: 2} m_sharedMaterial: {fileID: -6169979864846303504, guid: 32ddfb0cac272234c9b6f41500eb9afb, @@ -1101,10 +1101,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 8 - m_fontSizeBase: 14 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 8 m_fontSizeMax: 14 m_fontStyle: 0 @@ -1139,7 +1139,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -0.8531189, y: -6.7586823, z: -24.957123, w: -6.7618713} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1237,7 +1237,7 @@ MonoBehaviour: highlightedSprite: {fileID: 21300000, guid: 06292e83023a87f4ea442dbec186f5c9, type: 3} pressedSprite: {fileID: 21300000, guid: 4b22906407021f74faba50a418ddb625, type: 3} selectedSprite: {fileID: 21300000, guid: 4b22906407021f74faba50a418ddb625, type: 3} - disabledSprite: {fileID: 0} + disabledSprite: {fileID: 21300000, guid: 4b22906407021f74faba50a418ddb625, type: 3} --- !u!1 &2113000409186997894 GameObject: m_ObjectHideFlags: 0 @@ -1330,7 +1330,7 @@ MonoBehaviour: highlightedSprite: {fileID: 21300000, guid: d8aa4d1c1812e874c89aed6f84cbdadd, type: 3} pressedSprite: {fileID: 21300000, guid: eff437ffc67df40468bcf8eda2eda0f6, type: 3} selectedSprite: {fileID: 21300000, guid: eff437ffc67df40468bcf8eda2eda0f6, type: 3} - disabledSprite: {fileID: 0} + disabledSprite: {fileID: 21300000, guid: eff437ffc67df40468bcf8eda2eda0f6, type: 3} --- !u!1 &2466401188990122739 GameObject: m_ObjectHideFlags: 0 @@ -1512,7 +1512,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.00036621094, y: -199.9} + m_AnchoredPosition: {x: 0.00036621094, y: -282.50003} m_SizeDelta: {x: -32, y: 19.8673} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5590375263890121821 @@ -1571,8 +1571,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1652,17 +1652,13 @@ RectTransform: - {fileID: 3745886233170531190} - {fileID: 8333146178828178956} - {fileID: 7201819855323428816} - - {fileID: 560464594319260237} - - {fileID: 4970532645603616791} - - {fileID: 2215818943602047383} - {fileID: 5872131863888073098} - - {fileID: 5133996564984632998} m_Father: {fileID: 464194535855973160} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 290.2995} + m_SizeDelta: {x: 0, y: 364.6808} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2468181344738614165 CanvasRenderer: @@ -2002,12 +1998,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 4 m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} + m_SelectOnUp: {fileID: 3621217144147662820} + m_SelectOnDown: {fileID: 3621217144147662820} + m_SelectOnLeft: {fileID: 3621217144147662820} + m_SelectOnRight: {fileID: 3621217144147662820} m_Transition: 2 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} @@ -2099,7 +2095,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 22.581055, y: -155.0765} + m_AnchoredPosition: {x: 22.581055, y: -243.1} m_SizeDelta: {x: -76.216, y: 19.1001} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4360711855577114712 @@ -2158,8 +2154,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2521,8 +2517,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2788,8 +2784,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 181.2633, y: 0} - m_SizeDelta: {x: 362.5268, y: 0} + m_AnchoredPosition: {x: 180.5675, y: -4.8624268} + m_SizeDelta: {x: 361.1351, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &936243622650991644 CanvasRenderer: @@ -3002,13 +2998,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5133996564984632998} - {fileID: 8757346257185307457} m_Father: {fileID: 7234754521722894092} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -54.15561, y: -97.5} - m_SizeDelta: {x: -140.3114, y: 19.413} + m_AnchoredPosition: {x: 0.23654175, y: -180.1} + m_SizeDelta: {x: -31.527, y: 19.413} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1415218561421417906 CanvasRenderer: @@ -3066,8 +3063,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3295,7 +3292,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -4.8375244, y: -24} + m_AnchoredPosition: {x: -4.8374634, y: -24} m_SizeDelta: {x: -79.158, y: 19.8673} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7819257673158606143 @@ -3431,7 +3428,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.000011444092} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} --- !u!1 &7088198686551679407 @@ -3468,12 +3465,12 @@ RectTransform: - {fileID: 735437539369882392} - {fileID: 4433041202992481014} - {fileID: 1850721888752325735} - m_Father: {fileID: 7234754521722894092} + m_Father: {fileID: 7201819855323428816} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -71.26539, y: -77.750244} - m_SizeDelta: {x: 111.47771, y: 14.3424} + m_AnchoredPosition: {x: -55.73884, y: 0} + m_SizeDelta: {x: 111.47771, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5407876100097843902 CanvasRenderer: @@ -3565,7 +3562,7 @@ MonoBehaviour: m_MultiSelect: 0 m_Options: m_Options: - - m_Text: "re\xEBel tijdverloop" + - m_Text: realtime m_Image: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Text: uur per seconde @@ -3740,8 +3737,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 8 - m_fontSizeBase: 8 + m_fontSize: 11 + m_fontSizeBase: 11 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 8 @@ -3823,7 +3820,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.00024414062, y: -245.5} + m_AnchoredPosition: {x: 0.00024414062, y: -328.10004} m_SizeDelta: {x: -32, y: 19.413} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4601224534698425496 @@ -3882,8 +3879,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4033,8 +4030,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4112,8 +4109,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -54.155, y: -121.7} - m_SizeDelta: {x: -140.31, y: 19.413} + m_AnchoredPosition: {x: 0.23648071, y: -206.70004} + m_SizeDelta: {x: -31.527, y: 19.413} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3865187756512562344 CanvasRenderer: @@ -4171,8 +4168,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4324,7 +4321,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -15, y: 0} + m_AnchoredPosition: {x: -9.8, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1319755210699283718 @@ -4394,13 +4391,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 560464594319260237} + - {fileID: 4970532645603616791} + - {fileID: 2215818943602047383} m_Father: {fileID: 7234754521722894092} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 181.50024, y: -222.9} - m_SizeDelta: {x: 331, y: 19.413} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0.00024414062, y: -123.50003} + m_SizeDelta: {x: -32, y: 19.412994} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &818809882137187017 CanvasRenderer: @@ -4458,8 +4458,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12.5 - m_fontSizeBase: 12.5 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4888,6 +4888,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5579394863840340650, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: Icon + value: + objectReference: {fileID: 1172358062119824324} - target: {fileID: 7564383766856121656, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -5046,6 +5051,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &1172358062119824324 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + m_PrefabInstance: {fileID: 913197317751585325} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &5215668940848818377 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4957780787399807716, guid: 9b03494031e3bb643997bd5432bc015b, @@ -5058,23 +5075,64 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7234754521722894092} + m_TransformParent: {fileID: 7201819855323428816} m_Modifications: - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_text - value: "1\x03\u200B" + value: "\u221E\u200B" objectReference: {fileID: 0} - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.w + value: -1.983963 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.x + value: -1.6570587 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.y + value: -1.6526031 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.z + value: -1.6477203 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, + type: 2} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_fontSizeBase + value: 12 objectReference: {fileID: 0} - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_overflowMode value: 3 objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_text @@ -5088,8 +5146,14 @@ PrefabInstance: - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 12 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, + type: 2} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontStyle @@ -5110,11 +5174,26 @@ PrefabInstance: propertyPath: m_fontColor.g value: 0.22352941 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_fontSizeBase + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_TextWrappingMode value: 3 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontColor32.rgba @@ -5208,7 +5287,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.y - value: 14.3424 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5248,12 +5327,12 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.x - value: -153.72649 + value: -138.2 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.y - value: -77.750244 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5422,7 +5501,12 @@ PrefabInstance: - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5437,7 +5521,7 @@ PrefabInstance: - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5464,11 +5548,41 @@ PrefabInstance: propertyPath: m_TextWrappingMode value: 3 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontColor32.rgba value: 4283775282 objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 6467601663846620033} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 6467601663846620033} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnLeft + value: + objectReference: {fileID: 6467601663846620033} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnRight + value: + objectReference: {fileID: 6467601663846620033} - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.size @@ -5542,7 +5656,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.y - value: 14.3424 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5604,6 +5718,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_SizeDelta.y + value: -0.8188 + objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.0031003952 + objectReference: {fileID: 0} - target: {fileID: 8553505079585174411, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: trigger.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -5634,6 +5758,18 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 7053593094994427922} m_SourcePrefab: {fileID: 100100000, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} +--- !u!114 &3171617358672836563 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + m_PrefabInstance: {fileID: 2028786012163234064} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5977504864734157109} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &5572727072114807208 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, @@ -5755,6 +5891,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1511401292902390516} m_Modifications: + - target: {fileID: 156553241542023444, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.0000003874302 + objectReference: {fileID: 0} + - target: {fileID: 156553241542023444, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_text @@ -5763,7 +5909,22 @@ PrefabInstance: - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 730003109258751551, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_SizeDelta.y + value: 0.0000003874302 + objectReference: {fileID: 0} + - target: {fileID: 730003109258751551, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5778,7 +5939,7 @@ PrefabInstance: - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5805,11 +5966,41 @@ PrefabInstance: propertyPath: m_TextWrappingMode value: 3 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontColor32.rgba value: 4283775282 objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 3171617358672836563} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 3171617358672836563} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnLeft + value: + objectReference: {fileID: 3171617358672836563} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnRight + value: + objectReference: {fileID: 3171617358672836563} - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.size @@ -5883,12 +6074,12 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.x - value: -56.183 + value: -100.00006 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.y - value: 14.3424 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5928,12 +6119,12 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.x - value: 28.092041 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -0.000015258789 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5950,6 +6141,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_SizeDelta.y + value: -0.000005722 + objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6193,22 +6394,22 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 59305eb587200844b95a44dd500e7801, + objectReference: {fileID: 21300000, guid: 9e72de123c03c7340911d9ec780dca8f, type: 3} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.9490197 objectReference: {fileID: 0} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Color.g - value: 1 + value: 0.9215687 objectReference: {fileID: 0} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Color.r - value: 1 + value: 0.8980393 objectReference: {fileID: 0} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -6325,6 +6526,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5579394863840340650, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: Icon + value: + objectReference: {fileID: 3937390668158235504} - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchorMax.x @@ -6498,6 +6704,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: activeAtValue: 1 +--- !u!114 &3937390668158235504 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + m_PrefabInstance: {fileID: 3048148180775068313} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5735320692744513102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5735320692744513102 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7339391120316695767, guid: 9b03494031e3bb643997bd5432bc015b, @@ -6520,7 +6738,7 @@ MonoBehaviour: highlightedSprite: {fileID: 21300000, guid: 59305eb587200844b95a44dd500e7801, type: 3} pressedSprite: {fileID: 21300000, guid: 9e72de123c03c7340911d9ec780dca8f, type: 3} selectedSprite: {fileID: 21300000, guid: 9e72de123c03c7340911d9ec780dca8f, type: 3} - disabledSprite: {fileID: 0} + disabledSprite: {fileID: 21300000, guid: 9e72de123c03c7340911d9ec780dca8f, type: 3} --- !u!114 &6772410837783005543 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, @@ -6545,7 +6763,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7234754521722894092} + m_TransformParent: {fileID: 7201819855323428816} m_Modifications: - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6555,7 +6773,27 @@ PrefabInstance: - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 9.25 + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.w + value: -1.983963 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.x + value: -1.6570587 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.y + value: -1.6526031 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_margin.z + value: -1.6477203 objectReference: {fileID: 0} - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6563,6 +6801,11 @@ PrefabInstance: value: objectReference: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_fontSizeBase + value: 12 + objectReference: {fileID: 0} - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_overflowMode @@ -6573,6 +6816,11 @@ PrefabInstance: propertyPath: m_sharedMaterial value: objectReference: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_text @@ -6586,7 +6834,7 @@ PrefabInstance: - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 9.25 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6614,6 +6862,11 @@ PrefabInstance: propertyPath: m_fontColor.g value: 0.22352941 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_fontSizeBase + value: 12 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_sharedMaterial @@ -6624,6 +6877,11 @@ PrefabInstance: propertyPath: m_TextWrappingMode value: 3 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontColor32.rgba @@ -6693,7 +6951,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.y - value: 14.3424 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6733,12 +6991,12 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.x - value: -153.72649 + value: -138.2 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.y - value: -77.750244 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6755,6 +7013,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6527299783640815486, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Color.b + value: 0.9490197 + objectReference: {fileID: 0} + - target: {fileID: 6527299783640815486, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Color.g + value: 0.9215687 + objectReference: {fileID: 0} + - target: {fileID: 6527299783640815486, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Color.r + value: 0.8980393 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6838,7 +7111,12 @@ PrefabInstance: - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6853,7 +7131,7 @@ PrefabInstance: - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6880,11 +7158,41 @@ PrefabInstance: propertyPath: m_TextWrappingMode value: 3 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontColor32.rgba value: 4283775282 objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 6670846392588683233} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 6670846392588683233} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnLeft + value: + objectReference: {fileID: 6670846392588683233} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnRight + value: + objectReference: {fileID: 6670846392588683233} - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.size @@ -6958,7 +7266,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.y - value: 14.3424 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -7020,6 +7328,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_SizeDelta.y + value: -0.8188 + objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.0031003952 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -7158,6 +7476,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7630754167147001154} m_PrefabAsset: {fileID: 0} +--- !u!114 &6467601663846620033 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + m_PrefabInstance: {fileID: 7630754167147001154} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2825460506498938215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7833994497739237666 PrefabInstance: m_ObjectHideFlags: 0 @@ -7174,7 +7504,12 @@ PrefabInstance: - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 682979640690371858, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -7189,7 +7524,7 @@ PrefabInstance: - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontSize - value: 8.5 + value: 14 objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -7216,11 +7551,41 @@ PrefabInstance: propertyPath: m_TextWrappingMode value: 3 objectReference: {fileID: 0} + - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1105806121077348609, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_fontColor32.rgba value: 4283775282 objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_Mode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnUp + value: + objectReference: {fileID: 1718158523197767743} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnDown + value: + objectReference: {fileID: 1718158523197767743} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnLeft + value: + objectReference: {fileID: 1718158523197767743} + - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_Navigation.m_SelectOnRight + value: + objectReference: {fileID: 1718158523197767743} - target: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_OnEndEdit.m_PersistentCalls.m_Calls.Array.size @@ -7294,7 +7659,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.y - value: 14.3424 + value: 18 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -7356,6 +7721,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_SizeDelta.y + value: -0.8188 + objectReference: {fileID: 0} + - target: {fileID: 8389700776407591122, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.0031003952 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -7494,6 +7869,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 7833994497739237666} m_PrefabAsset: {fileID: 0} +--- !u!114 &6670846392588683233 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3469015320980451011, guid: 2ae4535c62cdb144b9610806f19cdcf8, + type: 3} + m_PrefabInstance: {fileID: 7833994497739237666} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2478140180863641863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7963056663080789900 PrefabInstance: m_ObjectHideFlags: 0 @@ -7541,28 +7928,34 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: fd83fa623e88e1949917bbe79f944645, + objectReference: {fileID: 21300000, guid: 9f5a7f5c98675b843af84a906f8b119b, type: 3} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Color.b - value: 1 + value: 0.9490197 objectReference: {fileID: 0} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Color.g - value: 1 + value: 0.9215687 objectReference: {fileID: 0} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Color.r - value: 1 + value: 0.8980393 objectReference: {fileID: 0} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_PreserveAspect value: 0 objectReference: {fileID: 0} + - target: {fileID: 2818050124483050654, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 384522467, guid: 019f3eaccd6c3964483d360ede15def7, + type: 3} - target: {fileID: 2818050124483050654, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_PixelsPerUnitMultiplier @@ -7673,6 +8066,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5579394863840340650, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: Icon + value: + objectReference: {fileID: 8244732699360065125} - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchorMax.x @@ -7849,7 +8247,7 @@ MonoBehaviour: highlightedSprite: {fileID: 21300000, guid: fd83fa623e88e1949917bbe79f944645, type: 3} pressedSprite: {fileID: 21300000, guid: 9f5a7f5c98675b843af84a906f8b119b, type: 3} selectedSprite: {fileID: 21300000, guid: 9f5a7f5c98675b843af84a906f8b119b, type: 3} - disabledSprite: {fileID: 0} + disabledSprite: {fileID: 21300000, guid: 9f5a7f5c98675b843af84a906f8b119b, type: 3} --- !u!114 &1815839608268311666 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, @@ -7887,3 +8285,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: activeAtValue: 1 +--- !u!114 &8244732699360065125 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + m_PrefabInstance: {fileID: 7963056663080789900} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817601857619682139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: From db524edb9c3714bf90a23a97dd786ca775416e58 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Tue, 8 Oct 2024 10:43:17 +0200 Subject: [PATCH 14/36] Fixed forward/backward button interactable states --- .../Scripts/UI/MatchSpriteToSelectionState.cs | 5 +- .../Sun/Prefabs/SunInspector.prefab | 49 +++---- .../Sun/Prefabs/SunSettingsPanel.prefab | 121 +++++++++--------- 3 files changed, 81 insertions(+), 94 deletions(-) diff --git a/Assets/Scripts/UI/MatchSpriteToSelectionState.cs b/Assets/Scripts/UI/MatchSpriteToSelectionState.cs index 86ccd336..a44bb3b6 100644 --- a/Assets/Scripts/UI/MatchSpriteToSelectionState.cs +++ b/Assets/Scripts/UI/MatchSpriteToSelectionState.cs @@ -11,7 +11,6 @@ public class MatchSpriteToSelectionState : MonoBehaviour { [SerializeField] private Selectable targetSelectable; private Image image; - private Sprite normalSprite; [SerializeField] private Sprite highlightedSprite; [SerializeField] private Sprite pressedSprite; [SerializeField] private Sprite selectedSprite; @@ -24,8 +23,10 @@ private void Awake() private void Update() { - if (!targetSelectable.image) + if (!targetSelectable.targetGraphic) + { return; + } if (targetSelectable.image.overrideSprite == targetSelectable.spriteState.highlightedSprite) image.overrideSprite = highlightedSprite; diff --git a/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab b/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab index e2c1f638..c279f7fa 100644 --- a/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab +++ b/Assets/_Functionalities/Sun/Prefabs/SunInspector.prefab @@ -1242,6 +1242,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1815839608268311666, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1858049259937940920, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchoredPosition.y @@ -1262,11 +1267,6 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, - type: 3} - propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_Target - value: - objectReference: {fileID: 2189983922252319120} - target: {fileID: 2065293323940796844, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[6].m_CallState @@ -1331,7 +1331,7 @@ PrefabInstance: type: 3} propertyPath: Icon value: - objectReference: {fileID: 5755817726856049363} + objectReference: {fileID: 0} - target: {fileID: 3452715905981332367, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchoredPosition.x @@ -1442,6 +1442,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -27.027344 objectReference: {fileID: 0} + - target: {fileID: 5303494817684282130, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_Type + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5480690298829426581, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchorMax.y @@ -1522,6 +1527,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -59.80005 objectReference: {fileID: 0} + - target: {fileID: 7024736743551311057, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7234754521722894092, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} propertyPath: m_AnchorMax.y @@ -1637,38 +1647,15 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 0} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} ---- !u!114 &2189983922252319120 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2589442006332427558, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, - type: 3} - m_PrefabInstance: {fileID: 4434894509721109686} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2bf1a1308af559e47a8cc837e50d8707, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &4321994905311160222 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 464194535855973160, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, type: 3} m_PrefabInstance: {fileID: 4434894509721109686} m_PrefabAsset: {fileID: 0} ---- !u!114 &5755817726856049363 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8244732699360065125, guid: 0cfaeaf4a6f8c4da3aba90dcd40f6b47, - type: 3} - m_PrefabInstance: {fileID: 4434894509721109686} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab b/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab index bec0d5a8..758f65f6 100644 --- a/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab +++ b/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab @@ -3004,7 +3004,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.23654175, y: -180.1} + m_AnchoredPosition: {x: 0.23657227, y: -180.1} m_SizeDelta: {x: -31.527, y: 19.413} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1415218561421417906 @@ -3292,7 +3292,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -4.8374634, y: -24} + m_AnchoredPosition: {x: -4.8374023, y: -24} m_SizeDelta: {x: -79.158, y: 19.8673} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7819257673158606143 @@ -3469,7 +3469,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -55.73884, y: 0} + m_AnchoredPosition: {x: -55.73889, y: 0} m_SizeDelta: {x: 111.47771, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5407876100097843902 @@ -4109,7 +4109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.23648071, y: -206.70004} + m_AnchoredPosition: {x: 0.2364502, y: -206.70004} m_SizeDelta: {x: -31.527, y: 19.413} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3865187756512562344 @@ -4892,7 +4892,7 @@ PrefabInstance: type: 3} propertyPath: Icon value: - objectReference: {fileID: 1172358062119824324} + objectReference: {fileID: 0} - target: {fileID: 7564383766856121656, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -5051,18 +5051,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1172358062119824324 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, - type: 3} - m_PrefabInstance: {fileID: 913197317751585325} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &5215668940848818377 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4957780787399807716, guid: 9b03494031e3bb643997bd5432bc015b, @@ -6394,7 +6382,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9e72de123c03c7340911d9ec780dca8f, + objectReference: {fileID: 21300000, guid: 59305eb587200844b95a44dd500e7801, type: 3} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -6530,7 +6518,7 @@ PrefabInstance: type: 3} propertyPath: Icon value: - objectReference: {fileID: 3937390668158235504} + objectReference: {fileID: 0} - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchorMax.x @@ -6606,10 +6594,16 @@ PrefabInstance: propertyPath: m_Interactable value: 0 objectReference: {fileID: 0} + - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: -925990288, guid: 684e92b4ad6094443b44e3cdcef55829, + type: 3} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -6619,7 +6613,7 @@ PrefabInstance: - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -6630,8 +6624,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 11400000, guid: a869eef3f52109349a649796d0ede268, - type: 2} + objectReference: {fileID: 2065293323940796844} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -6645,7 +6638,7 @@ PrefabInstance: - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: InvokeStarted + value: Select objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -6655,7 +6648,7 @@ PrefabInstance: - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: Netherlands3D.Events.FloatEvent, eu.netherlands3d.event-system.Runtime + value: UnityEngine.UI.Selectable, UnityEngine.UI objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -6672,7 +6665,9 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7564383766856121656, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} + - {fileID: 5579394863840340650, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -6704,18 +6699,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: activeAtValue: 1 ---- !u!114 &3937390668158235504 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, - type: 3} - m_PrefabInstance: {fileID: 3048148180775068313} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5735320692744513102} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &5735320692744513102 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7339391120316695767, guid: 9b03494031e3bb643997bd5432bc015b, @@ -7928,7 +7911,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 9f5a7f5c98675b843af84a906f8b119b, + objectReference: {fileID: 21300000, guid: fd83fa623e88e1949917bbe79f944645, type: 3} - target: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -7950,11 +7933,16 @@ PrefabInstance: propertyPath: m_PreserveAspect value: 0 objectReference: {fileID: 0} + - target: {fileID: 2818050124483050654, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: m_Type + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2818050124483050654, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 384522467, guid: 019f3eaccd6c3964483d360ede15def7, + objectReference: {fileID: 1524316019, guid: 15baa476e5caed14a8324710760c09db, type: 3} - target: {fileID: 2818050124483050654, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -8070,7 +8058,17 @@ PrefabInstance: type: 3} propertyPath: Icon value: - objectReference: {fileID: 8244732699360065125} + objectReference: {fileID: 0} + - target: {fileID: 7564383766856121656, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 7564383766856121656, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} - target: {fileID: 8229404338314957064, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_AnchorMax.x @@ -8146,10 +8144,22 @@ PrefabInstance: propertyPath: m_Interactable value: 0 objectReference: {fileID: 0} + - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 384522467, guid: 019f3eaccd6c3964483d360ede15def7, + type: 3} + - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, + type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: -925990288, guid: 684e92b4ad6094443b44e3cdcef55829, + type: 3} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -8159,7 +8169,7 @@ PrefabInstance: - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -8170,8 +8180,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 11400000, guid: a869eef3f52109349a649796d0ede268, - type: 2} + objectReference: {fileID: 2065293323940796844} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState @@ -8185,7 +8194,7 @@ PrefabInstance: - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: InvokeStarted + value: Select objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -8195,7 +8204,7 @@ PrefabInstance: - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: Netherlands3D.Events.FloatEvent, eu.netherlands3d.event-system.Runtime + value: UnityEngine.UI.Selectable, UnityEngine.UI objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} @@ -8205,14 +8214,16 @@ PrefabInstance: - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_FloatArgument - value: 0.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8624777396393225214, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5579394863840340650, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} + - {fileID: 7564383766856121656, guid: 9b03494031e3bb643997bd5432bc015b, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -8285,15 +8296,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: activeAtValue: 1 ---- !u!114 &8244732699360065125 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2083294629274030569, guid: 9b03494031e3bb643997bd5432bc015b, - type: 3} - m_PrefabInstance: {fileID: 7963056663080789900} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 817601857619682139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: From 73b065f218fead7206e0fc153c6a987cf260b5a6 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Tue, 8 Oct 2024 11:25:39 +0200 Subject: [PATCH 15/36] fixed overlapping arrow on animation speed dropdown --- .../Sun/Prefabs/SunSettingsPanel.prefab | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab b/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab index 758f65f6..00995029 100644 --- a/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab +++ b/Assets/_Functionalities/Sun/Prefabs/SunSettingsPanel.prefab @@ -1101,8 +1101,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 11 + m_fontSizeBase: 11 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 8 @@ -3469,8 +3469,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -55.73889, y: 0} - m_SizeDelta: {x: 111.47771, y: 18} + m_AnchoredPosition: {x: -58.9832, y: 0} + m_SizeDelta: {x: 118, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5407876100097843902 CanvasRenderer: @@ -4321,8 +4321,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -9.8, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_AnchoredPosition: {x: -7.5, y: 0} + m_SizeDelta: {x: 15, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1319755210699283718 CanvasRenderer: @@ -5270,7 +5270,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.x - value: 46.8031 + value: 35 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -5315,7 +5315,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.x - value: -138.2 + value: -144.1 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6929,7 +6929,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_SizeDelta.x - value: 46.8031 + value: 35 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} @@ -6974,7 +6974,7 @@ PrefabInstance: - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} propertyPath: m_AnchoredPosition.x - value: -138.2 + value: -144.1 objectReference: {fileID: 0} - target: {fileID: 5868752843910826168, guid: 2ae4535c62cdb144b9610806f19cdcf8, type: 3} From e64818de4d87369b3a800edd079f593c87954df3 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 9 Oct 2024 14:39:08 +0200 Subject: [PATCH 16/36] fixed margins --- .../SpecificComponents/CredentialStatusPropertyPanel.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab index 7cb1e922..8db818b0 100644 --- a/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab +++ b/Assets/Prefabs/UI/Sidebar/SpecificComponents/CredentialStatusPropertyPanel.prefab @@ -4143,7 +4143,7 @@ MonoBehaviour: m_Padding: m_Left: 18 m_Right: 18 - m_Top: 0 + m_Top: 14 m_Bottom: 14 m_ChildAlignment: 0 m_Spacing: 8.33 @@ -5103,7 +5103,7 @@ MonoBehaviour: m_Padding: m_Left: 18 m_Right: 18 - m_Top: 0 + m_Top: 14 m_Bottom: 14 m_ChildAlignment: 0 m_Spacing: 8.33 From d34fb3f1b52126bc1fae7248cb592eb75d714ea7 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 9 Oct 2024 14:55:02 +0200 Subject: [PATCH 17/36] Added icons for error properties --- Assets/Prefabs/UI/Layers/LayerUI.prefab | 6 +- .../UI/Icons/Error Properties (selected).png | 3 + .../Error Properties (selected).png.meta | 127 ++++++++++++++++++ Assets/Sprites/UI/Icons/Error Properties.png | 3 + .../UI/Icons/Error Properties.png.meta | 127 ++++++++++++++++++ 5 files changed, 263 insertions(+), 3 deletions(-) create mode 100644 Assets/Sprites/UI/Icons/Error Properties (selected).png create mode 100644 Assets/Sprites/UI/Icons/Error Properties (selected).png.meta create mode 100644 Assets/Sprites/UI/Icons/Error Properties.png create mode 100644 Assets/Sprites/UI/Icons/Error Properties.png.meta diff --git a/Assets/Prefabs/UI/Layers/LayerUI.prefab b/Assets/Prefabs/UI/Layers/LayerUI.prefab index 880d115a..3e1a2a54 100644 --- a/Assets/Prefabs/UI/Layers/LayerUI.prefab +++ b/Assets/Prefabs/UI/Layers/LayerUI.prefab @@ -1360,14 +1360,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8901961, g: 0.3372549, b: 0.3372549, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 480a966344c074049aee99d24a5f0cdf, type: 3} + m_Sprite: {fileID: 21300000, guid: eece9aeaed9174cacb8ee2fbdb19515d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3029,7 +3029,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 480a966344c074049aee99d24a5f0cdf, type: 3} + m_Sprite: {fileID: 21300000, guid: a22176728706c4e17a2b7cef9463c333, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Sprites/UI/Icons/Error Properties (selected).png b/Assets/Sprites/UI/Icons/Error Properties (selected).png new file mode 100644 index 00000000..cccfecd0 --- /dev/null +++ b/Assets/Sprites/UI/Icons/Error Properties (selected).png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f4fbf739bed2bb16fc681ff7a932b919867a9a0089829796902626af1cebfd +size 987 diff --git a/Assets/Sprites/UI/Icons/Error Properties (selected).png.meta b/Assets/Sprites/UI/Icons/Error Properties (selected).png.meta new file mode 100644 index 00000000..60f014ff --- /dev/null +++ b/Assets/Sprites/UI/Icons/Error Properties (selected).png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: eece9aeaed9174cacb8ee2fbdb19515d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/UI/Icons/Error Properties.png b/Assets/Sprites/UI/Icons/Error Properties.png new file mode 100644 index 00000000..9978df4f --- /dev/null +++ b/Assets/Sprites/UI/Icons/Error Properties.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b573edb6335149a93650d682078c4cc5a0ed72cda8cf2d34a4d688a0a15bf6d +size 573 diff --git a/Assets/Sprites/UI/Icons/Error Properties.png.meta b/Assets/Sprites/UI/Icons/Error Properties.png.meta new file mode 100644 index 00000000..9dd2830b --- /dev/null +++ b/Assets/Sprites/UI/Icons/Error Properties.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a22176728706c4e17a2b7cef9463c333 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: From 6b55b2d58d3336c31f6836a2628ba3c070844045 Mon Sep 17 00:00:00 2001 From: FrisoBooij Date: Wed, 16 Oct 2024 11:04:02 +0200 Subject: [PATCH 18/36] ColorsettingsPrefab_Maaiveldlagen_UI Updated the Color settings Prefab --- .../GeneralComponents/ColorSettings.prefab | 3204 +++++++++++++++-- 1 file changed, 2884 insertions(+), 320 deletions(-) diff --git a/Assets/Prefabs/UI/Sidebar/GeneralComponents/ColorSettings.prefab b/Assets/Prefabs/UI/Sidebar/GeneralComponents/ColorSettings.prefab index 686246e2..a0c621f3 100644 --- a/Assets/Prefabs/UI/Sidebar/GeneralComponents/ColorSettings.prefab +++ b/Assets/Prefabs/UI/Sidebar/GeneralComponents/ColorSettings.prefab @@ -197,6 +197,106 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &40368892401355746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9070564581530678262} + - component: {fileID: 3012573636685271298} + - component: {fileID: 1707543017228736464} + - component: {fileID: 2013496466620202787} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9070564581530678262 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40368892401355746} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6003809247039904447} + - {fileID: 4204024787073808125} + - {fileID: 319031901998283201} + - {fileID: 3658660066673679309} + - {fileID: 7792385876586678930} + - {fileID: 3142673160104054878} + - {fileID: 9126122818250157360} + - {fileID: 363805051127112899} + - {fileID: 2097149591507515266} + - {fileID: 2456353046848971272} + - {fileID: 6750217299612181577} + - {fileID: 8498160621084522138} + m_Father: {fileID: 8414866739782488373} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_Pivot: {x: 0, y: 1} +--- !u!114 &3012573636685271298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40368892401355746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 1 + m_CellSize: {x: 140, y: 30} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &1707543017228736464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40368892401355746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &2013496466620202787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 40368892401355746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37ea20068fd120849a07008a6d5d6a3b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &74217241092656323 GameObject: m_ObjectHideFlags: 0 @@ -1434,6 +1534,143 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &674251291756703847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 101887462192951614} + - component: {fileID: 3838477130844638938} + m_Layer: 5 + m_Name: ColorLibraryMaaiveldlagen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &101887462192951614 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674251291756703847} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3400053245267096328} + - {fileID: 3881540718008312339} + m_Father: {fileID: 464194535855973160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 171.7811} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3838477130844638938 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 674251291756703847} + m_CullTransparentMesh: 1 +--- !u!1 &713442577464443491 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8414866739782488373} + - component: {fileID: 8387927147621894393} + - component: {fileID: 8913142706468555755} + - component: {fileID: 1763963329799996603} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8414866739782488373 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 713442577464443491} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9070564581530678262} + m_Father: {fileID: 3881540718008312339} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -9, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8387927147621894393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 713442577464443491} + m_CullTransparentMesh: 1 +--- !u!114 &8913142706468555755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 713442577464443491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1763963329799996603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 713442577464443491} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &726838128829467067 GameObject: m_ObjectHideFlags: 0 @@ -2516,6 +2753,8 @@ RectTransform: - {fileID: 4514428373952560368} - {fileID: 8490087536535987107} - {fileID: 181646870433977483} + - {fileID: 7258109759001269404} + - {fileID: 3855428685695105277} - {fileID: 7378341585378817158} - {fileID: 4824296869154606158} - {fileID: 2347405141916446194} @@ -4563,7 +4802,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2553083767628693474 +--- !u!1 &2550072692318657476 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4571,79 +4810,67 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4733884640361685705} - - component: {fileID: 2040399242220119499} - - component: {fileID: 3491634405372085203} - - component: {fileID: 1897463761780307008} + - component: {fileID: 3881540718008312339} + - component: {fileID: 11478039433765133} + - component: {fileID: 735366467604621704} + - component: {fileID: 4582932591730193566} m_Layer: 5 - m_Name: Viewport + m_Name: Scroll View m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4733884640361685705 +--- !u!224 &3881540718008312339 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2553083767628693474} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 2550072692318657476} + 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3588458455800026366} - m_Father: {fileID: 3447126913808213} + - {fileID: 8570109029587824882} + - {fileID: 8414866739782488373} + m_Father: {fileID: 101887462192951614} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &2040399242220119499 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2553083767628693474} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &3491634405372085203 + m_AnchoredPosition: {x: 0.000030517578, y: -79.6289} + m_SizeDelta: {x: -32, y: 146.894} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &11478039433765133 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2553083767628693474} + m_GameObject: {fileID: 2550072692318657476} m_CullTransparentMesh: 1 ---- !u!114 &1897463761780307008 +--- !u!114 &735366467604621704 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2553083767628693474} + m_GameObject: {fileID: 2550072692318657476} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1536639797, guid: 273f161db5cda784ba2a95d15b93e9f1, type: 3} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4653,7 +4880,37 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2688010128755277139 +--- !u!114 &4582932591730193566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550072692318657476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 9070564581530678262} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 8414866739782488373} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 794331424397033701} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 1 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2553083767628693474 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4661,8 +4918,98 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8407611925402942102} - - component: {fileID: 7397197346487029992} + - component: {fileID: 4733884640361685705} + - component: {fileID: 2040399242220119499} + - component: {fileID: 3491634405372085203} + - component: {fileID: 1897463761780307008} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4733884640361685705 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2553083767628693474} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3588458455800026366} + m_Father: {fileID: 3447126913808213} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2040399242220119499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2553083767628693474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &3491634405372085203 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2553083767628693474} + m_CullTransparentMesh: 1 +--- !u!114 &1897463761780307008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2553083767628693474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 1536639797, guid: 273f161db5cda784ba2a95d15b93e9f1, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2688010128755277139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8407611925402942102} + - component: {fileID: 7397197346487029992} - component: {fileID: 8093411513471526962} m_Layer: 5 m_Name: TileColor @@ -7783,6 +8130,7 @@ RectTransform: - {fileID: 1389967864631557269} - {fileID: 7234754521722894092} - {fileID: 9011228877444776870} + - {fileID: 101887462192951614} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8245,6 +8593,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5189014479524058962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3400053245267096328} + - component: {fileID: 6770587997793443906} + - component: {fileID: 2677442934643314935} + m_Layer: 5 + m_Name: Divider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3400053245267096328 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5189014479524058962} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 101887462192951614} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -32, y: 1.0345} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6770587997793443906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5189014479524058962} + m_CullTransparentMesh: 1 +--- !u!114 &2677442934643314935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5189014479524058962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7b73fab88b94ff741aab029820e9f3eb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5254441464932740627 GameObject: m_ObjectHideFlags: 0 @@ -9117,7 +9540,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &5712829760672722195 +--- !u!1 &5662676847463055614 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9125,64 +9548,65 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 758995458788383082} - - component: {fileID: 4364912000556265250} - - component: {fileID: 6723084050551590808} + - component: {fileID: 3855428685695105277} + - component: {fileID: 1383785386827204946} + - component: {fileID: 8634690527104346526} + - component: {fileID: 2301746962899457247} m_Layer: 5 - m_Name: Shadow + m_Name: MaaiveldLibraryToggleOn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &758995458788383082 + m_IsActive: 0 +--- !u!224 &3855428685695105277 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5712829760672722195} + m_GameObject: {fileID: 5662676847463055614} 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: 0.7478992, y: 0.7478992, z: 0.7478992} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2628816199918025402} + m_Father: {fileID: 8065810425275369335} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25.49997, y: -25.49997} - m_SizeDelta: {x: 51, y: 51} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -76, y: -22.8} + m_SizeDelta: {x: 23.683014, y: 23.683} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4364912000556265250 +--- !u!222 &1383785386827204946 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5712829760672722195} + m_GameObject: {fileID: 5662676847463055614} m_CullTransparentMesh: 1 ---- !u!114 &6723084050551590808 +--- !u!114 &8634690527104346526 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5712829760672722195} + m_GameObject: {fileID: 5662676847463055614} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.18431373, g: 0.20784314, b: 0.3137255, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77099d06e93e57745b77c5885d97fa9c, type: 3} + m_Sprite: {fileID: 21300000, guid: d180f1b02e4f7aa4ab90d31387567c5e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9192,85 +9616,240 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5725717133424679233 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2953402993583927450} - - component: {fileID: 1628629497594093861} - - component: {fileID: 9089382526779959294} - m_Layer: 5 - m_Name: Item Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2953402993583927450 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5725717133424679233} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4805777912357118912} - 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: 10, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1628629497594093861 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5725717133424679233} - m_CullTransparentMesh: 1 ---- !u!114 &9089382526779959294 +--- !u!114 &2301746962899457247 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5725717133424679233} + m_GameObject: {fileID: 5662676847463055614} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5760556268741930671 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8212081159575462680} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8499874343846816528} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 5662676847463055614} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 674251291756703847} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!1 &5712829760672722195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 758995458788383082} + - component: {fileID: 4364912000556265250} + - component: {fileID: 6723084050551590808} + m_Layer: 5 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &758995458788383082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5712829760672722195} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2628816199918025402} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 25.49997, y: -25.49997} + m_SizeDelta: {x: 51, y: 51} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4364912000556265250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5712829760672722195} + m_CullTransparentMesh: 1 +--- !u!114 &6723084050551590808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5712829760672722195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 77099d06e93e57745b77c5885d97fa9c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5725717133424679233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2953402993583927450} + - component: {fileID: 1628629497594093861} + - component: {fileID: 9089382526779959294} + m_Layer: 5 + m_Name: Item Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2953402993583927450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5725717133424679233} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4805777912357118912} + 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: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1628629497594093861 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5725717133424679233} + m_CullTransparentMesh: 1 +--- !u!114 &9089382526779959294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5725717133424679233} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5760556268741930671 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -12311,7 +12890,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7378341585378817158 RectTransform: m_ObjectHideFlags: 0 @@ -14867,7 +15446,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &8517935106075233192 +--- !u!1 &8499874343846816528 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14875,65 +15454,65 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5610728215191469901} - - component: {fileID: 7896175891492708594} - - component: {fileID: 2300039294395805930} + - component: {fileID: 7258109759001269404} + - component: {fileID: 4560147640754860108} + - component: {fileID: 8212081159575462680} + - component: {fileID: 7470362329591842652} m_Layer: 5 - m_Name: TileColor + m_Name: MaaiveldLibraryToggleOff m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5610728215191469901 +--- !u!224 &7258109759001269404 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8517935106075233192} + m_GameObject: {fileID: 8499874343846816528} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.61942613, y: 0.61942613, z: 0.61942613} + m_LocalScale: {x: 0.7478992, y: 0.7478992, z: 0.7478992} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 680117307270333298} - m_Father: {fileID: 6700722601711221815} + m_Children: [] + m_Father: {fileID: 8065810425275369335} 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: 46.3, y: -0.4172516} - m_SizeDelta: {x: 51, y: 51} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -76, y: -22.8} + m_SizeDelta: {x: 23.683014, y: 23.683} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7896175891492708594 +--- !u!222 &4560147640754860108 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8517935106075233192} + m_GameObject: {fileID: 8499874343846816528} m_CullTransparentMesh: 1 ---- !u!114 &2300039294395805930 +--- !u!114 &8212081159575462680 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8517935106075233192} + m_GameObject: {fileID: 8499874343846816528} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7400185, b: 0, a: 1} + m_Color: {r: 0.18431373, g: 0.20784314, b: 0.3137255, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3ec14e8f070ce6d4aa5e23bd526ea28e, type: 3} + m_Sprite: {fileID: 21300000, guid: d180f1b02e4f7aa4ab90d31387567c5e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14943,15 +15522,171 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8537832072180363495 -GameObject: +--- !u!114 &7470362329591842652 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5178616415993095029} + m_GameObject: {fileID: 8499874343846816528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8212081159575462680} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8499874343846816528} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 5662676847463055614} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 674251291756703847} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &8517935106075233192 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5610728215191469901} + - component: {fileID: 7896175891492708594} + - component: {fileID: 2300039294395805930} + m_Layer: 5 + m_Name: TileColor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5610728215191469901 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8517935106075233192} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.61942613, y: 0.61942613, z: 0.61942613} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 680117307270333298} + m_Father: {fileID: 6700722601711221815} + 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: 46.3, y: -0.4172516} + m_SizeDelta: {x: 51, y: 51} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7896175891492708594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8517935106075233192} + m_CullTransparentMesh: 1 +--- !u!114 &2300039294395805930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8517935106075233192} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.7400185, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3ec14e8f070ce6d4aa5e23bd526ea28e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8537832072180363495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5178616415993095029} - component: {fileID: 5397535207326882911} - component: {fileID: 4731947500072263589} - component: {fileID: 7134455076327301832} @@ -16022,18 +16757,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9177825199695398843} m_CullTransparentMesh: 1 ---- !u!1001 &776729076120684488 +--- !u!1001 &457507773546910458 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1862391620528445496} + m_TransformParent: {fileID: 9070564581530678262} m_Modifications: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (2) + value: Spoorbanen objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16113,12 +16848,12 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 70 + value: 210 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -75 + value: -105 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16135,18 +16870,33 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Spoorbanen + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Spoorbanen\u200B" + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &3353108091389081402 stripped +--- !u!224 &2456353046848971272 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 776729076120684488} + m_PrefabInstance: {fileID: 457507773546910458} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1297464232438652322 +--- !u!1001 &776729076120684488 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -16157,7 +16907,7 @@ PrefabInstance: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (7) + value: ColorSwatch (2) objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16237,12 +16987,12 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: -75 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16264,185 +17014,1917 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &3913162062822911312 stripped +--- !u!224 &3353108091389081402 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 1297464232438652322} + m_PrefabInstance: {fileID: 776729076120684488} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1439023916215534103 +--- !u!1001 &1140211593602654380 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6477857883445368892} + m_TransformParent: {fileID: 9070564581530678262} m_Modifications: - - target: {fileID: 1781802643554129927, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: Scrollbar Vertical + value: Bruggen objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Pivot.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchorMin.x - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_SizeDelta.x - value: 12 + value: 140 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_SizeDelta.y - value: 144.7092 + value: 30 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 70 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: 72.5 + value: -165 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - propertyPath: m_AnchorMax.x - value: 1 + propertyPath: m_Enabled + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - propertyPath: m_AnchorMax.y - value: 1 + propertyPath: m_Text + value: Bruggen objectReference: {fileID: 0} - - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_text + value: "Bruggen\u200B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &3142673160104054878 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 1140211593602654380} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1297464232438652322 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862391620528445496} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: ColorSwatch (7) + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &3913162062822911312 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 1297464232438652322} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1439023916215534103 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6477857883445368892} + m_Modifications: + - target: {fileID: 1781802643554129927, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_Name + value: Scrollbar Vertical + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_SizeDelta.x + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_SizeDelta.y + value: 144.7092 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 72.5 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMin.y value: 0.18392223 objectReference: {fileID: 0} - - target: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_Size + value: 0.81607777 + objectReference: {fileID: 0} + - target: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} +--- !u!224 &4495894458151257012 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + m_PrefabInstance: {fileID: 1439023916215534103} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4867701567814267811 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + m_PrefabInstance: {fileID: 1439023916215534103} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1624100735847377727 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9070564581530678262} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: Onbegroeid + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -105 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Onbegroeid + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Onbegroeid\u200B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &3658660066673679309 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 1624100735847377727} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1726625488132324081 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862391620528445496} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: ColorSwatch (9) + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -105 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &3727265572562192899 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 1726625488132324081} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2099219937232692334 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862391620528445496} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: ColorSwatch (5) + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -165 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &4138299639666562204 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 2099219937232692334} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2168604942236337679 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9070564581530678262} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: Parkeervakken + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Parkeervelden + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Parkeervelden\u200B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &4204024787073808125 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 2168604942236337679} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2315607920202484019 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9070564581530678262} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: Begroeid + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -75 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Begroeid + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Begroeid\u200B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &319031901998283201 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 2315607920202484019} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2317384099600890639 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862391620528445496} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: ColorSwatch (6) + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &317183257844550653 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 2317384099600890639} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2396937777954640945 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9070564581530678262} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: Wegen + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Wegen + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Wegen\u200B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &363805051127112899 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 2396937777954640945} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2778166395316413711 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1862391620528445496} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: ColorSwatch (10) + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -135 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &198681117289403901 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 2778166395316413711} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4131294547780487024 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9070564581530678262} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: Erven + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -75 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Erven + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Erven\u200B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &2097149591507515266 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 4131294547780487024} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5218477188397382240 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9070564581530678262} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: Woonerven + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -135 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Woonerven + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Woonerven\u200B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &7792385876586678930 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + m_PrefabInstance: {fileID: 5218477188397382240} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5881794566795511400 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9070564581530678262} + m_Modifications: + - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Name + value: Water + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -165 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - propertyPath: m_Size - value: 0.81607777 + propertyPath: m_LocalEulerAnglesHint.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - propertyPath: m_Value - value: 1 + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Water + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Water\u200B" objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} ---- !u!224 &4495894458151257012 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} +--- !u!224 &8498160621084522138 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, - type: 3} - m_PrefabInstance: {fileID: 1439023916215534103} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4867701567814267811 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 1439023916215534103} + m_PrefabInstance: {fileID: 5881794566795511400} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &1726625488132324081 +--- !u!1001 &6550869010722643394 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1862391620528445496} + m_TransformParent: {fileID: 9070564581530678262} m_Modifications: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (9) + value: Fietspaden objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16527,7 +19009,7 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -105 + value: -15 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16544,142 +19026,194 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Fietspaden + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Fietspaden\u200B" + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &3727265572562192899 stripped +--- !u!224 &9126122818250157360 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 1726625488132324081} + m_PrefabInstance: {fileID: 6550869010722643394} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2099219937232692334 +--- !u!1001 &6589879309884879185 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1862391620528445496} + m_TransformParent: {fileID: 3881540718008312339} m_Modifications: - - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 1781802643554129927, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_Name - value: ColorSwatch (5) + value: Scrollbar Vertical objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_Pivot.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 12 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_SizeDelta.y - value: 30 + value: 144.7092 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchoredPosition.x - value: 70 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_AnchoredPosition.y - value: -165 + value: 72.5 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + - target: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690174632879616221, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_Size + value: 0.81607777 + objectReference: {fileID: 0} + - target: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &4138299639666562204 stripped + m_SourcePrefab: {fileID: 100100000, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} +--- !u!114 &794331424397033701 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5797817625417347508, guid: 115ed422e629e4645bfb5c97e46c2e9b, + type: 3} + m_PrefabInstance: {fileID: 6589879309884879185} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8570109029587824882 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, + m_CorrespondingSourceObject: {fileID: 3286731148600885667, guid: 115ed422e629e4645bfb5c97e46c2e9b, type: 3} - m_PrefabInstance: {fileID: 2099219937232692334} + m_PrefabInstance: {fileID: 6589879309884879185} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2317384099600890639 +--- !u!1001 &6607473099323656657 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -16690,7 +19224,7 @@ PrefabInstance: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (6) + value: ColorSwatch (1) objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16770,12 +19304,12 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -15 + value: -45 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16797,13 +19331,13 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &317183257844550653 stripped +--- !u!224 &9222713666426452259 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 2317384099600890639} + m_PrefabInstance: {fileID: 6607473099323656657} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2778166395316413711 +--- !u!1001 &6802733840073296731 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -16814,7 +19348,7 @@ PrefabInstance: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (10) + value: ColorSwatch (8) objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16899,7 +19433,7 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -135 + value: -75 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -16921,13 +19455,13 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &198681117289403901 stripped +--- !u!224 &8802275107994532777 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 2778166395316413711} + m_PrefabInstance: {fileID: 6802733840073296731} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6607473099323656657 +--- !u!1001 &6910531327636519125 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -16938,7 +19472,7 @@ PrefabInstance: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (1) + value: ColorSwatch (11) objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17018,12 +19552,12 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 70 + value: 210 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: -165 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17045,13 +19579,13 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &9222713666426452259 stripped +--- !u!224 &8910652584308787239 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 6607473099323656657} + m_PrefabInstance: {fileID: 6910531327636519125} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6802733840073296731 +--- !u!1001 &6974334503338235271 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -17062,7 +19596,7 @@ PrefabInstance: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (8) + value: ColorSwatch objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17142,12 +19676,12 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -75 + value: -15 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17169,13 +19703,13 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &8802275107994532777 stripped +--- !u!224 &4937648021248025973 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 6802733840073296731} + m_PrefabInstance: {fileID: 6974334503338235271} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6910531327636519125 +--- !u!1001 &8372272898386062017 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -17186,7 +19720,7 @@ PrefabInstance: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (11) + value: ColorSwatch (3) objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17266,12 +19800,12 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 70 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -165 + value: -105 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17293,24 +19827,24 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &8910652584308787239 stripped +--- !u!224 &5800518836905155123 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 6910531327636519125} + m_PrefabInstance: {fileID: 8372272898386062017} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6974334503338235271 +--- !u!1001 &8583311420800313933 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1862391620528445496} + m_TransformParent: {fileID: 9070564581530678262} m_Modifications: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch + value: Voetpaden objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17412,18 +19946,33 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Voetpaden + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Voetpaden\u200B" + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &4937648021248025973 stripped +--- !u!224 &6003809247039904447 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 6974334503338235271} + m_PrefabInstance: {fileID: 8583311420800313933} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8372272898386062017 +--- !u!1001 &8642386005735337786 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -17434,7 +19983,7 @@ PrefabInstance: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (3) + value: ColorSwatch (4) objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17519,7 +20068,7 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.y - value: -105 + value: -135 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17541,24 +20090,24 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &5800518836905155123 stripped +--- !u!224 &6025869876843159496 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 8372272898386062017} + m_PrefabInstance: {fileID: 8642386005735337786} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8642386005735337786 +--- !u!1001 &8782663789994267835 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1862391620528445496} + m_TransformParent: {fileID: 9070564581530678262} m_Modifications: - target: {fileID: 564940261321804659, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_Name - value: ColorSwatch (4) + value: Constructies objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17638,7 +20187,7 @@ PrefabInstance: - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} propertyPath: m_AnchoredPosition.x - value: 70 + value: 210 objectReference: {fileID: 0} - target: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} @@ -17660,14 +20209,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5152865510944536800, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8367693085950956018, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_Text + value: Constructies + objectReference: {fileID: 0} + - target: {fileID: 8421007504637765793, guid: 2e9e32516b497cc47b378e422fb16002, + type: 3} + propertyPath: m_text + value: "Constructies\u200B" + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} ---- !u!224 &6025869876843159496 stripped +--- !u!224 &6750217299612181577 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616552838660092146, guid: 2e9e32516b497cc47b378e422fb16002, type: 3} - m_PrefabInstance: {fileID: 8642386005735337786} + m_PrefabInstance: {fileID: 8782663789994267835} m_PrefabAsset: {fileID: 0} From 5f290bd2da66cd601075c714f1182d1aa50510de Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:02:52 +0200 Subject: [PATCH 19/36] fixed override methods --- Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs index 022eff48..9e27364f 100644 --- a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs +++ b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs @@ -65,14 +65,16 @@ protected void Awake() propertySections = new(); } - private void OnEnable() + protected override void OnEnable() { + base.OnEnable(); tileSet.unsupportedExtensionsParsed.AddListener(InvokeUnsupportedExtensionsMessage); OnServerResponseReceived.AddListener(ProcessServerResponse); } - private void OnDisable() + protected override void OnDisable() { + base.OnDisable(); tileSet.unsupportedExtensionsParsed.RemoveListener(InvokeUnsupportedExtensionsMessage); OnServerResponseReceived.RemoveListener(ProcessServerResponse); } From ac98b883f29d90a74d7bce4e075ee76f0c912131 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:04:59 +0200 Subject: [PATCH 20/36] simplified condition --- .../Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs index 9e27364f..cfdfcaf3 100644 --- a/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs +++ b/Assets/Scripts/Layers/LayerTypes/Tile3DLayerGameObject.cs @@ -81,14 +81,7 @@ protected override void OnDisable() private void ProcessServerResponse(UnityWebRequest request) { - if (request.result != UnityWebRequest.Result.Success) - { - LayerData.HasValidCredentials = false; - } - else - { - LayerData.HasValidCredentials = true; - } + LayerData.HasValidCredentials = request.result == UnityWebRequest.Result.Success; } protected override void Start() From 26c88ee567397d984e10bd04c18b7633184af763 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:05:46 +0200 Subject: [PATCH 21/36] removed commented code --- Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs b/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs index 4a61fc7a..994a608f 100644 --- a/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs +++ b/Assets/Scripts/Layers/LayerTypes/ILayerWithCredentials.cs @@ -9,7 +9,6 @@ namespace Netherlands3D.Twin.Layers.LayerTypes { public interface ILayerWithCredentials { - // public CredentialsInputPropertySection InputPropertySection { get; set; } public UnityEvent OnServerResponseReceived { get; } public UnityEvent OnURLChanged { get; } From e1905940fd703b3ed9a841085d3d2809a6edccbf Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:08:26 +0200 Subject: [PATCH 22/36] removed unused code --- Assets/Scripts/Layers/LayerUIManager.cs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Assets/Scripts/Layers/LayerUIManager.cs b/Assets/Scripts/Layers/LayerUIManager.cs index 0727f0af..af6ece39 100644 --- a/Assets/Scripts/Layers/LayerUIManager.cs +++ b/Assets/Scripts/Layers/LayerUIManager.cs @@ -16,7 +16,6 @@ public class LayerUIManager : MonoBehaviour, IPointerDownHandler [SerializeField] private LayerUI LayerUIPrefab; [SerializeField] private List layerTypeSprites; - [SerializeField] private List disabledLayerTypeSprites; [SerializeField] private RectTransform layerUIContainer; public RectTransform LayerUIContainer => layerUIContainer; @@ -192,14 +191,6 @@ private Sprite GetProxyLayerSprite(LayerGameObject layer) } } - public Sprite GetDisabledLayerTypeSprite(Sprite original) - { - var index = layerTypeSprites.IndexOf(original); - if(index >= 0 && index < disabledLayerTypeSprites.Count) - return disabledLayerTypeSprites[index]; - return disabledLayerTypeSprites[0]; - } - public void EnableContextMenu(bool enable, Vector2 position = default) { if (contextMenu) From 52f3d68f0bac24c1df3e52b3e853408e12497e55 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:16:45 +0200 Subject: [PATCH 23/36] removed print --- .../PropertyPanels/CredentialsPropertySectionInstantiator.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs index 46e0c883..c5a7302f 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs @@ -21,7 +21,6 @@ public void AddToProperties(RectTransform properties) foreach (var credentialInterface in settings.GetComponentsInChildren(true)) { - print(credentialInterface); credentialInterface.Handler = handler; } From e9986b1b087234095fe67d759ec4a04a9cb4ec5b Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:18:12 +0200 Subject: [PATCH 24/36] cleanup --- .../CredentialsValidationPropertySection.cs | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs index ae864f97..d6b73ffe 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsValidationPropertySection.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Netherlands3D.Twin.Layers.LayerTypes; + using UnityEngine; namespace Netherlands3D.Twin.Layers.Properties @@ -48,12 +45,6 @@ private void OnCredentialsAccepted(bool accepted) validCredentialsPanel.SetActive(accepted); invalidCredentialsPanel.SetActive(!accepted); - if (accepted) - { - print("accepted"); - } - else - print("rejected"); } } } \ No newline at end of file From 8e528b55cfba7c7f6bae5c791e491a101fb5700d Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:19:21 +0200 Subject: [PATCH 25/36] cleanup --- .../PropertyPanels/LayerCredentialsHandler.cs | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs index f3ecb870..bc855362 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs @@ -35,29 +35,6 @@ public bool AutoApplyCredentials private ILayerWithCredentials layerWithCredentials; private LayerGameObject layerGameObject; - // public ILayerWithCredentials LayerWithCredentials - // { - // get { return layerWithCredentials; } - // set - // { - // if (layerWithCredentials != null) - // { - // layerWithCredentials.OnURLChanged.RemoveListener(UrlHasChanged); - // layerWithCredentials.OnServerResponseReceived.RemoveListener(HandleServerResponse); - // } - // - // layerWithCredentials = value; - // - // if (layerWithCredentials != null) - // { - // layerWithCredentials.OnURLChanged.AddListener(UrlHasChanged); - // layerWithCredentials.OnServerResponseReceived.AddListener(HandleServerResponse); - // - // UrlHasChanged(layerWithCredentials.URL); - // } - // } - // } - public bool HasValidCredentials => layerGameObject && layerGameObject.LayerData.HasValidCredentials; public UnityEvent CredentialsAccepted => layerGameObject.LayerData.HasValidCredentialsChanged; @@ -90,21 +67,12 @@ public void HandleServerResponse(UnityWebRequest webRequest) if (webRequest.result != UnityWebRequest.Result.Success) { layerGameObject.LayerData.HasValidCredentials = false; - // CredentialsAccepted.Invoke(false); } else { layerGameObject.LayerData.HasValidCredentials = true; - // CredentialsAccepted.Invoke(true); } - // if(webRequest.ReturnedServerError()) - // { - // //Disable credentials property section if we get a server error (not tied to credentials) - // Debug.LogWarning("Server request failed: " + webRequest); - // gameObject.SetActive(false); - // } - // else if (webRequest.RequiresCredentials()) { Debug.LogWarning("Credentials required: " + webRequest); @@ -169,7 +137,6 @@ public void ApplyCredentials() private void OnCredentialTypeDetermined(string url, AuthorizationType type) { - // credentialTypeDropdown.value = (int)type; authorizationType = type; switch (type) @@ -212,12 +179,6 @@ public void SetAuthorizationInputType(AuthorizationType type) ) type = AuthorizationType.InferableSingleKey; - // credentialTypeDropdown.value = (int)type; - - //Similar values are not reapplied, so make sure to the dropdown items appear - // if (credentialTypeDropdown.TryGetComponent(out DropdownSelection dropdownSelection)) - // dropdownSelection.DropdownSelectItem(credentialTypeDropdown.value); - authorizationType = type; } } From caf178915eb3e392a7ee985e9a96e60964279f63 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:20:30 +0200 Subject: [PATCH 26/36] simplified condition --- .../PropertyPanels/LayerCredentialsHandler.cs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs index bc855362..81432991 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/LayerCredentialsHandler.cs @@ -63,15 +63,7 @@ private void OnDisable() public void HandleServerResponse(UnityWebRequest webRequest) { - - if (webRequest.result != UnityWebRequest.Result.Success) - { - layerGameObject.LayerData.HasValidCredentials = false; - } - else - { - layerGameObject.LayerData.HasValidCredentials = true; - } + layerGameObject.LayerData.HasValidCredentials = webRequest.result == UnityWebRequest.Result.Success; if (webRequest.RequiresCredentials()) { From 26c7d7e7111372237b808814edfc607f72836709 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:27:05 +0200 Subject: [PATCH 27/36] removed comment --- .../Properties/PropertyPanels/CredentialsInputPropertySection.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs index a801f8d5..0020ffc2 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs @@ -28,7 +28,6 @@ public LayerCredentialsHandler Handler handler = value; skipFirstCredentialErrorMessage = true; - // OnCredentialsAccepted(handler.HasValidCredentials); handler.CredentialsAccepted.AddListener(OnCredentialsAccepted); } From 540dc8c9014940fe754794aa32f6eab4da859a10 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:27:17 +0200 Subject: [PATCH 28/36] removed unused field --- .../PropertyPanels/CredentialsPropertySectionInstantiator.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs index c5a7302f..76b5012c 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs @@ -8,7 +8,6 @@ namespace Netherlands3D.Twin.Layers.Properties { public class CredentialsPropertySectionInstantiator : MonoBehaviour, IPropertySectionInstantiator { - [SerializeField] private bool autoApplyCredentials = false; [SerializeField] private GameObject inputPropertySectionPrefab; [HideInInspector] public UnityEvent OnCredentialsPropertySectionInstantiated = new(); From 80d72cb1ca710b794476d3954cb5c38e47b7eba0 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 14:52:34 +0200 Subject: [PATCH 29/36] removed unused code --- .../CredentialsPropertySectionInstantiator.cs | 3 --- .../Scripts/GoogleRealityMeshConfigurationAdapter.cs | 10 ++-------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs index 76b5012c..e7063b70 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsPropertySectionInstantiator.cs @@ -9,7 +9,6 @@ namespace Netherlands3D.Twin.Layers.Properties public class CredentialsPropertySectionInstantiator : MonoBehaviour, IPropertySectionInstantiator { [SerializeField] private GameObject inputPropertySectionPrefab; - [HideInInspector] public UnityEvent OnCredentialsPropertySectionInstantiated = new(); public void AddToProperties(RectTransform properties) { @@ -22,8 +21,6 @@ public void AddToProperties(RectTransform properties) { credentialInterface.Handler = handler; } - - OnCredentialsPropertySectionInstantiated.Invoke(settings); } } } \ No newline at end of file diff --git a/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs b/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs index 9c5540e5..bd5bca2a 100644 --- a/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs +++ b/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs @@ -16,12 +16,11 @@ public class GoogleRealityMeshConfigurationAdapter : MonoBehaviour private void Awake() { - if(!read3DTileset) + if (!read3DTileset) read3DTileset = GetComponent(); //Apply key as default input to the credentials property section when it spawns - credentialsPropertySectionInstantiator.OnCredentialsPropertySectionInstantiated.AddListener(CredentialsPropertySectionInstantiated); - + read3DTileset.publicKey = configuration.ApiKey; #if UNITY_EDITOR read3DTileset.personalKey = configuration.ApiKey; @@ -29,10 +28,5 @@ private void Awake() read3DTileset.enabled = true; } - - private void CredentialsPropertySectionInstantiated(GameObject credentialsInputPropertySection) - { - // credentialsInputPropertySection.SetInputFieldsValues(key: configuration.ApiKey); - } } } \ No newline at end of file From 4b2b7b6d396ccdb6404b3244240b2218b0b34b9e Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 17:13:06 +0200 Subject: [PATCH 30/36] added comment to explain unused function --- .../PropertyPanels/CredentialsInputPropertySection.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs index 0020ffc2..ccc8319d 100644 --- a/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs +++ b/Assets/Scripts/Layers/Properties/PropertyPanels/CredentialsInputPropertySection.cs @@ -97,6 +97,8 @@ public void SetAuthorizationInputType(AuthorizationType type) /// /// Fill the inputs with predefined values /// + + //Todo: This function is no longer used. This does cause the currently used key to not show up when re-opening the properties panel, this should be re-implemented if deemed a useful feature. public void SetInputFieldsValues(string username = "", string password = "", string key = "") { if (username.Length > 0) userNameInputField.text = username; From 0ce34b1250c5ccd1abc5e4bbe18cad3cfb26351a Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Wed, 16 Oct 2024 17:13:20 +0200 Subject: [PATCH 31/36] removed unused field --- .../Scripts/GoogleRealityMeshConfigurationAdapter.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs b/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs index bd5bca2a..d74bdb5c 100644 --- a/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs +++ b/Assets/_Functionalities/GoogleRealityMesh/Scripts/GoogleRealityMeshConfigurationAdapter.cs @@ -12,8 +12,7 @@ public class GoogleRealityMeshConfigurationAdapter : MonoBehaviour { [SerializeField] private Configuration configuration; [SerializeField] private Read3DTileset read3DTileset; - [SerializeField] private CredentialsPropertySectionInstantiator credentialsPropertySectionInstantiator; - + private void Awake() { if (!read3DTileset) From cd313569d864bee3869e8f640e0fb92015e0ade0 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Thu, 17 Oct 2024 10:11:58 +0200 Subject: [PATCH 32/36] fixed drag ghost causing nullreference errors --- Assets/Scripts/Layers/DragGhost.cs | 11 +++++++---- .../Layers/LayerUICredentialsNeededListener.cs | 9 +++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/Scripts/Layers/DragGhost.cs b/Assets/Scripts/Layers/DragGhost.cs index 194a4556..04233dce 100644 --- a/Assets/Scripts/Layers/DragGhost.cs +++ b/Assets/Scripts/Layers/DragGhost.cs @@ -5,10 +5,10 @@ namespace Netherlands3D.Twin.UI.LayerInspector { - public class DragGhost : MonoBehaviour//, IPointerDownHandler, IPointerUpHandler + public class DragGhost : MonoBehaviour //, IPointerDownHandler, IPointerUpHandler { private Vector2 DragStartOffset { get; set; } - + [SerializeField] private Image layerVisibilityImage; [SerializeField] private Image colorImage; [SerializeField] private Image foldoutImage; @@ -21,7 +21,7 @@ public void Initialize(Vector2 dragStartOffset, LayerUI ui) // var pointerPosition = Pointer.current.position.ReadValue(); DragStartOffset = dragStartOffset; CalculateNewPosition(); - + CopyAppearance(ui); } @@ -32,8 +32,11 @@ private void CopyAppearance(LayerUI ui) foldoutImage.enabled = ui.hasChildren; layerTypeImage.sprite = ui.LayerTypeSprite; layerNameText.text = ui.LayerName; + + var credentialsUI = GetComponent(); + credentialsUI.layerUI = ui; } - + void Update() { CalculateNewPosition(); diff --git a/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs b/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs index ed2b4527..5306b93d 100644 --- a/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs +++ b/Assets/Scripts/Layers/LayerUICredentialsNeededListener.cs @@ -11,8 +11,7 @@ namespace Netherlands3D.Twin { public class LayerUICredentialsNeededListener : MonoBehaviour { - private LayerUI layerUI; - private LayerUIManager layerUIManager; + public LayerUI layerUI { get; set; } [SerializeField] private GameObject visibilityToggle; [SerializeField] private GameObject warningIcon; @@ -31,14 +30,13 @@ public class LayerUICredentialsNeededListener : MonoBehaviour private void Awake() { - layerUI = GetComponent(); - layerUIManager = GetComponentInParent(); + if(!layerUI) + layerUI = GetComponent(); } private void Start() { originalTextColor = layerNameText.color; - SetUI(layerUI.Layer.HasValidCredentials); //set initial state layerUI.Layer.HasValidCredentialsChanged.AddListener(SetUI); } @@ -60,7 +58,6 @@ private void SetUI(bool hasValidCredentials) private void OnDestroy() { - var layerUI = GetComponent(); layerUI.Layer.HasValidCredentialsChanged.RemoveListener(SetUI); } } From a891fe0b907373b348417714abe321e10c97624d Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Thu, 17 Oct 2024 10:14:29 +0200 Subject: [PATCH 33/36] Cherry picked OBJ importer fix from fix/3d-object-save-and-load/commits/3ccef959f7288e4dc53a8fb801d376c4057d4ef8 --- Assets/Prefabs/ObjImporter.prefab | 56 ++++++++++++++++++++++++++ Assets/Prefabs/ObjImporter.prefab.meta | 7 ++++ 2 files changed, 63 insertions(+) create mode 100644 Assets/Prefabs/ObjImporter.prefab create mode 100644 Assets/Prefabs/ObjImporter.prefab.meta diff --git a/Assets/Prefabs/ObjImporter.prefab b/Assets/Prefabs/ObjImporter.prefab new file mode 100644 index 00000000..81e81541 --- /dev/null +++ b/Assets/Prefabs/ObjImporter.prefab @@ -0,0 +1,56 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3683644799359541447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2552652701665730137} + - component: {fileID: 7917579944522795273} + m_Layer: 0 + m_Name: ObjImporter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2552652701665730137 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3683644799359541447} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7917579944522795273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3683644799359541447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b6caa935ef381440b46ff58c21721cd, type: 3} + m_Name: + m_EditorClassIdentifier: + createdGameobjectIsMoveable: 0 + gameObjectData: + name: + materials: [] + gameObjects: [] + BaseMaterial: {fileID: 0} + objFilePath: + mtlFilePath: + imgFilePath: + createSubMeshes: 0 diff --git a/Assets/Prefabs/ObjImporter.prefab.meta b/Assets/Prefabs/ObjImporter.prefab.meta new file mode 100644 index 00000000..4ee63e84 --- /dev/null +++ b/Assets/Prefabs/ObjImporter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 17813655602a70c46a78e7f4ec2e2b97 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From eb728b88d1618dbd7081d517d0d3f4797bdae581 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Thu, 17 Oct 2024 10:49:04 +0200 Subject: [PATCH 34/36] Fixed reordering not working correctly --- Assets/Scripts/Layers/LayerTypes/LayerData.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/Layers/LayerTypes/LayerData.cs b/Assets/Scripts/Layers/LayerTypes/LayerData.cs index f16189bf..feabe435 100644 --- a/Assets/Scripts/Layers/LayerTypes/LayerData.cs +++ b/Assets/Scripts/Layers/LayerTypes/LayerData.cs @@ -175,19 +175,17 @@ public void SetParent(LayerData newParent, int siblingIndex = -1) var parentChanged = ParentLayer != newParent; var oldSiblingIndex = SiblingIndex; - - parent.children.Remove(this); - if (!parentChanged && siblingIndex > oldSiblingIndex) //if the parent did not change, and the new sibling index is larger than the old sibling index, we need to decrease the new siblingIndex by 1 because we previously removed one item from the children list - siblingIndex--; - parent.ChildrenChanged.Invoke(); //call event on old parent - + if (siblingIndex < 0) siblingIndex = newParent.children.Count; - - parent = newParent; - + newParent.children.Insert(siblingIndex, this); + parent.children.RemoveAt(oldSiblingIndex); + parent.ChildrenChanged.Invoke(); //call event on old parent + + parent = newParent; + if (parentChanged || siblingIndex != oldSiblingIndex) { LayerActiveInHierarchyChanged.Invoke(ActiveInHierarchy); From 7e2b48da14c95629356929ca7ef0dd4674589755 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Thu, 17 Oct 2024 10:51:32 +0200 Subject: [PATCH 35/36] fixed infinite loop --- Assets/Scripts/Layers/LayerTypes/LayerData.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Layers/LayerTypes/LayerData.cs b/Assets/Scripts/Layers/LayerTypes/LayerData.cs index feabe435..e83e1f30 100644 --- a/Assets/Scripts/Layers/LayerTypes/LayerData.cs +++ b/Assets/Scripts/Layers/LayerTypes/LayerData.cs @@ -172,13 +172,16 @@ public void SetParent(LayerData newParent, int siblingIndex = -1) if (newParent == this) return; - + var parentChanged = ParentLayer != newParent; var oldSiblingIndex = SiblingIndex; if (siblingIndex < 0) siblingIndex = newParent.children.Count; + if(newParent == parent && siblingIndex == oldSiblingIndex) + return; + newParent.children.Insert(siblingIndex, this); parent.children.RemoveAt(oldSiblingIndex); From 3977e6b90ad31ac45cfda1c7f81d29bf018b1047 Mon Sep 17 00:00:00 2001 From: Tom Simons Date: Thu, 17 Oct 2024 12:00:26 +0200 Subject: [PATCH 36/36] Fixed Layer reordering issues --- Assets/Scripts/Layers/LayerTypes/LayerData.cs | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/Layers/LayerTypes/LayerData.cs b/Assets/Scripts/Layers/LayerTypes/LayerData.cs index e83e1f30..a6fd2200 100644 --- a/Assets/Scripts/Layers/LayerTypes/LayerData.cs +++ b/Assets/Scripts/Layers/LayerTypes/LayerData.cs @@ -175,19 +175,27 @@ public void SetParent(LayerData newParent, int siblingIndex = -1) var parentChanged = ParentLayer != newParent; var oldSiblingIndex = SiblingIndex; - + if (siblingIndex < 0) siblingIndex = newParent.children.Count; - if(newParent == parent && siblingIndex == oldSiblingIndex) - return; - - newParent.children.Insert(siblingIndex, this); + if (!parentChanged && siblingIndex > oldSiblingIndex) // moved down: insert first, remove after to keep the correct indices + { + parent = newParent; + newParent.children.Insert(siblingIndex, this); + + parent.children.RemoveAt(oldSiblingIndex); + parent.ChildrenChanged.Invoke(); //call event on old parent + } + else + { + parent.children.RemoveAt(oldSiblingIndex); - parent.children.RemoveAt(oldSiblingIndex); - parent.ChildrenChanged.Invoke(); //call event on old parent - - parent = newParent; + parent = newParent; + newParent.children.Insert(siblingIndex, this); + + parent.ChildrenChanged.Invoke(); //call event on old parent + } if (parentChanged || siblingIndex != oldSiblingIndex) {