Merge pull request 'UI 생성 설정 기능 개발 및 UI 오류 수정' (#75) from jym/250515_00 into main

Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/75

Assets/NewStudioJYM/3D Factory.unity

@@ -8481,12 +8481,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a14b48ef22b10684b9eea422765b7437, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ModelContent: {fileID: 0}
-  prf_dynamicObjectItem: {fileID: 0}
-  dynamicObjectDatas:
-    dataList: []
-  modelList:
-    modelList: []
+  saveModelDatas:
+    modelDatas: []
 --- !u!1 &728274150
 GameObject:
   m_ObjectHideFlags: 0
@@ -21702,7 +21698,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1778168855
 RectTransform:
   m_ObjectHideFlags: 0

Assets/NewStudioJYM/Scripts/ConnectDataManager.cs

@@ -16,10 +16,10 @@ namespace XED
         public Action<SaveConnectAlarmData> onLoadAlarm;
 
         private MQTTData loadMQTTData;
-        public Action<List<DataClass>> mqttData;
+        public Action<List<DataClass>, SaveFilterData> mqttData;
         public List<SaveMQTTData> saveMQTTDatas = new List<SaveMQTTData>();
 
-        public Action<string, List<DataClass>> apiData;
+        public Action<string, List<DataClass>, SaveFilterData> apiData;
         public List<SaveAPIData> saveAPIDatas = new List<SaveAPIData>();
 
         public override void AfterAwake()
@@ -64,18 +64,18 @@ namespace XED
             saveAlarmData.Remove(alarmName);
         }
 
-        public void SetFilterData(string topicName)
+        public void SetFilterData(UI_DataBindingItem item)
         {
             List<DataClass> dataclasses = new List<DataClass>();
 
             foreach (var data in this.loadMQTTData.dataList)
             {
-                if (topicName == data.name)
+                if (item.GetTopicName() == data.name)
                 {
                     dataclasses.Add(data);
                 }
             }
-            mqttData?.Invoke(dataclasses);
+            mqttData?.Invoke(dataclasses, item.filterData);
         }
         public void SetMQTTData(SaveMQTTData saveMQTTData)
         {
@@ -83,12 +83,12 @@ namespace XED
             saveMQTTDatas.Add(saveMQTTData);
         }
 
-        public void SetFilterData(string className, DataClass dataClass)
+        public void SetFilterData(UI_DataBindingItem item, DataClass dataClass)
         {
             List<DataClass> dataclasses = new List<DataClass>();
             dataclasses.Add(dataClass);
 
-            apiData?.Invoke(className, dataclasses);
+            apiData?.Invoke(item.GetTopicName(), dataclasses, item.filterData);
         }
         public void SetAPIData(SaveAPIData saveAPIData)
         {

Assets/NewStudioJYM/Scripts/Panel_APIConnectModal.cs

@@ -23,7 +23,7 @@ namespace XED
         private List<UI_DataBindingItem> topicItems = new List<UI_DataBindingItem>();
         private UI_DataBindingItem selectedTopicItem;
 
-        public Action<string, DataClass> onClickFilterButton;
+        public Action<UI_DataBindingItem, DataClass> onClickFilterButton;
         public Action<SaveAPIData> onSaveAPIData;
 
         private void TestDataConnected()
@@ -63,8 +63,7 @@ namespace XED
         private void OnClickFilterButton(UI_DataBindingItem item)
         {
             selectedTopicItem = item;
-            var itemName = item.GetTopicName();
-            onClickFilterButton?.Invoke(itemName, selectedUrlData);
+            onClickFilterButton?.Invoke(selectedTopicItem, selectedUrlData);
         }
 
         private void AddClassNameItem()

Assets/NewStudioJYM/Scripts/Panel_DataFilterSetting.cs

@@ -21,8 +21,10 @@ namespace XED
         private List<UI_LoadDataHierarchyItem> currentAPIDataItems = new List<UI_LoadDataHierarchyItem>();
         public UI_DataSettingItem currentDataSettingItem;
         private string className;
+        private bool isApiMode;
 
-        public Action<SaveFilterData> onSaveFilterData;
+        public Action<SaveFilterData> onSaveAPIFilterData;
+        public Action<SaveFilterData> onSaveMQTTFilterData;
         public override void AfterAwake()
         {
             prf_loadDataHierarchyItem = Resources.Load<UI_LoadDataHierarchyItem>("Prefabs/UI/PRF_LoadDataHierarchyItem");
@@ -45,17 +47,39 @@ namespace XED
         private void Save()
         {
             var saveFilterData = GetSaveFilterData();
-            onSaveFilterData?.Invoke(saveFilterData);
+            if (isApiMode)
+            {
+                onSaveAPIFilterData?.Invoke(saveFilterData);
+            }
+            else
+            {
+                onSaveMQTTFilterData?.Invoke(saveFilterData);
+            }
+            
             CloseModal();
         }
-        public void SetLoadMQTTDataList(List<DataClass> dataClasses)
+        public void SetLoadMQTTDataList(List<DataClass> dataClasses, SaveFilterData filterData)
         {
+            isApiMode = false;
             SetLoadDataList(dataClasses);
-        }
-        public void SetLoadAPIDataList(string className, List<DataClass> dataClasses)
+
+            if (filterData.data.fields.Count > 0)
             {
+                this.className = filterData.name;
+                AddDataSettingItem(filterData.data);
+            }
+        }
+        public void SetLoadAPIDataList(string className, List<DataClass> dataClasses, SaveFilterData filterData)
+        {
+            isApiMode = true;
             this.className = className;
             SetLoadDataList(dataClasses);
+
+            if (filterData.data.fields.Count > 0)
+            {
+                this.className = filterData.name;
+                AddDataSettingItem(filterData.data);
+            }
         }
         private void SetLoadDataList(List<DataClass> dataClasses)
         {

Assets/NewStudioJYM/Scripts/Panel_DynamicObjectUISetting.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using XRLib.UI;
@@ -10,7 +11,9 @@ namespace XED
         private UI_DynamicDataStyleItem prf_DynamicDataStyleItem;
         private RectTransform DataContent;
 
+        private UI_DynamicObjectItem selectedDynamicObjectItem;
         private UI_DynamicObjectUISettingItem dynamicObjectUISettingItem;
+        public Action onSaveDynamicObjectUIData;
 
         public override void AfterAwake()
         {
@@ -18,6 +21,38 @@ namespace XED
             prf_DynamicDataStyleItem = Resources.Load<UI_DynamicDataStyleItem>("Prefabs/UI/PRF_DynamicDataStyleItem");
             CloseModal();
         }
+        private void Update()
+        {
+            if (Input.GetMouseButtonDown(0))
+            {
+                if (!IsPointerInsideUIIncludingChildren(rectTransform))
+                {
+                    SaveDynamicObjectUIData();
+                    CloseModal();
+                }
+            }
+        }
+
+        bool IsPointerInsideUIIncludingChildren(RectTransform root)
+        {
+            Vector2 mousePosition = Input.mousePosition;
+
+            foreach (RectTransform rect in root.GetComponentsInChildren<RectTransform>(true))
+            {
+                if (IsPointerInsideSingleRect(rect, mousePosition))
+                    return true;
+            }
+
+            return false;
+        }
+
+        bool IsPointerInsideSingleRect(RectTransform rectTransform, Vector2 screenPos)
+        {
+            Vector2 localPoint;
+            bool isInside = RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, screenPos, null, out localPoint);
+
+            return isInside && rectTransform.rect.Contains(localPoint);
+        }
         public void OpenModal()
         {
             gameObject.SetActive(true); ;
@@ -26,11 +61,14 @@ namespace XED
         {
             gameObject.SetActive(false);
         }
-        public void SetData(DataList dynamicObjectDatas, RectTransform targetUI)
+        public void SetData(UI_DynamicObjectItem targetUI)
         {
             OpenModal();
 
-            SetPosition(targetUI);
+            selectedDynamicObjectItem = targetUI;
+            SetPosition(targetUI.rectTransform);
+
+            var dynamicObjectDatas = targetUI.selectDynamicObjectData;
 
             if (dynamicObjectDatas == null)
                 return;
@@ -63,5 +101,14 @@ namespace XED
 
             rectTransform.localPosition = localPos;
         }
+        public void SaveDynamicObjectUIData()
+        {
+            if (dynamicObjectUISettingItem == null)
+                return;
+
+            var dynamicObjectUIData = dynamicObjectUISettingItem.GetDataList();
+            selectedDynamicObjectItem.selectDynamicObjectData = dynamicObjectUIData;
+            onSaveDynamicObjectUIData?.Invoke();
+        }
     }
 }

Assets/NewStudioJYM/Scripts/Panel_GenerateDynamicObject.cs

@@ -5,20 +5,23 @@ using TMPro;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using System;
+using XRLib;
 
 namespace XED
 {
     public class Panel_GenerateDynamicObject : PanelBase
     {
         private Button Button_AddDynamicObject;
-        public RectTransform ModelContent;
+        private RectTransform ModelContent;
 
-        public UI_DynamicObjectItem prf_dynamicObjectItem;
+        private UI_DynamicObjectItem prf_dynamicObjectItem;
+        private List<UI_DynamicObjectItem> dynamicObjectItems = new List<UI_DynamicObjectItem>();
 
-        public DynamicObjectDatas dynamicObjectDatas;
-        public ModelList modelList;
+        private DynamicObjectDatas dynamicObjectDatas;
+        private ModelList modelList;
 
-        public Action<DataList, RectTransform> onUISetting;
+        public Action<UI_DynamicObjectItem> onUISetting;
+        public SaveModelDatas saveModelDatas;
 
         private void TestConnectedData()
         {
@@ -32,18 +35,33 @@ namespace XED
         {
             TestConnectedData();
             prf_dynamicObjectItem = Resources.Load<UI_DynamicObjectItem>("Prefabs/UI/PRF_DynamicObjectItem");
-
             Button_AddDynamicObject.onClick.AddListener(OnClickAddDynamicObjectButton);
+
+            dynamicObjectItems.Clear();
         }
         private void OnClickAddDynamicObjectButton()
         {
             var item = Instantiate(prf_dynamicObjectItem, ModelContent);
             item.onUISetting += OnUISetting;
             item.SetData(dynamicObjectDatas, modelList);
+            dynamicObjectItems.Add(item);
         }
-        private void OnUISetting(DataList datas, RectTransform rectTransform)
+        private void OnUISetting(UI_DynamicObjectItem rectTransform)
         {
-            onUISetting?.Invoke(datas, rectTransform);
+            onUISetting?.Invoke(rectTransform);
+        }
+        public void Save()
+        {
+            saveModelDatas = GetDynamicObjectUIData();
+        }
+        public SaveModelDatas GetDynamicObjectUIData()
+        {
+            var saveModelDatas = new SaveModelDatas();
+            foreach(var modelData in dynamicObjectItems)
+            {
+                saveModelDatas.modelDatas.Add(modelData.GetModelData());
+            }
+            return saveModelDatas;
         }
     }
 }

Assets/NewStudioJYM/Scripts/Panel_MQTTConnectModal.cs

@@ -22,7 +22,7 @@ namespace XED
         private UI_DataBindingItem selectedTopicItem;
 
         public MQTTData loadMQTTData;
-        public Action<string> onClickFilterButton;
+        public Action<UI_DataBindingItem> onClickFilterButton;
         public Action<SaveMQTTData> onSaveMQTTData;
 
         private void TestDataConnected()
@@ -65,8 +65,7 @@ namespace XED
         private void OnClickFilterButton(UI_DataBindingItem item)
         {
             selectedTopicItem = item;
-            var itemName = item.GetTopicName();
-            onClickFilterButton?.Invoke(itemName);
+            onClickFilterButton?.Invoke(selectedTopicItem);
         }
 
         /// <summary>
@@ -78,6 +77,8 @@ namespace XED
             item.onRemove += RemoveTopicItem;
             item.onFilter += OnClickFilterButton;
             topicItems.Add(item);
+
+            Button_AddTopic.transform.SetAsLastSibling();
         }
         /// <summary>
         /// TopicItem 제거

Assets/NewStudioJYM/Scripts/StudioJYMPopupCanvasHandler.cs

@@ -10,10 +10,11 @@ namespace XED
             canvas_Popup.panel_dynamicobjectinfo.onConnectedData += canvas_Popup.panel_dataconnectmodal.OpenModal;
             canvas_Popup.panel_dynamicobjectinfo.onConnectedAlarm += canvas_Popup.panel_alarmconnectmodal.OpenModal;
 
-            canvas_Popup.panel_datafiltersetting.onSaveFilterData += canvas_Popup.panel_mqttconnectmodal.SetFilterData;
-            canvas_Popup.panel_datafiltersetting.onSaveFilterData += canvas_Popup.panel_apiconnectmodal.SetFilterData;
+            canvas_Popup.panel_datafiltersetting.onSaveMQTTFilterData += canvas_Popup.panel_mqttconnectmodal.SetFilterData;
+            canvas_Popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_Popup.panel_apiconnectmodal.SetFilterData;
 
             canvas_Popup.panel_generatedynamicobject.onUISetting += canvas_Popup.panel_dynamicobjectuisetting.SetData;
+            canvas_Popup.panel_dynamicobjectuisetting.onSaveDynamicObjectUIData += canvas_Popup.panel_generatedynamicobject.Save;
         }
     }
 }

Assets/NewStudioJYM/Scripts/TestAPIData.cs

@@ -22,6 +22,7 @@ namespace XED
     [Serializable]
     public class FieldData
     {
+        public string isUse;
         public string name;
         public string type;
         public string value;
@@ -126,6 +127,7 @@ namespace XED
     public class DataList
     {
         public string name;
+        public string dashboardStyle;
         public List<Datum> datas = new List<Datum>();
     }
     [Serializable]
@@ -147,5 +149,18 @@ namespace XED
         public string modelName;
     }
 
+    [Serializable]
+    public class SaveModelDatas
+    {
+        public List<ModelData> modelDatas = new List<ModelData>();
+    }
+
+    [Serializable]
+    public class ModelData
+    {
+        public string dataName;
+        public string modelName;
+        public DataList modelData;
+    }
 
 }

Assets/NewStudioJYM/Scripts/UI_DataTypeSelectedItem.cs

@@ -32,7 +32,6 @@ namespace XED
 
         private List<UI_MatchingTypeDataItem> matchingTypeDataItems = new List<UI_MatchingTypeDataItem>();
         private UI_MatchingTypeDataItem matchingTypeDataItem;
-        private bool isUse;
 
         public Action onAddMatchingData;
         public Action onDestroyMatchingData;
@@ -52,10 +51,12 @@ namespace XED
             SetDropDownData(field);
 
             Button_MatchingAddData.gameObject.SetActive(false);
-            Toggle_Use.isOn = true;
+            Toggle_Use.isOn = field.isUse == "False" ? false : true;
 
             if (fieldData.type == "Matching")
             {
+                Button_MatchingAddData.gameObject.SetActive(true);
+
                 foreach (var matchingValue in fieldData.matchingValue)
                 {
                     matchingData = matchingValue;
@@ -91,7 +92,7 @@ namespace XED
         }
         private void OnUseToggleValueChanged(bool isOn)
         {
-            isUse = isOn;
+            
         }
         private void OnClickAddDataButton()
         {
@@ -131,10 +132,8 @@ namespace XED
         }
         public FieldData GetFieldData()
         {
-            if (!isUse)
-                return null;
-
             FieldData field = new FieldData();
+            field.isUse = Toggle_Use.isOn.ToString();
             field.name = DataName.text;
             field.value = DataValue.text;
             field.type = Dropdown_Type.options[Dropdown_Type.value].text;

Assets/NewStudioJYM/Scripts/UI_DynamicDataStyleItem.cs

@@ -18,13 +18,16 @@ namespace XED
     {
         private TextMeshProUGUI Text_DataName;
         private TMP_Dropdown Dropdown_DataDisplayStyle;
+        private string dataValue;
 
         public void SetData(Datum datum)
         {
             Text_DataName.SetText(datum.dataName);
-            SetDataDisplayStyleDropdown();
+            SetDataDisplayStyleDropdown(datum.dataType);
+            
+            dataValue = datum.dataValue;
         }
-        private void SetDataDisplayStyleDropdown()
+        private void SetDataDisplayStyleDropdown(string dataType)
         {
             Dropdown_DataDisplayStyle.ClearOptions();
             var types = Enum.GetNames(typeof(DataStyle));
@@ -35,11 +38,17 @@ namespace XED
                 options.Add(types[i]);
             }
             Dropdown_DataDisplayStyle.AddOptions(options);
-            Dropdown_DataDisplayStyle.onValueChanged.AddListener(OnDataDisplayStyleValueChanged);
+            Dropdown_DataDisplayStyle.value = options.IndexOf(dataType);
         }
-        private void OnDataDisplayStyleValueChanged(int index)
+        public Datum GetDatum()
         {
+            var datum = new Datum();
 
+            datum.dataName = Text_DataName.text;
+            datum.dataType = Dropdown_DataDisplayStyle.options[Dropdown_DataDisplayStyle.value].text;
+            datum.dataValue = dataValue;
+
+            return datum;
         } 
     }
 }

Assets/NewStudioJYM/Scripts/UI_DynamicObjectItem.cs

@@ -18,16 +18,15 @@ namespace XED
         public DynamicObjectDatas dynamicObjectDatas;
         public DataList selectDynamicObjectData;
 
-        public ModelList modelList;
+        public ModelList modelData;
         public string selectedModel;
 
-        public Action<DataList, RectTransform> onUISetting;
-
+        public Action<UI_DynamicObjectItem> onUISetting;
 
         public void SetData(DynamicObjectDatas dynamicObjectDatas, ModelList modelList)
         {
             this.dynamicObjectDatas = dynamicObjectDatas;
-            this.modelList = modelList;
+            this.modelData = modelList;
 
             SetDataDropdown();
             SetModelDropdown();
@@ -35,10 +34,6 @@ namespace XED
             Button_SelectModel.onClick.AddListener(OnClickSelectModelButton);
             Button_UISetting.onClick.AddListener(OnClickUISettingButton);
         }
-        public bool IsDataDropdownChanged(TMP_Dropdown dropdown, int value)
-        {
-            return dropdown.value != value;
-        }
         private void SetDataDropdown()
         {
             Dropdown_Data.ClearOptions();
@@ -59,6 +54,7 @@ namespace XED
         {
             if (index - 1 < 0)
                 return;
+
             selectDynamicObjectData = dynamicObjectDatas.dataList[index - 1];
         }
         private void SetModelDropdown()
@@ -68,7 +64,7 @@ namespace XED
 
             options.Add("Select Model");
 
-            foreach (var dynamicObjectData in modelList.modelList)
+            foreach (var dynamicObjectData in modelData.modelList)
             {
                 options.Add(dynamicObjectData.modelName);
             }
@@ -82,7 +78,8 @@ namespace XED
             if (index - 1 < 0)
                 return;
 
-            selectedModel = modelList.modelList[index - 1].modelName;
+            selectDynamicObjectData = dynamicObjectDatas.dataList[Dropdown_Data.value - 1];
+            selectedModel = modelData.modelList[index - 1].modelName;
         }
         private void OnClickSelectModelButton()
         {
@@ -92,8 +89,17 @@ namespace XED
         {
             if (selectDynamicObjectData != null && selectedModel != string.Empty)
             {
-                onUISetting?.Invoke(selectDynamicObjectData, rectTransform);
+                onUISetting?.Invoke(this);
             }
         }
+        public ModelData GetModelData()
+        {
+            var modelData = new ModelData();
+            modelData.dataName = Dropdown_Data.options[Dropdown_Data.value].text;
+            modelData.modelName = Dropdown_Model.options[Dropdown_Model.value].text;
+            modelData.modelData = selectDynamicObjectData;
+
+            return modelData;
+        }
     }
 }

Assets/NewStudioJYM/Scripts/UI_DynamicObjectUISettingItem.cs

@@ -29,10 +29,10 @@ namespace XED
             Text_ClassName.SetText(dynamicObjectDatas.name);
             prf_DynamicDataStyleItem = dynamicDataStyleItem;
 
-            SetUIDesignStyleDropdown();
+            SetUIDesignStyleDropdown(dynamicObjectDatas);
             SetDataItems(dynamicObjectDatas.datas);
         }
-        private void SetUIDesignStyleDropdown()
+        private void SetUIDesignStyleDropdown(DataList dataList)
         {
             Dropdown_UIDesignStyle.ClearOptions();
             var types = Enum.GetNames(typeof(UIDesignStyle));
@@ -45,6 +45,11 @@ namespace XED
                 options.Add(types[i]);
             }
             Dropdown_UIDesignStyle.AddOptions(options);
+
+            if (dataList.dashboardStyle != string.Empty)
+            {
+                Dropdown_UIDesignStyle.value = options.IndexOf(dataList.dashboardStyle);
+            }
         }
         private void SetDataItems(List<Datum> datas)
         {
@@ -61,5 +66,17 @@ namespace XED
                 dynamicDataStyleItems.Add(item);
             }
         }
+        public DataList GetDataList()
+        {
+            DataList dataList = new DataList();
+            dataList.name = Text_ClassName.text;
+            dataList.dashboardStyle = Dropdown_UIDesignStyle.options[Dropdown_UIDesignStyle.value].text;
+
+            foreach (var dynamicDataStyleItem in dynamicDataStyleItems)
+            {
+                dataList.datas.Add(dynamicDataStyleItem.GetDatum());
+            }
+            return dataList;
+        }
     }
 }

Assets/NewStudioPGD/Scripts/Manager/StudioPopupCanvasHandler.cs

@@ -30,8 +30,8 @@
             canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_quickstart.Close;
             canvas_popup.panel_openprojectinfo.onClickOpen += canvas_popup.panel_openprojectinfo.Close;
 
-            canvas_popup.panel_datafiltersetting.onSaveFilterData += canvas_popup.panel_mqttconnectmodal.SetFilterData;
-            canvas_popup.panel_datafiltersetting.onSaveFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;
+            canvas_popup.panel_datafiltersetting.onSaveMQTTFilterData += canvas_popup.panel_mqttconnectmodal.SetFilterData;
+            canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData;
         }
     }
 }

Assets/Resources/Prefabs/UI/PRF_DataTypeSelectedItem.prefab

@@ -1770,8 +1770,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/Resources/Prefabs/UI/PRF_LoadDataHierarchyItem.prefab

@@ -76,7 +76,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -114,10 +114,10 @@ MonoBehaviour:
     m_SelectOnRight: {fileID: 0}
   m_Transition: 1
   m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
-    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_NormalColor: {r: 0, g: 0, b: 0, a: 0}
+    m_HighlightedColor: {r: 0, g: 0, b: 0, a: 0.09803922}
+    m_PressedColor: {r: 0, g: 0, b: 0, a: 0.19607843}
+    m_SelectedColor: {r: 0, g: 0, b: 0, a: 0}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
@@ -211,8 +211,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/Scenes/NewScene.unity

@@ -185,7 +185,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -8533,7 +8533,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -9788,7 +9788,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -12348,7 +12348,6 @@ GameObject:
   m_Component:
   - component: {fileID: 998389916}
   - component: {fileID: 998389919}
-  - component: {fileID: 998389918}
   - component: {fileID: 998389917}
   m_Layer: 5
   m_Name: Scroll View
@@ -12408,36 +12407,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!114 &998389918
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 998389915}
-  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.392}
-  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: 10907, guid: 0000000000000000f000000000000000, type: 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!222 &998389919
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -13444,7 +13413,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -14888,7 +14857,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -23439,7 +23408,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 63.73, y: -40}
-  m_SizeDelta: {x: 0, y: 80}
+  m_SizeDelta: {x: 127.46, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1634744131
 MonoBehaviour:
@@ -24208,7 +24177,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -27079,14 +27048,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.1254902, g: 0.10980392, b: 0.16470589, 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: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -28756,7 +28725,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -30957,23 +30926,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 349415598094472119, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -121
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 494264644172990295, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
@@ -30997,23 +30966,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1426017155599776145, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -309
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1568513447129454289, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
@@ -31081,23 +31050,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2422787935774323229, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -27
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2573358733300104709, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
@@ -31169,23 +31138,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4147382167238274784, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -74
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4147750155540767454, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -31209,23 +31178,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4582026471169970315, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -262
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4582151064078720181, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -31337,43 +31306,43 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5481852742840888498, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -215
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5512206668012317612, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -121
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5540225464422352963, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
@@ -31389,23 +31358,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5821008458756972882, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -168
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5872060385755613930, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
@@ -31453,23 +31422,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6313013409696068613, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -74
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6398619867125381537, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
@@ -31485,23 +31454,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6833388731803765748, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -168
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6851815559567896889, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.y
@@ -31549,23 +31518,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7750099248872515057, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -74
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7812692383561393628, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
@@ -31613,23 +31582,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8688116085078439031, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -27
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8831777936729481367, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
@@ -31645,23 +31614,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 295
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 153.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8996151517581488573, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -27
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9118390163350013474, guid: 6b6204170622c2248aa45b7084250442, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size