From 2e4718291ec3fbdfef2bcc61a10da4ec2c9ef971 Mon Sep 17 00:00:00 2001 From: logonkhi Date: Wed, 6 Aug 2025 19:16:41 +0900 Subject: [PATCH] =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pretendard/Pretendard-Medium SDF.asset | 12 +- .../UI/Menu/SampleProjectMenuItem.prefab | 103 +- .../UI/Menu/SampleProjectTopMenu.prefab | 6 +- .../Prefabs/UI/Buttons/Toggle.prefab | 318 ++++ .../Prefabs/UI/Buttons/Toggle.prefab.meta | 7 + .../UI/Buttons/UILanguageButton.prefab | 50 +- .../Prefabs/UI/Buttons/UISearchInput.prefab | 22 +- .../UI/List/ConfigDataOrderListItem.prefab | 177 ++- .../Prefabs/UI/List/DraggableList.prefab | 14 +- .../Prefabs/UI/List/DraggableListItem.prefab | 247 +-- .../Prefabs/UI/Menu/MenuSeparator.prefab | 55 +- .../Resources/Prefabs/UI/Modal/Alert.prefab | 178 ++- .../Resources/Prefabs/UI/Modal/Confirm.prefab | 178 ++- .../Prefabs/UI/Modal/Confirm.prefab.meta | 2 +- .../Prefabs/UI/Modal/InfoWindow.prefab | 177 +-- .../Resources/Prefabs/UI/Modal/Toast.prefab | 12 +- .../Prefabs/UI/Modal/UIConfigInfoModal.prefab | 173 +-- .../UI/Tab/ConfigDataOrderTabContent.prefab | 14 +- .../Prefabs/UI/Tab/UITabButton.prefab | 24 +- .../Prefabs/UI/Toolbar/Toolbar.prefab | 2 +- .../UI/Toolbar/ToolbarExpandableButton.prefab | 35 +- .../UI/Toolbar/ToolbarRadioButton.prefab | 37 +- .../UI/Toolbar/ToolbarSeparator.prefab | 111 +- .../UI/Toolbar/ToolbarStandardButton.prefab | 20 +- .../UI/Toolbar/ToolbarSubMenuPanel.prefab | 12 +- .../UI/Toolbar/ToolbarToggleButton.prefab | 35 +- .../UI/Toolbar/images/ic_capture_white.png | Bin 434 -> 0 bytes .../UI/Toolbar/images/ic_copy_white.png | Bin 464 -> 0 bytes .../UI/Toolbar/images/ic_delete_white.png | Bin 433 -> 0 bytes .../Prefabs/UI/Toolbar/images/ic_menu.png | Bin 0 -> 211 bytes ...delete_white.png.meta => ic_menu.png.meta} | 2 +- .../UI/Toolbar/images/ic_menu_elements.png | Bin 211 -> 323 bytes .../Toolbar/images/ic_menu_elements.png.meta | 2 +- .../UI/Toolbar/images/ic_move_white.png | Bin 470 -> 0 bytes .../UI/Toolbar/images/ic_record_off.png | Bin 519 -> 0 bytes .../UI/Toolbar/images/ic_record_off.png.meta | 143 -- .../UI/Toolbar/images/ic_record_off_white.png | Bin 408 -> 0 bytes .../images/ic_record_off_white.png.meta | 143 -- .../UI/Toolbar/images/ic_record_on.png | Bin 646 -> 0 bytes .../UI/Toolbar/images/ic_record_on.png.meta | 143 -- .../UI/Toolbar/images/ic_record_on_white.png | Bin 538 -> 0 bytes .../images/ic_record_on_white.png.meta | 143 -- .../UI/Toolbar/images/ic_rotation_white.png | Bin 517 -> 0 bytes .../Toolbar/images/ic_rotation_white.png.meta | 143 -- .../UI/Toolbar/images/ic_scale_white.png | Bin 491 -> 0 bytes .../UI/Toolbar/images/ic_scale_white.png.meta | 143 -- .../UI/Toolbar/images/ic_select_white.png | Bin 494 -> 0 bytes .../Toolbar/images/ic_select_white.png.meta | 143 -- .../Prefabs/UI/Toolbox/Toolbox.prefab | 14 +- .../UI/Toolbox/ToolboxExpandableButton.prefab | 41 +- .../UI/Toolbox/ToolboxRadioButton.prefab | 43 +- .../UI/Toolbox/ToolboxSeparator.prefab | 111 +- .../UI/Toolbox/ToolboxStandardButton.prefab | 41 +- .../UI/Toolbox/ToolboxSubMenuPanel.prefab | 18 +- .../UI/Toolbox/ToolboxToggleButton.prefab | 43 +- Assets/Resources/Prefabs/UI/images/XR.png | Bin 4348 -> 671 bytes .../Resources/Prefabs/UI/images/XR.png.meta | 2 +- .../Prefabs/UI/images/button_alarm.png | Bin 0 -> 266 bytes .../button_alarm.png.meta} | 4 +- .../Prefabs/UI/images/button_alarm_badge.png | Bin 0 -> 374 bytes .../UI/images/button_alarm_badge.png.meta | 143 ++ .../Prefabs/UI/images/button_alert_close.png | Bin 0 -> 196 bytes .../button_alert_close.png.meta} | 4 +- .../Prefabs/UI/images/button_copy.png | Bin 0 -> 178 bytes .../Prefabs/UI/images/button_copy.png.meta | 143 ++ .../Prefabs/UI/images/button_dashboard.png | Bin 0 -> 203 bytes .../UI/images/button_dashboard.png.meta | 143 ++ .../Prefabs/UI/images/button_setting.png | Bin 0 -> 375 bytes .../Prefabs/UI/images/button_setting.png.meta | 143 ++ .../Prefabs/UI/images/check_mark.png | Bin 0 -> 237 bytes .../Prefabs/UI/images/check_mark.png.meta | 143 ++ .../Resources/Prefabs/UI/images/ic_close.png | Bin 459 -> 186 bytes .../Prefabs/UI/images/icon_alert.png | Bin 0 -> 767 bytes .../icon_alert.png.meta} | 2 +- .../Prefabs/UI/images/search_box.png | Bin 0 -> 368 bytes .../Prefabs/UI/images/search_box.png.meta | 143 ++ Assets/Scenes/SampleProject.unity | 1377 ++++++++++++++++- .../UI/Menu/SampleProjectTopMenuController.cs | 2 +- .../UVC/Factory/Buttons/UISearchInput.cs | 4 +- Assets/Scripts/UVC/UI/Buttons.meta | 8 + Assets/Scripts/UVC/UI/Buttons/ImageButton.cs | 130 ++ .../UVC/UI/Buttons/ImageButton.cs.meta | 2 + .../UI/Commands/MinimizeApplicationCommand.cs | 43 + .../MinimizeApplicationCommand.cs.meta | 2 + .../Mono/MinimizeApplicationCommandMono.cs | 13 + .../MinimizeApplicationCommandMono.cs.meta | 2 + .../Scripts/UVC/UI/Menu/TopMenuController.cs | 2 +- Assets/Scripts/UVC/UI/Modal/ModalView.cs | 40 + Assets/Scripts/UVC/UI/ToolBar/Toolbar.cs | 4 +- Assets/Scripts/UVC/UI/ToolBar/Toolbox.cs | 110 +- .../View/ToolbarRadioButtonViewProcessor.cs | 4 +- .../ToolbarStandardButtonViewProcessor.cs | 110 +- .../UVC/UI/ToolBar/View/ToolbarView.cs | 24 +- Assets/Scripts/UVC/Util/AlarmBadge.cs | 69 + Assets/Scripts/UVC/Util/AlarmBadge.cs.meta | 2 + .../UVC/Util/ImageColorChangeBehaviour.cs | 58 +- .../Util/ImageColorChangeBehaviour.cs.meta | 2 +- 97 files changed, 4184 insertions(+), 2031 deletions(-) create mode 100644 Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab create mode 100644 Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab.meta delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_capture_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_copy_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_delete_white.png create mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu.png rename Assets/Resources/Prefabs/UI/Toolbar/images/{ic_delete_white.png.meta => ic_menu.png.meta} (98%) delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_move_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_off.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_off.png.meta delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_off_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_off_white.png.meta delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on.png.meta delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on_white.png.meta delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_rotation_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_rotation_white.png.meta delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_scale_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_scale_white.png.meta delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_select_white.png delete mode 100644 Assets/Resources/Prefabs/UI/Toolbar/images/ic_select_white.png.meta create mode 100644 Assets/Resources/Prefabs/UI/images/button_alarm.png rename Assets/Resources/Prefabs/UI/{Toolbar/images/ic_move_white.png.meta => images/button_alarm.png.meta} (98%) create mode 100644 Assets/Resources/Prefabs/UI/images/button_alarm_badge.png create mode 100644 Assets/Resources/Prefabs/UI/images/button_alarm_badge.png.meta create mode 100644 Assets/Resources/Prefabs/UI/images/button_alert_close.png rename Assets/Resources/Prefabs/UI/{Toolbar/images/ic_copy_white.png.meta => images/button_alert_close.png.meta} (98%) create mode 100644 Assets/Resources/Prefabs/UI/images/button_copy.png create mode 100644 Assets/Resources/Prefabs/UI/images/button_copy.png.meta create mode 100644 Assets/Resources/Prefabs/UI/images/button_dashboard.png create mode 100644 Assets/Resources/Prefabs/UI/images/button_dashboard.png.meta create mode 100644 Assets/Resources/Prefabs/UI/images/button_setting.png create mode 100644 Assets/Resources/Prefabs/UI/images/button_setting.png.meta create mode 100644 Assets/Resources/Prefabs/UI/images/check_mark.png create mode 100644 Assets/Resources/Prefabs/UI/images/check_mark.png.meta create mode 100644 Assets/Resources/Prefabs/UI/images/icon_alert.png rename Assets/Resources/Prefabs/UI/{Toolbar/images/ic_capture_white.png.meta => images/icon_alert.png.meta} (98%) create mode 100644 Assets/Resources/Prefabs/UI/images/search_box.png create mode 100644 Assets/Resources/Prefabs/UI/images/search_box.png.meta create mode 100644 Assets/Scripts/UVC/UI/Buttons.meta create mode 100644 Assets/Scripts/UVC/UI/Buttons/ImageButton.cs create mode 100644 Assets/Scripts/UVC/UI/Buttons/ImageButton.cs.meta create mode 100644 Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs create mode 100644 Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs.meta create mode 100644 Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs create mode 100644 Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs.meta create mode 100644 Assets/Scripts/UVC/Util/AlarmBadge.cs create mode 100644 Assets/Scripts/UVC/Util/AlarmBadge.cs.meta diff --git a/Assets/Resources/Fonts/Pretendard/Pretendard-Medium SDF.asset b/Assets/Resources/Fonts/Pretendard/Pretendard-Medium SDF.asset index 489d2605..3ce921df 100644 --- a/Assets/Resources/Fonts/Pretendard/Pretendard-Medium SDF.asset +++ b/Assets/Resources/Fonts/Pretendard/Pretendard-Medium SDF.asset @@ -73,9 +73,9 @@ Material: - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.75 + - _ScaleRatioB: 0.609375 + - _ScaleRatioC: 0.609375 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -127,7 +127,7 @@ Texture2D: m_MipsStripped: 0 m_TextureFormat: 1 m_MipCount: 1 - m_IsReadable: 0 + m_IsReadable: 1 m_IsPreProcessed: 0 m_IgnoreMipmapLimit: 1 m_MipmapLimitGroupName: @@ -211,9 +211,9 @@ MonoBehaviour: fontStyleModifier: 0 renderMode: 4165 includeFontFeatures: 0 - m_SourceFontFile: {fileID: 0} + m_SourceFontFile: {fileID: 12800000, guid: c07e8c2e87372d5448e66f10cb3c2853, type: 3} m_SourceFontFilePath: - m_AtlasPopulationMode: 0 + m_AtlasPopulationMode: 1 InternalDynamicOS: 0 m_GlyphTable: - m_Index: 2 diff --git a/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectMenuItem.prefab b/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectMenuItem.prefab index b0728f89..e9cc159c 100644 --- a/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectMenuItem.prefab +++ b/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectMenuItem.prefab @@ -334,6 +334,100 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8509995303486059356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4892401306185635689} + - component: {fileID: 1973742416007703014} + - component: {fileID: 5307181251264172600} + - component: {fileID: 134232772847343636} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4892401306185635689 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8509995303486059356} + 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: 1286628769360481210} + 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!222 &1973742416007703014 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8509995303486059356} + m_CullTransparentMesh: 1 +--- !u!114 &5307181251264172600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8509995303486059356} + 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: 0.5254902, g: 0.5254902, b: 0.5254902, 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: ceac4fdbcb9218b4db61e7f444ca770f, 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!114 &134232772847343636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8509995303486059356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + targetImage: {fileID: 5307181251264172600} + button: {fileID: 6822514240024166764} --- !u!1 &9099411185141743313 GameObject: m_ObjectHideFlags: 0 @@ -365,6 +459,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4892401306185635689} - {fileID: 7635178805811483352} - {fileID: 2293622111724210167} - {fileID: 1211868998707583856} @@ -373,7 +468,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} + m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0, y: 1} --- !u!222 &4706415591313670790 CanvasRenderer: @@ -396,14 +491,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09803922, g: 0.09803922, b: 0.09803922, 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: 211b8831a8cd14543a2a74af8b27f971, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -432,7 +527,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 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} diff --git a/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectTopMenu.prefab b/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectTopMenu.prefab index d5dd1fb9..998411dd 100644 --- a/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectTopMenu.prefab +++ b/Assets/Resources/Prefabs/SampleProject/UI/Menu/SampleProjectTopMenu.prefab @@ -35,8 +35,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: 10, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0, y: 1} --- !u!114 &5829177875206436901 MonoBehaviour: @@ -68,7 +68,7 @@ MonoBehaviour: menuContainer: {fileID: 5520398564864056243} subMenuContainer: {fileID: 1370316903422300007, guid: 4698e9d040a414a45bc182f70de2644c, type: 3} subMenuArrowName: SubMenuArrow - menuDepthSpace: {x: 0, y: -5} + menuDepthSpace: {x: 40, y: 40} subMenuDepthSpace: {x: -5, y: 0} isShrinkMenuItemWidth: 0 menuItemWidthPadding: 20 diff --git a/Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab b/Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab new file mode 100644 index 00000000..a371a7be --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab @@ -0,0 +1,318 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1227735209981530962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6874249440566572418} + - component: {fileID: 7678171544243828955} + - component: {fileID: 153448786348490933} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6874249440566572418 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227735209981530962} + 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: 3754172445400650849} + m_Father: {fileID: 7942420623609202064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -10} + m_SizeDelta: {x: 18, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7678171544243828955 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227735209981530962} + m_CullTransparentMesh: 1 +--- !u!114 &153448786348490933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227735209981530962} + 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: 0.23529412, g: 0.23529412, b: 0.23529412, 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: 33ecc0d96be2cac49b58a0d7cd5d42ca, 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 &1246833926356627457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1958304408362985679} + - component: {fileID: 8462768421611576720} + - component: {fileID: 1468896445026324310} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1958304408362985679 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246833926356627457} + 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: 7942420623609202064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 9, y: -0.5} + m_SizeDelta: {x: -28, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8462768421611576720 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246833926356627457} + m_CullTransparentMesh: 1 +--- !u!114 &1468896445026324310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246833926356627457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!1 &1558370117255654554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7942420623609202064} + - component: {fileID: 4008862462141286068} + m_Layer: 5 + m_Name: Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7942420623609202064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558370117255654554} + 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: 6874249440566572418} + - {fileID: 1958304408362985679} + m_Father: {fileID: 0} + 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: 50, y: 0} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &4008862462141286068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1558370117255654554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, 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: 153448786348490933} + toggleTransition: 1 + graphic: {fileID: 7365100865433441665} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 +--- !u!1 &9095175143941835371 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3754172445400650849} + - component: {fileID: 3795471476346812243} + - component: {fileID: 7365100865433441665} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3754172445400650849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095175143941835371} + 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: 6874249440566572418} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 18, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3795471476346812243 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095175143941835371} + m_CullTransparentMesh: 1 +--- !u!114 &7365100865433441665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9095175143941835371} + 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: 459350b8e25ec894daa9ec8b62bdc029, 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 diff --git a/Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab.meta b/Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab.meta new file mode 100644 index 00000000..a18de6a2 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Buttons/Toggle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58f1adb5fd19c15449af4dcfaf75c8a7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Buttons/UILanguageButton.prefab b/Assets/Resources/Prefabs/UI/Buttons/UILanguageButton.prefab index ba39a398..70850f6d 100644 --- a/Assets/Resources/Prefabs/UI/Buttons/UILanguageButton.prefab +++ b/Assets/Resources/Prefabs/UI/Buttons/UILanguageButton.prefab @@ -148,14 +148,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09803922, g: 0.09803922, b: 0.09803922, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -287,7 +287,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &213554597436149423 RectTransform: m_ObjectHideFlags: 0 @@ -378,7 +378,7 @@ RectTransform: m_Father: {fileID: 9128867497734301265} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -403,7 +403,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -485,7 +485,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 459350b8e25ec894daa9ec8b62bdc029, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -602,9 +602,9 @@ RectTransform: m_Father: {fileID: 4105576737578168130} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7923701471483521520 MonoBehaviour: @@ -647,7 +647,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5b9f5f0f86e19744fbcae99d03a774a5, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -697,7 +697,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 111, y: 30} + m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6998836100763657499 CanvasRenderer: @@ -770,11 +770,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.11764706, g: 0.20392157, b: 0.4, a: 1} - m_HighlightedColor: {r: 0.09411765, g: 0.16862746, b: 0.35686275, a: 1} - m_PressedColor: {r: 0.09411765, g: 0.16862746, b: 0.35686275, a: 1} - m_SelectedColor: {r: 0.09411765, g: 0.16862746, b: 0.35686275, a: 1} - m_DisabledColor: {r: 0.11764706, g: 0.20392157, b: 0.4, a: 0.5019608} + m_NormalColor: {r: 0.09803922, g: 0.09803922, b: 0.09803922, a: 1} + m_HighlightedColor: {r: 0.09803922, g: 0.09803922, b: 0.09803922, a: 1} + m_PressedColor: {r: 0.09803922, g: 0.09803922, b: 0.09803922, a: 1} + m_SelectedColor: {r: 0.09803922, g: 0.09803922, b: 0.09803922, a: 1} + m_DisabledColor: {r: 0.09803922, g: 0.09803922, b: 0.09803922, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -799,13 +799,7 @@ MonoBehaviour: m_Value: 0 m_MultiSelect: 0 m_Options: - m_Options: - - m_Text: KOR - m_Image: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - - m_Text: ENG - m_Image: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Options: [] m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -847,7 +841,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &7980590978787974866 CanvasRenderer: @@ -870,7 +864,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.19215688, g: 0.19215688, b: 0.19215688, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1004,14 +998,14 @@ MonoBehaviour: m_text: KOR m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_sharedMaterial: {fileID: 2932820786140262606, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} 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: @@ -1137,7 +1131,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: KOR + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Resources/Prefabs/UI/Buttons/UISearchInput.prefab b/Assets/Resources/Prefabs/UI/Buttons/UISearchInput.prefab index 11b4bb13..eec96f99 100644 --- a/Assets/Resources/Prefabs/UI/Buttons/UISearchInput.prefab +++ b/Assets/Resources/Prefabs/UI/Buttons/UISearchInput.prefab @@ -77,14 +77,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 0e7095192f554734e8adb8dde8d5d515, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -481,8 +481,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 3741319167 - m_fontColor: {r: 1, g: 1, b: 1, a: 0.87058824} + rgba: 1023410175 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.23529412} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -598,9 +598,9 @@ 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: -6, y: 16} + m_AnchoredPosition: {x: -3, y: 0} m_SizeDelta: {x: 28, y: 28} - m_Pivot: {x: 1, y: 1} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &8757900534283014278 CanvasRenderer: m_ObjectHideFlags: 0 @@ -717,11 +717,11 @@ RectTransform: - {fileID: 7844129296646170794} m_Father: {fileID: 3549070521602479230} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} m_SizeDelta: {x: 100, y: 22} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &513732089905394585 MonoBehaviour: m_ObjectHideFlags: 0 @@ -753,7 +753,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4502938537745225681 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/List/ConfigDataOrderListItem.prefab b/Assets/Resources/Prefabs/UI/List/ConfigDataOrderListItem.prefab index 345d456a..da83f64c 100644 --- a/Assets/Resources/Prefabs/UI/List/ConfigDataOrderListItem.prefab +++ b/Assets/Resources/Prefabs/UI/List/ConfigDataOrderListItem.prefab @@ -33,9 +33,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1484707173828173627} - {fileID: 7054147954863026825} - {fileID: 1250467015452537796} - - {fileID: 1484707173828173627} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -64,7 +64,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -134,7 +134,6 @@ GameObject: - component: {fileID: 1484707173828173627} - component: {fileID: 2058167080542246104} - component: {fileID: 6901208297906198054} - - component: {fileID: 4367634089592413695} m_Layer: 5 m_Name: Dragger m_TagString: Untagged @@ -153,14 +152,15 @@ 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: 9043181483809807123} m_Father: {fileID: 3870429411112539252} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} m_SizeDelta: {x: 30, y: 30} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &2058167080542246104 MonoBehaviour: m_ObjectHideFlags: 0 @@ -184,36 +184,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1464801131498371263} m_CullTransparentMesh: 1 ---- !u!114 &4367634089592413695 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1464801131498371263} - 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: 0.990566, g: 0.014017418, b: 0.014017418, 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: 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 &1908411424317987715 GameObject: m_ObjectHideFlags: 0 @@ -249,7 +219,7 @@ RectTransform: 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_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0, y: 0.5} --- !u!114 &4070739914034672045 @@ -271,7 +241,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 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} @@ -317,7 +287,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1509040345391865814 RectTransform: m_ObjectHideFlags: 0 @@ -415,7 +385,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 18, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7300936564378718146 CanvasRenderer: @@ -438,14 +408,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23529412, g: 0.23529412, b: 0.23529412, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 33ecc0d96be2cac49b58a0d7cd5d42ca, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -490,8 +460,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: 0, y: -0.5} - m_SizeDelta: {x: -20, y: -13} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8897710984112532687 MonoBehaviour: @@ -507,6 +477,81 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} +--- !u!1 &6188190908864666238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9043181483809807123} + - component: {fileID: 6780875599860375097} + - component: {fileID: 8078260466443203851} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9043181483809807123 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6188190908864666238} + 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: 1484707173828173627} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6780875599860375097 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6188190908864666238} + m_CullTransparentMesh: 1 +--- !u!114 &8078260466443203851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6188190908864666238} + 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: 0.77254903, g: 0.77254903, b: 0.77254903, 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: ceac4fdbcb9218b4db61e7f444ca770f, 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 &7081454234790430904 GameObject: m_ObjectHideFlags: 0 @@ -543,8 +588,8 @@ RectTransform: 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: 120, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 178, y: 0} + m_SizeDelta: {x: 200, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4790640378303290805 CanvasRenderer: @@ -567,14 +612,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23529412, g: 0.23529412, b: 0.23529412, 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: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -753,15 +798,15 @@ MonoBehaviour: m_Calls: [] m_text: Enter text... m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 2150773298 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + rgba: 4288716960 + m_fontColor: {r: 0.627451, g: 0.627451, b: 0.627451, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -778,15 +823,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 2 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -909,15 +954,15 @@ MonoBehaviour: m_Calls: [] m_text: "\u200B" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -934,15 +979,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1013,7 +1058,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 18, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4282996345882099786 CanvasRenderer: @@ -1043,7 +1088,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 459350b8e25ec894daa9ec8b62bdc029, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/Prefabs/UI/List/DraggableList.prefab b/Assets/Resources/Prefabs/UI/List/DraggableList.prefab index 0930622c..82020b71 100644 --- a/Assets/Resources/Prefabs/UI/List/DraggableList.prefab +++ b/Assets/Resources/Prefabs/UI/List/DraggableList.prefab @@ -182,7 +182,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.01969001, b: 0.0754717, a: 0.392} + m_Color: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -266,7 +266,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: 0, y: 10} m_Pivot: {x: 0, y: 0} --- !u!222 &374767577096796426 CanvasRenderer: @@ -289,7 +289,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -392,7 +392,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &2324981521007679064 CanvasRenderer: @@ -415,7 +415,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -701,7 +701,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -776,7 +776,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Resources/Prefabs/UI/List/DraggableListItem.prefab b/Assets/Resources/Prefabs/UI/List/DraggableListItem.prefab index 564eefa7..e54bf8ca 100644 --- a/Assets/Resources/Prefabs/UI/List/DraggableListItem.prefab +++ b/Assets/Resources/Prefabs/UI/List/DraggableListItem.prefab @@ -33,7 +33,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1484707173828173627} + - {fileID: 3452403752536911490} - {fileID: 9150890667218870774} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -63,7 +63,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -92,7 +92,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 98e103c1fce908c4baee1f553081f2f1, type: 3} m_Name: m_EditorClassIdentifier: - dragBehavior: {fileID: 2058167080542246104} + dragBehavior: {fileID: 3045890842202266669} dragAlpha: 0.6 --- !u!114 &5759861553791754506 MonoBehaviour: @@ -120,97 +120,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!1 &1464801131498371263 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1484707173828173627} - - component: {fileID: 2058167080542246104} - - component: {fileID: 6901208297906198054} - - component: {fileID: 4367634089592413695} - m_Layer: 5 - m_Name: Dragger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1484707173828173627 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1464801131498371263} - 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: 3870429411112539252} - 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: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} - m_Pivot: {x: 1, y: 0.5} ---- !u!114 &2058167080542246104 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1464801131498371263} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 261f68435056bc44fbadb799304989f6, type: 3} - m_Name: - m_EditorClassIdentifier: - dragTarget: {fileID: 3870429411112539252} - verticalDrag: 1 - horizontalDrag: 0 ---- !u!222 &6901208297906198054 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1464801131498371263} - m_CullTransparentMesh: 1 ---- !u!114 &4367634089592413695 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1464801131498371263} - 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: 0.990566, g: 0.014017418, b: 0.014017418, 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: 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 &1565863527972736736 GameObject: m_ObjectHideFlags: 0 @@ -245,7 +154,7 @@ RectTransform: 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: 100, y: 0} + m_AnchoredPosition: {x: 130, y: 0} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4897144644487923851 @@ -278,15 +187,15 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} 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: @@ -303,8 +212,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -347,3 +256,139 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5379396291473997221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3452403752536911490} + - component: {fileID: 3045890842202266669} + - component: {fileID: 3327656251750374083} + m_Layer: 5 + m_Name: Dragger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3452403752536911490 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5379396291473997221} + 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: 4962916281390956042} + m_Father: {fileID: 3870429411112539252} + 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: 30, y: 30} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &3045890842202266669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5379396291473997221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 261f68435056bc44fbadb799304989f6, type: 3} + m_Name: + m_EditorClassIdentifier: + dragTarget: {fileID: 0} + verticalDrag: 1 + horizontalDrag: 0 +--- !u!222 &3327656251750374083 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5379396291473997221} + m_CullTransparentMesh: 1 +--- !u!1 &8618456291305826111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4962916281390956042} + - component: {fileID: 1312764476709869424} + - component: {fileID: 3386153538597456968} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4962916281390956042 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8618456291305826111} + 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: 3452403752536911490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1312764476709869424 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8618456291305826111} + m_CullTransparentMesh: 1 +--- !u!114 &3386153538597456968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8618456291305826111} + 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: 0.77254903, g: 0.77254903, b: 0.77254903, 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: ceac4fdbcb9218b4db61e7f444ca770f, 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 diff --git a/Assets/Resources/Prefabs/UI/Menu/MenuSeparator.prefab b/Assets/Resources/Prefabs/UI/Menu/MenuSeparator.prefab index fe51b256..b0f8b3de 100644 --- a/Assets/Resources/Prefabs/UI/Menu/MenuSeparator.prefab +++ b/Assets/Resources/Prefabs/UI/Menu/MenuSeparator.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 539816085347750692} - component: {fileID: 2193016365674033586} - - component: {fileID: 2266528321876069305} m_Layer: 5 m_Name: MenuSeparator m_TagString: Untagged @@ -29,13 +28,14 @@ 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: 5684488992414663306} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 8, y: 0} - m_SizeDelta: {x: 184, y: 1} + m_SizeDelta: {x: 200, y: 9} m_Pivot: {x: 0, y: 1} --- !u!222 &2193016365674033586 CanvasRenderer: @@ -45,13 +45,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1459767928986708847} m_CullTransparentMesh: 1 ---- !u!114 &2266528321876069305 +--- !u!1 &3180859088662736338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5684488992414663306} + - component: {fileID: 8872238564011121020} + - component: {fileID: 6247655976411369612} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5684488992414663306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3180859088662736338} + 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: 539816085347750692} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 184, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8872238564011121020 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3180859088662736338} + m_CullTransparentMesh: 1 +--- !u!114 &6247655976411369612 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1459767928986708847} + m_GameObject: {fileID: 3180859088662736338} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} diff --git a/Assets/Resources/Prefabs/UI/Modal/Alert.prefab b/Assets/Resources/Prefabs/UI/Modal/Alert.prefab index 319d9115..7cf3afb2 100644 --- a/Assets/Resources/Prefabs/UI/Modal/Alert.prefab +++ b/Assets/Resources/Prefabs/UI/Modal/Alert.prefab @@ -34,11 +34,11 @@ RectTransform: - {fileID: 7472250681771032410} m_Father: {fileID: 8878455978135248687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 50, y: 10} - m_SizeDelta: {x: 80, y: 30} - m_Pivot: {x: 0.5, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -102, y: 24} + m_SizeDelta: {x: 66, y: 28} + m_Pivot: {x: 1, y: 0} --- !u!222 &7654955096077171671 CanvasRenderer: m_ObjectHideFlags: 0 @@ -60,14 +60,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.22745098, g: 0.23921569, b: 0.25490198, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -188,15 +188,15 @@ MonoBehaviour: m_Calls: [] m_text: Cancel m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -213,8 +213,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -315,14 +315,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, 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: -895992892, guid: 73d757b5d1b754245969af12daf01e78, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -368,8 +368,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10} - m_SizeDelta: {x: 29, y: 30} + m_AnchoredPosition: {x: -24, y: -24} + m_SizeDelta: {x: 24, y: 16} m_Pivot: {x: 1, y: 1} --- !u!222 &7293543872483431824 CanvasRenderer: @@ -399,8 +399,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 17863240a1386604e8c74d85d4a95818, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -470,7 +470,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2699345389104186032 RectTransform: m_ObjectHideFlags: 0 @@ -623,9 +623,9 @@ RectTransform: 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: -40, y: -100} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 96, y: -58} + m_SizeDelta: {x: -160, y: -144} + m_Pivot: {x: 0, y: 1} --- !u!222 &5630343645790254490 CanvasRenderer: m_ObjectHideFlags: 0 @@ -656,15 +656,15 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4291611852 + m_fontColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -681,8 +681,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -757,10 +757,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8878455978135248687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20, y: -10} - m_SizeDelta: {x: -70, y: 30} + m_AnchoredPosition: {x: 96, y: -24} + m_SizeDelta: {x: -160, y: -160} m_Pivot: {x: 0, y: 1} --- !u!222 &8251914459885537350 CanvasRenderer: @@ -792,15 +792,15 @@ MonoBehaviour: m_Calls: [] m_text: title m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4291611852 + m_fontColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1003,15 +1003,15 @@ MonoBehaviour: m_Calls: [] m_text: Confirm m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1028,8 +1028,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1072,6 +1072,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6580929029943828731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7727433074761930500} + - component: {fileID: 7792512995036510287} + - component: {fileID: 5846534318806483179} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7727433074761930500 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580929029943828731} + 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: 8878455978135248687} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 24, y: -24} + m_SizeDelta: {x: 48, y: 48} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7792512995036510287 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580929029943828731} + m_CullTransparentMesh: 1 +--- !u!114 &5846534318806483179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580929029943828731} + 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: 0.21568628, g: 0.5803922, 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: b41cf0d337ea8b64b8c8f672815bc8df, 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 &7976514205510484745 GameObject: m_ObjectHideFlags: 0 @@ -1106,11 +1181,11 @@ RectTransform: - {fileID: 3379896220624033424} m_Father: {fileID: 8878455978135248687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -50, y: 10} - m_SizeDelta: {x: 80, y: 30} - m_Pivot: {x: 0.5, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -24, y: 24} + m_SizeDelta: {x: 66, y: 28} + m_Pivot: {x: 1, y: 0} --- !u!222 &4187780467952822116 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1132,14 +1207,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.05490196, g: 0.3882353, b: 0.6117647, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1227,14 +1302,15 @@ RectTransform: - {fileID: 5494539156344885554} - {fileID: 1863887949234781852} - {fileID: 2083401330524190855} - - {fileID: 6460714630850448276} - {fileID: 2292531325125449254} + - {fileID: 6460714630850448276} + - {fileID: 7727433074761930500} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 250} + m_SizeDelta: {x: 536, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8346611057756904400 MonoBehaviour: diff --git a/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab b/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab index 17c4e753..79e82d46 100644 --- a/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab +++ b/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab @@ -34,11 +34,11 @@ RectTransform: - {fileID: 7472250681771032410} m_Father: {fileID: 8878455978135248687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 50, y: 10} - m_SizeDelta: {x: 80, y: 30} - m_Pivot: {x: 0.5, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -102, y: 24} + m_SizeDelta: {x: 66, y: 28} + m_Pivot: {x: 1, y: 0} --- !u!222 &7654955096077171671 CanvasRenderer: m_ObjectHideFlags: 0 @@ -60,14 +60,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.22745098, g: 0.23921569, b: 0.25490198, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -188,15 +188,15 @@ MonoBehaviour: m_Calls: [] m_text: Cancel m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -213,8 +213,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -315,14 +315,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, 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: -895992892, guid: 73d757b5d1b754245969af12daf01e78, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -368,8 +368,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10} - m_SizeDelta: {x: 29, y: 30} + m_AnchoredPosition: {x: -24, y: -24} + m_SizeDelta: {x: 16, y: 16} m_Pivot: {x: 1, y: 1} --- !u!222 &7293543872483431824 CanvasRenderer: @@ -399,8 +399,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 17863240a1386604e8c74d85d4a95818, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -470,7 +470,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2699345389104186032 RectTransform: m_ObjectHideFlags: 0 @@ -623,9 +623,9 @@ RectTransform: 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: -40, y: -100} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 96, y: -50} + m_SizeDelta: {x: -160, y: -136} + m_Pivot: {x: 0, y: 1} --- !u!222 &5630343645790254490 CanvasRenderer: m_ObjectHideFlags: 0 @@ -656,15 +656,15 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4291611852 + m_fontColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -681,8 +681,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -757,10 +757,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8878455978135248687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20, y: -10} - m_SizeDelta: {x: -70, y: 30} + m_AnchoredPosition: {x: 96, y: -24} + m_SizeDelta: {x: -160, y: -160} m_Pivot: {x: 0, y: 1} --- !u!222 &8251914459885537350 CanvasRenderer: @@ -792,15 +792,15 @@ MonoBehaviour: m_Calls: [] m_text: title m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4291611852 + m_fontColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1003,15 +1003,15 @@ MonoBehaviour: m_Calls: [] m_text: Confirm m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1028,8 +1028,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1072,6 +1072,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6580929029943828731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7727433074761930500} + - component: {fileID: 7792512995036510287} + - component: {fileID: 5846534318806483179} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7727433074761930500 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580929029943828731} + 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: 8878455978135248687} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 24, y: -24} + m_SizeDelta: {x: 48, y: 48} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7792512995036510287 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580929029943828731} + m_CullTransparentMesh: 1 +--- !u!114 &5846534318806483179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580929029943828731} + 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: 0.21568628, g: 0.5803922, 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: b41cf0d337ea8b64b8c8f672815bc8df, 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 &7976514205510484745 GameObject: m_ObjectHideFlags: 0 @@ -1106,11 +1181,11 @@ RectTransform: - {fileID: 3379896220624033424} m_Father: {fileID: 8878455978135248687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -50, y: 10} - m_SizeDelta: {x: 80, y: 30} - m_Pivot: {x: 0.5, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -24, y: 24} + m_SizeDelta: {x: 66, y: 28} + m_Pivot: {x: 1, y: 0} --- !u!222 &4187780467952822116 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1132,14 +1207,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.05490196, g: 0.3882353, b: 0.6117647, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1227,14 +1302,15 @@ RectTransform: - {fileID: 5494539156344885554} - {fileID: 1863887949234781852} - {fileID: 2083401330524190855} - - {fileID: 6460714630850448276} - {fileID: 2292531325125449254} + - {fileID: 6460714630850448276} + - {fileID: 7727433074761930500} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 250} + m_SizeDelta: {x: 536, y: 182} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8346611057756904400 MonoBehaviour: diff --git a/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab.meta b/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab.meta index 999084fd..f091448c 100644 --- a/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab.meta +++ b/Assets/Resources/Prefabs/UI/Modal/Confirm.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 788059ac67f211f42ad47ab6abbc0488 +guid: a8cf282132e2bd34ebdd72a4dcbcc190 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Prefabs/UI/Modal/InfoWindow.prefab b/Assets/Resources/Prefabs/UI/Modal/InfoWindow.prefab index c028f51e..7c7699fe 100644 --- a/Assets/Resources/Prefabs/UI/Modal/InfoWindow.prefab +++ b/Assets/Resources/Prefabs/UI/Modal/InfoWindow.prefab @@ -36,8 +36,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2, y: -2} - m_SizeDelta: {x: 15, y: 15} + m_AnchoredPosition: {x: -6, y: -8} + m_SizeDelta: {x: 24, y: 16} m_Pivot: {x: 1, y: 1} --- !u!222 &8580156107207182552 CanvasRenderer: @@ -67,7 +67,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2a6f4806a91ca284d8e69a90e2a2b624, type: 3} + m_Sprite: {fileID: 21300000, guid: 17863240a1386604e8c74d85d4a95818, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -150,7 +150,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7383335062191980062 RectTransform: m_ObjectHideFlags: 0 @@ -168,7 +168,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 10} + m_SizeDelta: {x: 5, y: 5} m_Pivot: {x: 0, y: 1} --- !u!222 &499287599624952086 CanvasRenderer: @@ -198,7 +198,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4cf3568ca3f55f64cb11447d139d7a3d, type: 3} + m_Sprite: {fileID: 21300000, guid: c6b2729b906e71c42a5f0417601e5cd0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -238,14 +238,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5059140281209684741} + m_Children: [] m_Father: {fileID: 4802890858156259540} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -20, y: -2} - m_SizeDelta: {x: 30, y: 15} + m_AnchoredPosition: {x: -32, y: -8} + m_SizeDelta: {x: 16, y: 16} m_Pivot: {x: 1, y: 1} --- !u!222 &380188952969839968 CanvasRenderer: @@ -268,15 +267,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 1} + m_Color: {r: 0.77254903, g: 0.77254903, b: 0.77254903, 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: e5829cbc100001646956a9c3ed4e33c5, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e3dc3c24618084d4a9dee46f624c9d73, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -387,14 +386,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 0.7372549} 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: e5829cbc100001646956a9c3ed4e33c5, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -444,7 +443,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 150} + m_SizeDelta: {x: 250, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7623125061856383678 CanvasRenderer: @@ -505,8 +504,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: 0, y: -5} - m_SizeDelta: {x: -20, y: -30} + m_AnchoredPosition: {x: 0, y: -7.5} + m_SizeDelta: {x: -30, y: -45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9166711732528497215 CanvasRenderer: @@ -539,14 +538,14 @@ MonoBehaviour: m_text: New Text m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_sharedMaterial: {fileID: 2932820786140262606, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} 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: @@ -607,139 +606,3 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7999202329282239406 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5059140281209684741} - - component: {fileID: 8801292156144245076} - - component: {fileID: 6403130881974049321} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5059140281209684741 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7999202329282239406} - 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: 1010396666164740167} - 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.5, y: 0.5} ---- !u!222 &8801292156144245076 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7999202329282239406} - m_CullTransparentMesh: 1 ---- !u!114 &6403130881974049321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7999202329282239406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Copy - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 8 - m_fontSizeBase: 8 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Prefabs/UI/Modal/Toast.prefab b/Assets/Resources/Prefabs/UI/Modal/Toast.prefab index 40b43d2b..6517057a 100644 --- a/Assets/Resources/Prefabs/UI/Modal/Toast.prefab +++ b/Assets/Resources/Prefabs/UI/Modal/Toast.prefab @@ -215,8 +215,8 @@ MonoBehaviour: m_Calls: [] m_text: "message \uBA54\uC138\uC9C0" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -240,8 +240,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -342,14 +342,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.18867922, g: 0.18867922, b: 0.18867922, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, 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: -27720893, guid: e5829cbc100001646956a9c3ed4e33c5, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/Prefabs/UI/Modal/UIConfigInfoModal.prefab b/Assets/Resources/Prefabs/UI/Modal/UIConfigInfoModal.prefab index 9a15b6e1..abef93c9 100644 --- a/Assets/Resources/Prefabs/UI/Modal/UIConfigInfoModal.prefab +++ b/Assets/Resources/Prefabs/UI/Modal/UIConfigInfoModal.prefab @@ -9,6 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6310937241907415337} + - component: {fileID: 8839608649213954649} + - component: {fileID: 7549922323278953200} m_Layer: 5 m_Name: RightTabs m_TagString: Untagged @@ -35,6 +37,44 @@ RectTransform: m_AnchoredPosition: {x: 150, y: 0} m_SizeDelta: {x: -150, y: 0} m_Pivot: {x: 0, y: 1} +--- !u!222 &8839608649213954649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258613778200006796} + m_CullTransparentMesh: 1 +--- !u!114 &7549922323278953200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 258613778200006796} + 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: 0.2, g: 0.2, b: 0.2, 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: 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 &1079807524305349101 GameObject: m_ObjectHideFlags: 0 @@ -94,7 +134,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9150943, g: 0.8842637, b: 0.21150766, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -198,15 +238,15 @@ MonoBehaviour: m_Calls: [] m_text: Title m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} 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: @@ -223,8 +263,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -326,7 +366,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.24528301, g: 0.23487005, b: 0.23487005, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -431,7 +471,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} - m_sharedMaterial: {fileID: 4860575619018115804, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} + m_sharedMaterial: {fileID: 2932820786140262606, guid: 08cebd004d97ca742ac80400f37f4eed, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -509,7 +549,6 @@ GameObject: m_Component: - component: {fileID: 1460845539453298492} - component: {fileID: 4189100571311624514} - - component: {fileID: 7110738405388028809} - component: {fileID: 7532915995780970301} - component: {fileID: 8253199141102887167} m_Layer: 5 @@ -546,36 +585,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5357406816821270801} m_CullTransparentMesh: 1 ---- !u!114 &7110738405388028809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5357406816821270801} - 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: 0.8207547, g: 0.2516465, b: 0.2516465, 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: 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!114 &7532915995780970301 MonoBehaviour: m_ObjectHideFlags: 0 @@ -652,8 +661,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 32, y: 32} + m_AnchoredPosition: {x: -12, y: -8} + m_SizeDelta: {x: 24, y: 16} m_Pivot: {x: 1, y: 1} --- !u!222 &5222321090115107477 CanvasRenderer: @@ -683,7 +692,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a458a60f90f95e74292928ca17721b8f, type: 3} + m_Sprite: {fileID: 21300000, guid: 17863240a1386604e8c74d85d4a95818, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -770,10 +779,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6761037741084119878} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -5} - m_SizeDelta: {x: 10, y: 10} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: -0.5} + m_SizeDelta: {x: 10, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6921574184290347642 CanvasRenderer: @@ -843,7 +852,6 @@ GameObject: m_Component: - component: {fileID: 2211890666906215700} - component: {fileID: 2885610048269315992} - - component: {fileID: 5830048451132091361} - component: {fileID: 2057382053939411253} m_Layer: 5 m_Name: Top @@ -881,36 +889,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7159638132064596575} m_CullTransparentMesh: 1 ---- !u!114 &5830048451132091361 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7159638132064596575} - 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: 0.42521098, g: 0.81960785, b: 0.25098035, 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: 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!114 &2057382053939411253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -925,9 +903,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 30 + m_MinHeight: 34 m_PreferredWidth: -1 - m_PreferredHeight: 30 + m_PreferredHeight: 34 m_FlexibleWidth: 1 m_FlexibleHeight: 0 m_LayoutPriority: 1 @@ -975,7 +953,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 400} + m_SizeDelta: {x: 800, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2715108586162557719 CanvasRenderer: @@ -1093,7 +1071,6 @@ GameObject: m_Component: - component: {fileID: 2019162399254953853} - component: {fileID: 2931395469761942638} - - component: {fileID: 4026240666671236187} - component: {fileID: 3934855249779122777} m_Layer: 5 m_Name: Middle @@ -1131,36 +1108,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9118431363896689148} m_CullTransparentMesh: 1 ---- !u!114 &4026240666671236187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9118431363896689148} - 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.051886797, b: 0.5771342, 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: 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!114 &3934855249779122777 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1175,7 +1122,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: 0 - m_MinHeight: 30 + m_MinHeight: 34 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: 1 diff --git a/Assets/Resources/Prefabs/UI/Tab/ConfigDataOrderTabContent.prefab b/Assets/Resources/Prefabs/UI/Tab/ConfigDataOrderTabContent.prefab index 4d321bc9..2f02d9ac 100644 --- a/Assets/Resources/Prefabs/UI/Tab/ConfigDataOrderTabContent.prefab +++ b/Assets/Resources/Prefabs/UI/Tab/ConfigDataOrderTabContent.prefab @@ -196,7 +196,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.01969001, b: 0.0754717, a: 0.392} + m_Color: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -280,7 +280,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0, y: 0} --- !u!222 &374767577096796426 CanvasRenderer: @@ -303,7 +303,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -406,7 +406,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &2324981521007679064 CanvasRenderer: @@ -429,7 +429,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -715,7 +715,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -790,7 +790,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Resources/Prefabs/UI/Tab/UITabButton.prefab b/Assets/Resources/Prefabs/UI/Tab/UITabButton.prefab index 8ab877aa..616b0e47 100644 --- a/Assets/Resources/Prefabs/UI/Tab/UITabButton.prefab +++ b/Assets/Resources/Prefabs/UI/Tab/UITabButton.prefab @@ -38,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_SizeDelta: {x: 200, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &2696514001165705003 CanvasRenderer: @@ -115,11 +115,11 @@ MonoBehaviour: 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_NormalColor: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 1} + m_HighlightedColor: {r: 0.05490196, g: 0.3882353, b: 0.6117647, a: 1} + m_PressedColor: {r: 0.05490196, g: 0.3882353, b: 0.6117647, a: 1} + m_SelectedColor: {r: 0.05490196, g: 0.3882353, b: 0.6117647, a: 1} + m_DisabledColor: {r: 0.14509805, g: 0.14509805, b: 0.14901961, a: 0.23529412} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -205,15 +205,15 @@ MonoBehaviour: m_Calls: [] m_text: Button m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} + m_sharedMaterial: {fileID: -6974119170906569483, guid: d1fa8a1da59a4de4485cae7c4f9c196b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -230,8 +230,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 13 + m_fontSizeBase: 13 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/Toolbar.prefab b/Assets/Resources/Prefabs/UI/Toolbar/Toolbar.prefab index a4f2ec28..e18639e2 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/Toolbar.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbar/Toolbar.prefab @@ -125,7 +125,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5114632767715460752 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarExpandableButton.prefab b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarExpandableButton.prefab index 4eaa06d1..15499dd7 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarExpandableButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarExpandableButton.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 7086172520916404450} - component: {fileID: 4403737663309926831} - component: {fileID: 8806362519714543601} + - component: {fileID: 4619042352032341293} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -75,6 +76,24 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4619042352032341293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762303663634300905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 0.23529412} + targetImage: {fileID: 8806362519714543601} + button: {fileID: 4379965520992721259} --- !u!1 &6057772562893107812 GameObject: m_ObjectHideFlags: 0 @@ -274,7 +293,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -310,7 +329,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 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} @@ -360,10 +379,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 45 + m_MinHeight: 45 + m_PreferredWidth: 45 + m_PreferredHeight: 45 + m_FlexibleWidth: 45 + m_FlexibleHeight: 45 m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarRadioButton.prefab b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarRadioButton.prefab index e0093cd5..4c9da679 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarRadioButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarRadioButton.prefab @@ -172,7 +172,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &117691393038772277 RectTransform: m_ObjectHideFlags: 0 @@ -290,7 +290,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 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} @@ -318,7 +318,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!114 &4082783022810545647 MonoBehaviour: m_ObjectHideFlags: 0 @@ -344,12 +344,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 45 + m_MinHeight: 45 + m_PreferredWidth: 45 + m_PreferredHeight: 45 + m_FlexibleWidth: 45 + m_FlexibleHeight: 45 m_LayoutPriority: 1 --- !u!1 &8870708017338182451 GameObject: @@ -362,6 +362,7 @@ GameObject: - component: {fileID: 4319505425079556448} - component: {fileID: 4623644769148856366} - component: {fileID: 1498045985882217795} + - component: {fileID: 742991763079672708} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -426,3 +427,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &742991763079672708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8870708017338182451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.23529412} + targetImage: {fileID: 1498045985882217795} + button: {fileID: 5516198187994438965} diff --git a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSeparator.prefab b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSeparator.prefab index 480cd8ba..e805c5ef 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSeparator.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSeparator.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 539816085347750692} - component: {fileID: 2193016365674033586} - - component: {fileID: 2266528321876069305} - component: {fileID: -8097663800161229256} m_Layer: 5 m_Name: ToolbarSeparator @@ -30,13 +29,14 @@ 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: 1274513998695849308} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 1} + m_SizeDelta: {x: 40, y: 21} m_Pivot: {x: 0, y: 1} --- !u!222 &2193016365674033586 CanvasRenderer: @@ -46,36 +46,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1459767928986708847} m_CullTransparentMesh: 1 ---- !u!114 &2266528321876069305 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1459767928986708847} - 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: 0.16862746, g: 0.16862746, b: 0.16862746, 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: 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!114 &-8097663800161229256 MonoBehaviour: m_ObjectHideFlags: 0 @@ -96,3 +66,78 @@ MonoBehaviour: m_FlexibleWidth: 40 m_FlexibleHeight: 1 m_LayoutPriority: 1 +--- !u!1 &7408481628498815916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1274513998695849308} + - component: {fileID: 5658289974229215799} + - component: {fileID: 4614613349285801604} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1274513998695849308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7408481628498815916} + 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: 539816085347750692} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 30, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5658289974229215799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7408481628498815916} + m_CullTransparentMesh: 1 +--- !u!114 &4614613349285801604 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7408481628498815916} + 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: 0.3764706, g: 0.3764706, b: 0.3764706, 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: 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 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarStandardButton.prefab b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarStandardButton.prefab index b01c0af7..3696ffe8 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarStandardButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarStandardButton.prefab @@ -147,7 +147,7 @@ GameObject: - component: {fileID: 7224698793250217790} - component: {fileID: 4488801829647061557} - component: {fileID: 5029365665256666181} - - component: {fileID: 5395459805856709335} + - component: {fileID: 3661688918013004356} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -212,7 +212,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5395459805856709335 +--- !u!114 &3661688918013004356 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -221,13 +221,13 @@ MonoBehaviour: m_GameObject: {fileID: 7551775150721655309} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4185643eda515744385d49b83fe88dce, type: 3} + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} m_Name: m_EditorClassIdentifier: originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} hoverColor: {r: 1, g: 1, b: 1, a: 1} clickColor: {r: 1, g: 1, b: 1, a: 1} - disabledColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 0.23529412} targetImage: {fileID: 5029365665256666181} button: {fileID: 4379965520992721259} --- !u!1 &9218577172950644075 @@ -379,10 +379,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 45 + m_MinHeight: 45 + m_PreferredWidth: 45 + m_PreferredHeight: 45 + m_FlexibleWidth: 45 + m_FlexibleHeight: 45 m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSubMenuPanel.prefab b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSubMenuPanel.prefab index 54f1be27..e1a131f3 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSubMenuPanel.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarSubMenuPanel.prefab @@ -114,7 +114,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2600238454770762569 RectTransform: m_ObjectHideFlags: 0 @@ -253,12 +253,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 2 - m_Right: 2 - m_Top: 2 - m_Bottom: 2 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 2 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarToggleButton.prefab b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarToggleButton.prefab index 21d4d992..9d7c9b0d 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/ToolbarToggleButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbar/ToolbarToggleButton.prefab @@ -166,6 +166,7 @@ GameObject: - component: {fileID: 5993489077151453672} - component: {fileID: 5366711475479328522} - component: {fileID: 1861803751595877094} + - component: {fileID: 1138921897634444765} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -230,6 +231,24 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1138921897634444765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184666941695484873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 0.23529412} + targetImage: {fileID: 1861803751595877094} + button: {fileID: 5516198187994438965} --- !u!1 &7951080877820295087 GameObject: m_ObjectHideFlags: 0 @@ -365,7 +384,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 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} @@ -393,7 +412,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!114 &4082783022810545647 MonoBehaviour: m_ObjectHideFlags: 0 @@ -419,10 +438,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 45 + m_MinHeight: 45 + m_PreferredWidth: 45 + m_PreferredHeight: 45 + m_FlexibleWidth: 45 + m_FlexibleHeight: 45 m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_capture_white.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_capture_white.png deleted file mode 100644 index 72c3b4c9bb7ba777eb40b61189306dc786624ce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmV;j0ZsmiP)i z!Y~kpUr+~dH^?X*p(AvIsvD#epiWRW2pfbAU<15C*ub3OA}kaeJGR4*{7ENEhkbs& z+!+E;C=^~0rPN-HvqvPMu@{y&HRh-Go;e%|GvV5Afd{7ujKwBUvN@r$smZp=O@rG= zSoW(BfEI*Hw+XT({JQU#Y%_?ds!Ad?Iun)*=?n_Xny-kgp773~aSdz?_m1q(l@VI@ zNyE3{`XD>dns=ncbysmMc4R$IYq=bP;$#uX;`))t*pG?4hrpIU`q#C{f>-S8eB0WbcEP)H z!Y~-cUp)ut2xS6w0_z5jzy`1ZY`{4IBj^U`1a^aV1M39w#Ux(r0nMLs0WQD0cWDdx zc**zCBtRyUxoirY2qDCh&BA)rQyuk2eH2B}Ar&-NiE-9Q2@PzhcAz0!oD(!uQgiCd zGPyj~$GZj@ux3+vbos44)?8!7sMvf`rG7MvuE{+k_ob!o2k{IW#2^b=Oh;|SH3M!B z{q|^zg-VAVU`@$%^>9O`@tKD40h&%n~s=uxk3Og1{>>og>dYx+B+O^*|5r4lN(kudvaN7;76?`k>`^crett_ zh@sUx^yv}mFuoJv>_W_i96M#I?>xGEL#5UA43o)Zu8JT2^9Grf9Zd!R0000DuXg4s`wCk&pqUhxx>#pw7Roi9e4vbt4G@FOZ>ZyYXl>A|N%G z9I3(cP0Q8T6r4ZVgCc5o{v~l{MMsQARuoNDcPWu(HmT$ zDW#4cZI7lX*dsN$SmWeWm2ITi8A0Zvmt6UXW=a} bnM^z`rxZZ6Yv#(_00000NkvXXu0mjfQaHA? diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..203a584eddb29c7c5b7d8e7a667f217dbca852f7 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^x**KK1|+Sd9?b$$oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBeuk%uV@L(#+sg-e8w>=P9hCz)mIipO=$Yb_ zUZ6XtRH)_6p1(2PK!pd?b&T#fwoaRHbN#21M5esUySZF1g=gs>Ug4f|h~>_**+8!C x*6E2?l=DDbf6=Zb{a51Jw)b-|Ff`a#F<98inzX#(eE~Fz!PC{xWt~$(69D5oLf8NR literal 0 HcmV?d00001 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_delete_white.png.meta b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu.png.meta similarity index 98% rename from Assets/Resources/Prefabs/UI/Toolbar/images/ic_delete_white.png.meta rename to Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu.png.meta index 80836aab..321a741b 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_delete_white.png.meta +++ b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab84a539c6b1cbc4fb5505e7fd0b04b1 +guid: ceac4fdbcb9218b4db61e7f444ca770f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu_elements.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu_elements.png index 203a584eddb29c7c5b7d8e7a667f217dbca852f7..e9171bc7f0da2eac837f724830944d7b53d6f8d9 100644 GIT binary patch delta 245 zcmVjju^?@v~Eo7&`&$Z9R?opSjc6W zu(Y#8V#p&NjnqD2U4S7HLmo}*o*fd_o#4cyX?1;dQ{r$z0j1+nNno#K?gnpO8bQKG!YRI5&fbE8y?|mB8x5H00000NkvXXu0mjfRMBt< delta 132 zcmX@ibeVBNSZ#)rb^IhF=^t>~HJlwP1ar&Orr&7Qw8-V6*3 z2h??p?l`tin{ader;XB~)z4*}Q$iB}L-jTA diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu_elements.png.meta b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu_elements.png.meta index 321a741b..44159919 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu_elements.png.meta +++ b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_menu_elements.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ceac4fdbcb9218b4db61e7f444ca770f +guid: 289f0347e2a1fb84eb7d68934b7fc7f0 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_move_white.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_move_white.png deleted file mode 100644 index 9859e530fce6e8c0588ce82c47bbac42b89ed315..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmV;{0V)28P)$+7w8Ns0rp59A#-?@1x&cCe#p zL|(^sa2rXF9B0S!J_C6g*5Hm@ieP@p2)R_je3Cdmt=~B9s}#YWVvo5_H+rrTyfy!$ zf}Nd@zJgRpj)o(}nc_<+b!Kxr&ny3wbFuU0M8Dt3X=(VOFyo1yYlsEMJ=elY*qt0g zJNY*Et{pG1K8^V1h){`5c{PX<+w!$+VaJ~+@yFz2O8v6+%^I%6n&wWBijmylkQ`wN zLh^viu9-osu}sb*86x$f&Lfu~nIf21E>bd9a2>gTWRJG_Sx$rg->r4!W+Y>OShtab zsifJZ)-#{)DtVMS$s**K%t*2*Ifv-Up(r_rkSt5iVI|9yt5jZ&~89CD2Gza&1`_wN<=EeeNUmM%E1mu zZYzI>yhwg_J|W}$0uTrU0)bx*vuWZyOIocwftpAu71X3sFio?pC^q+a+l7N+V}O%^ zlvCv}$t);D#u?kbXsr{*V5K!%L2WeOJx=BM$(2%5>$Mu@q0NKVkf7Kw&))}1soH`< z2#&wr1aEn>x#?jY+0KnB#=3N2>~nO898vDUXi%=FGncuM-QveUtFkf<4(t{5jd#IL z=j>L9%bsc6tDq3)ef$&RF;CRK4$IxXJ}-hoTwH^N9N|S!>%#iA=|ym{m<_S? zZF;@!K`CG9;O_71Yk)^cQiyb^b<{TXcoih1d>dDd|J^qUMJ%cmR^ccxPFGAwPQk+{ zhzm`r#_`tbysCn-CG5^UOfyd|bB%#D#W;eKp+vRz^{HK~#7F?U(Ou z!Y~lUpR0a{5!?;v2Hm9HpxvN!f_8(l0V6O1BM>Hl4a_q*l7&R#f9L?+PdXhUm&?of z5?=sCQ55B-F)2aLxhdTgg&1QxTmuT5(N?Yv|1^tC%z!vcx5lY*`(UNm;5*tYD_WE5 zL{z!ou*5aFENv6=eWC@?(pWTrc|Q83&N=UCETCb7cfng^Fe*?Qae-X&FWNhD=^GG@ zV5+x}auxkIAG?lN1-&@B@3A-$f&Pg`f;f*<1(V;aA_Dp9`lFkt#ESJGMgAZ`j{yWUBTBT?-n6Jg`L)x_f#DmfdsvbMFMfptdbx23*<9m=tN z4))v&S`qGi?dsXlmL=_y^U*XxA*|XKilQjWV{!mU=s;T&P2D#D0000Z?uw diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_off_white.png.meta b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_off_white.png.meta deleted file mode 100644 index ec418e31..00000000 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_off_white.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: beb7662539540c84b8499eac8cd1a367 -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: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on.png deleted file mode 100644 index 344019ff8a7a085f1d206464fad7150c2ebe9635..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmV;10(t$3P)%J+_DO*sfND7gjT5Cfg5L+u^l*Y>G>r9fYw2bLHk5$hOjSj6v zNMid*@~2~rDJ`g!k~Digx|M5dqaA7wT>I8?V%vNXVtDWrIcBm3Yn{n>HY(D$<~H~u zux8Q+gJUx98>6;SrWps(EQ`Z6hnkt01HGk8WQ4<$g)H z#Nw8VRV)M{`AQX1p~53mkOt~=8w9D-d6fs(mYAM6=-wHmRJZ#oObWaGGjR zn%jca8m-T^E?z@oh(il-=@pX1F;=m+^$P~Bf(#d$Le!5)vQQ28;3bpga&mR`cej_A z&<=6RVl!#6SVe1A((zA|41*xpKuHFJ!R77!#U_qu=00Vlp1k>uk0>g*NPcd@=7eJs ze0BeUk7Fip7e6>LmM%y?SwAagd9%#0bipLWE*_u7_A%u^=fWkU#X2ijZ;zG_7vx2}7d zK^9+YbC4o$kwN4>ETTkmKF)aA+~#9dpn@VFlAizTlVn*Em91n9q#3s~X1Rru#LBH) z$68Xs+M!X$Qj|d-#gS1A&bjvVkoR*8dA_M{cogx72Kw#S&2J?BljvG-gjJw2s9~M3 z_535@h4b%9ea%NS(2a}C^V8HsL725!bUkfh#LS&sbqwF~5sJ#Tv!s>Kqcc7g8;^zeHYgUo&@ke7W_B<$<}g(t3LG% c4#$r11trQL);nnXq5uE@07*qoM6N<$f~bw_9RL6T diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on_white.png.meta b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on_white.png.meta deleted file mode 100644 index 6d6f7cfc..00000000 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_record_on_white.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 1d9860fc68f2bb24dbaf900088142977 -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: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_rotation_white.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_rotation_white.png deleted file mode 100644 index c2dffc9fc8104fb5cffc910396f951edd40a2389..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 517 zcmV+g0{Z=lP)Luti`Y`BZTfDBm7v;QX|Xx*J*zjh5JJcaI`{C}S*w(yD;-@UIy3f)7OM|x{^==H z&YYF8c64gjU?gv|p$Yz3ve5~{)D)UMF2UIk4c}Hmmpq%zmyvE z;cDSeF6-=&!JvZ_x*7{0R-@)zZ4u79tP5)~OCm!AnapqL_gs*DVoU>xPh=NQc5?9Fw1E+u0<2=Je00000NkvXX Hu0mjfTJ+od diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_rotation_white.png.meta b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_rotation_white.png.meta deleted file mode 100644 index 1db219ed..00000000 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_rotation_white.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: f98a464a82ea50e4f9132b14a3b90f8d -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: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_scale_white.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_scale_white.png deleted file mode 100644 index 2d63dfb664e5e61b1e06ba7798ad308f29b3ddc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmV+KpbORw>WH2TU{vzaupF16dvy~S| zUjfKuGMUGLhz$hb;KvtPOZHn7#lPz&UQ0S&>FXO= zMfM3Pu$){4f$-j;lY~$-9~+Ll7?FlJ{@kV%Sd*2ZA`Nk!`1(j8uo1_lT$>_qCW`F2 z5T}Xe>+mcdxuFtSI;>xt;_eRiWy7b;EJMW=kO&dHBIEMYQfc{vxgY^=mX8|dfW)MY z5+Zqmc+^SpqkR!mU1kZ9__n%HRNQH$%{h^5q!755PtI(fa`^O=upP_+>|3G91`?36 z%y7KDLw|bT^tku%C?s=N9_zgddlW{iTRX15PpiXzSYXH1fVhKWFV?5&lSn)d5lKe= z8fQ9gDYkeyY{m|(ou2s+3SKk$$nV?ge#j~e2zL2nmH0>l+L`RN^VSLOEWfwDubprn hAYAW}$z(E9a0JS}EDy?umMs7P002ovPDHLkV1k-9(OCch diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_scale_white.png.meta b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_scale_white.png.meta deleted file mode 100644 index ce7a6ec4..00000000 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_scale_white.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 4a6019db304aa4d4bbe750873c187e19 -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: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_select_white.png b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_select_white.png deleted file mode 100644 index e2b98b5a96bf506b92edd6524918934a05ab957e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmVjrEVkahw_U<9%O-N3brPdE-Lpymjb?vqYLcP97r z`~yHF5{X3qH;925baUBlu^O=@|JwbvRyr$lbt1LtbvtqklxJm+g5yWC0trEx7 zdrq{T;2wye9|z5TF6p+e)|$bwNcD?&tDj9@AU3i#@>r7gUC8c3` zfc3n|vz&?hP`}T#K9eN*g3w6nJgGU$^jMK5=~X8?*a95B8cb>SeOfEE=S;f8&qbUV zIpUtCGVhe?op4Q}E^M?TI1cCb7m2O6iC-4VwXpmlQJ<_Z@n;1urBQ0(WK6~F}9x4HiICFwM kB8AVjl|v*Fi9~MBHxkbBfqPXY8vpi_@% diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_select_white.png.meta b/Assets/Resources/Prefabs/UI/Toolbar/images/ic_select_white.png.meta deleted file mode 100644 index cabecc98..00000000 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_select_white.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: f02d94a87abe3f54b9438bdcfa236206 -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: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 64 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - 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: 4 - 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 - - serializedVersion: 4 - buildTarget: WindowsStoreApps - 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: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Toolbox/Toolbox.prefab b/Assets/Resources/Prefabs/UI/Toolbox/Toolbox.prefab index 7293b986..c23d3c8f 100644 --- a/Assets/Resources/Prefabs/UI/Toolbox/Toolbox.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbox/Toolbox.prefab @@ -39,7 +39,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -30} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &3825612598300117465 CanvasRenderer: @@ -94,12 +94,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 10 - m_Right: 10 - m_Top: 5 - m_Bottom: 5 + m_Left: 24 + m_Right: 0 + m_Top: 2 + m_Bottom: 2 m_ChildAlignment: 3 - m_Spacing: 5 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -125,7 +125,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5114632767715460752 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxExpandableButton.prefab b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxExpandableButton.prefab index c9509bb5..d41520b5 100644 --- a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxExpandableButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxExpandableButton.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 7086172520916404450} - component: {fileID: 4403737663309926831} - component: {fileID: 8806362519714543601} + - component: {fileID: 5329777052950859945} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -58,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -75,6 +76,24 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5329777052950859945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762303663634300905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 0.23529412} + targetImage: {fileID: 8806362519714543601} + button: {fileID: 4379965520992721259} --- !u!1 &6057772562893107812 GameObject: m_ObjectHideFlags: 0 @@ -251,7 +270,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0, y: 1} --- !u!222 &5596571647579825329 CanvasRenderer: @@ -274,14 +293,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.43529412, g: 0.43529412, b: 0.43529412, a: 1} + m_Color: {r: 0.25490198, g: 0.25490198, b: 0.25490198, 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: -27720893, guid: e5829cbc100001646956a9c3ed4e33c5, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -310,7 +329,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.33333334, g: 0.33333334, b: 0.33333334, a: 1} @@ -360,10 +379,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 26 + m_MinHeight: 26 + m_PreferredWidth: 26 + m_PreferredHeight: 26 + m_FlexibleWidth: 26 + m_FlexibleHeight: 26 m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxRadioButton.prefab b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxRadioButton.prefab index 2c520149..09bc892e 100644 --- a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxRadioButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxRadioButton.prefab @@ -138,14 +138,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.46666667, g: 0.46666667, b: 0.46666667, a: 1} + m_Color: {r: 0.25490198, g: 0.25490198, b: 0.25490198, 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: e5829cbc100001646956a9c3ed4e33c5, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -269,7 +269,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0, y: 1} --- !u!114 &5516198187994438965 MonoBehaviour: @@ -290,7 +290,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.33333334, g: 0.33333334, b: 0.33333334, a: 1} @@ -318,7 +318,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!114 &4082783022810545647 MonoBehaviour: m_ObjectHideFlags: 0 @@ -344,12 +344,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 26 + m_MinHeight: 26 + m_PreferredWidth: 26 + m_PreferredHeight: 26 + m_FlexibleWidth: 26 + m_FlexibleHeight: 26 m_LayoutPriority: 1 --- !u!1 &8870708017338182451 GameObject: @@ -362,6 +362,7 @@ GameObject: - component: {fileID: 4319505425079556448} - component: {fileID: 4623644769148856366} - component: {fileID: 1498045985882217795} + - component: {fileID: 802960825775538566} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -409,7 +410,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -426,3 +427,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &802960825775538566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8870708017338182451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 0.23529412} + targetImage: {fileID: 1498045985882217795} + button: {fileID: 5516198187994438965} diff --git a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSeparator.prefab b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSeparator.prefab index 93df2537..9286eb9d 100644 --- a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSeparator.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSeparator.prefab @@ -10,7 +10,6 @@ GameObject: m_Component: - component: {fileID: 539816085347750692} - component: {fileID: 2193016365674033586} - - component: {fileID: 2266528321876069305} - component: {fileID: -2870669144120309969} m_Layer: 5 m_Name: ToolboxSeparator @@ -30,13 +29,14 @@ 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: 8859656918985505287} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 26} + m_SizeDelta: {x: 21, y: 26} m_Pivot: {x: 0, y: 1} --- !u!222 &2193016365674033586 CanvasRenderer: @@ -46,36 +46,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1459767928986708847} m_CullTransparentMesh: 1 ---- !u!114 &2266528321876069305 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1459767928986708847} - 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: 0.43529412, g: 0.43529412, b: 0.43529412, 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: 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!114 &-2870669144120309969 MonoBehaviour: m_ObjectHideFlags: 0 @@ -96,3 +66,78 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: 26 m_LayoutPriority: 1 +--- !u!1 &2869525576336509803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8859656918985505287} + - component: {fileID: 5495956553559597421} + - component: {fileID: 4605479227834466636} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8859656918985505287 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869525576336509803} + 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: 539816085347750692} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5495956553559597421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869525576336509803} + m_CullTransparentMesh: 1 +--- !u!114 &4605479227834466636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2869525576336509803} + 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: 0.3764706, g: 0.3764706, b: 0.3764706, 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: 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 diff --git a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxStandardButton.prefab b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxStandardButton.prefab index 36bd9031..a3f80ef2 100644 --- a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxStandardButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxStandardButton.prefab @@ -147,6 +147,7 @@ GameObject: - component: {fileID: 7224698793250217790} - component: {fileID: 4488801829647061557} - component: {fileID: 5029365665256666181} + - component: {fileID: 1451028678968054035} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -194,7 +195,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -211,6 +212,24 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1451028678968054035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7551775150721655309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 0.23529412} + targetImage: {fileID: 5029365665256666181} + button: {fileID: 4379965520992721259} --- !u!1 &9218577172950644075 GameObject: m_ObjectHideFlags: 0 @@ -251,7 +270,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0, y: 1} --- !u!222 &5596571647579825329 CanvasRenderer: @@ -274,14 +293,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.43529412, g: 0.43529412, b: 0.43529412, a: 1} + m_Color: {r: 0.25490198, g: 0.25490198, b: 0.25490198, 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: e5829cbc100001646956a9c3ed4e33c5, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -310,7 +329,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.33333334, g: 0.33333334, b: 0.33333334, a: 1} @@ -360,10 +379,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 26 + m_MinHeight: 26 + m_PreferredWidth: 26 + m_PreferredHeight: 26 + m_FlexibleWidth: 26 + m_FlexibleHeight: 26 m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSubMenuPanel.prefab b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSubMenuPanel.prefab index 32713a6a..3c0540d5 100644 --- a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSubMenuPanel.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxSubMenuPanel.prefab @@ -59,14 +59,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.43529412, g: 0.43529412, b: 0.43529412, a: 1} + m_Color: {r: 0.25490198, g: 0.25490198, b: 0.25490198, 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: -27720893, guid: e5829cbc100001646956a9c3ed4e33c5, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -114,7 +114,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2600238454770762569 RectTransform: m_ObjectHideFlags: 0 @@ -230,7 +230,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0, y: 1} --- !u!222 &6840350081958449137 CanvasRenderer: @@ -253,12 +253,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 2 - m_Right: 2 - m_Top: 2 - m_Bottom: 2 + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 2 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxToggleButton.prefab b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxToggleButton.prefab index e96be642..29f410a4 100644 --- a/Assets/Resources/Prefabs/UI/Toolbox/ToolboxToggleButton.prefab +++ b/Assets/Resources/Prefabs/UI/Toolbox/ToolboxToggleButton.prefab @@ -138,14 +138,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1} + m_Color: {r: 0.25490198, g: 0.25490198, b: 0.25490198, 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: e5829cbc100001646956a9c3ed4e33c5, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -166,6 +166,7 @@ GameObject: - component: {fileID: 5993489077151453672} - component: {fileID: 5366711475479328522} - component: {fileID: 1861803751595877094} + - component: {fileID: 7396894383641909670} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -213,7 +214,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -230,6 +231,24 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7396894383641909670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184666941695484873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75536bd8c4a0290479506cdfb3d001b2, type: 3} + m_Name: + m_EditorClassIdentifier: + originalColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 1} + hoverColor: {r: 1, g: 1, b: 1, a: 1} + clickColor: {r: 1, g: 1, b: 1, a: 1} + disabledColor: {r: 0.5254902, g: 0.5254902, b: 0.5254902, a: 0.23529412} + targetImage: {fileID: 1861803751595877094} + button: {fileID: 5516198187994438965} --- !u!1 &7951080877820295087 GameObject: m_ObjectHideFlags: 0 @@ -344,7 +363,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0, y: 1} --- !u!114 &5516198187994438965 MonoBehaviour: @@ -365,7 +384,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.3317708, g: 0.3317708, b: 0.33333334, a: 1} @@ -393,7 +412,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!114 &4082783022810545647 MonoBehaviour: m_ObjectHideFlags: 0 @@ -419,10 +438,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 30 - m_MinHeight: 30 - m_PreferredWidth: 30 - m_PreferredHeight: 30 - m_FlexibleWidth: 30 - m_FlexibleHeight: 30 + m_MinWidth: 26 + m_MinHeight: 26 + m_PreferredWidth: 26 + m_PreferredHeight: 26 + m_FlexibleWidth: 26 + m_FlexibleHeight: 26 m_LayoutPriority: 1 diff --git a/Assets/Resources/Prefabs/UI/images/XR.png b/Assets/Resources/Prefabs/UI/images/XR.png index f94f3608b5d07640d60d6d54f1dc965bd13be16c..ea385b8de3b6eb097a16c8fa1be833adf53c1853 100644 GIT binary patch delta 632 zcmV-;0*C$lA)f^yiBL{Q4GJ0x0000DNk~Le0000Y0000Y2nGNE06Iqt!jT~~e*!c~ zL_t(|0qvN-ZXz)d#%H;d2vULsQaU8y3E(YgXrZ75PEcF}gz^d`Xo2FcgMyxd8tw%s zs4fBu=mMg5{H7y>BAa4=k`@2oZ^kp0gF~ETGTG#RdW^A0`dVIi`FlE@o}EM@ z@eC0ZAlv~zA>===KT&{iA+M33e?AV}C&1P~8b@VkF4Q2v+)$4WU^(|36j|NtB zyIt9CwOX#lpin4KxmyC-ENI*;5Eb%%3`sQ@r8X%>#Rou z5V$&i>4<3QmK4i2n48cfg=(0`+eg&%;V3`ck_$I zBH6GC(M9xnJsB_geBOF50A!UoM$FYc`ynAB*nmh?#0yed6>8gD&pP!E`j8O)NN~2o z6S%C@i_W$=K-LMbn1UGK@yzs2d?1_6%C@+iRH3+-)N!>B7nYjxPPtr8rm#L{6%qvD z!$>C-q7w?yiSYkBUnzKA;E_HB&z~Q++wEU88b#xYmoNRH2B*Ov`M=KR^Y1sS$T-6c SdPL~}0000A|?m` literal 4348 zcmdT|`8yO|7r$d)!pPccN%-0;A!Xm9EZGLxA~7b}QW@JsvX<p-l4Y0}G2z0dnkyg%IM+|Rk^-skyz?mg#u&P}qhGUMYp$^!u4Grw$X3jl;U zg#a!Nrg06axWzQwL6@CF0pJz-J0KvxK>Tk=sI8eHsO>+#zyxf*29^c@)Ti<8-Czd* znr?1vVE+KJMDj>=7!m1O4O4j)ARRPbnpBJ_Ns`UC`R>@ux|nA_bo0T-EgKU{OeN-5 zoM*|+%fgCzYT3pgIps`CWJHD^X{g^g*(4Av#YZ4KJzWovTJg`?AsAG48Z0k3-xoh# z9-6QlxD>JJJ~0q??$Eh@watQwQQxJojs8-jo~YhkV=FqW>~8$c@EFHP`P??8jBIxO z-sI3q=?vIfo4R9xop)DR(}B~hr-`;?rbgE8PVdOzJfhJxIwOV7jj~b5@Qsj_87Etb zHwlBzk#@a-HM11;MKR!(J>O6wE^>)r0aX_P+TZlj9a=;^nk)c4%Q4o|y`<UkIV#Jm z{$rgg5xsu3=+eBheoc376a%@c0*jK=^)8E?e!SZA;{n#X;ut8{(?2|S=%FnZJw3yj zQCFS+avh1q6<|1QTIX|9E%cr}4yBH;F;s!*hFcWu+QNhq$Vm4YU2E)}Ke6q#x6(1B ztGh3tJ>b#zR@;>#1d_gX$*qOMtY|`7H5@j|4k?woR?(7{&fx}*B;=S`Ir&2PdW;8< zsmX^0YPoFx(TzG7=9-)tkk@?TIqsoLriao%)M#+N)oV`5+4F$_LGgK9QoRc`CLD5c% zv?o~(?0szrNg9cSpw~jofmXI4K>4zPNpT3!G6mo%6MFxj!@k@^*9RTpUQ7R`F-~KP z#SXAi(dGB(gH*A&3Kq|sy&TS~aaErO=K=YThcDD^n$(xd^(H^OINR-8 zbe_JAT$4b0r+uF6ep4iJ&~EJ?D6qd@wANvkFpF=ciO_JcU2$2T6qOIMxtFV*qO((% zj|yHv230$S`x4PI$YN)Y08WW9`PS%*V=MDr!XWhdq1c%2eo{%uWM4~XV}(E9oqDO>-~)VJnRQO?pq~`+LVMe;xTI>Nr8?_-uBrb+jfUCuLL8?4u$!Pw z!aTu9>jd0s!hg7gb9(3eW+G;4iG=H0VBgs#sNp5?-+fx#H}52=0Q$_t@yW>((KES& ze8{!y9#5M3SEss!dvCoZd5M;=@Uf_#ij{u@F>`+~x<|H5NQ%3E;AEKJc9bvibWH%= zFugGs4y7b|Zl!bHT>TWE(crfWGy-EBs~1MJW+1N`j}r{{$hK!5Y}SN$(lyP~IEwjD zHtZeih!|NZO7_GKV<>bA?O=CK;|t51n>0awZ(XB?y9PJGIM1WJ z2=JLPenXD+x7?tmD`E++z0~tuxQq{!Q2g*3-q@U>Smd-oO+B{n)e7;#QI>y5{4%R* zczn5BXTB&!i6>U-F+-T4eZ}liC7oAB5R8q%-JrvYVQ(@$%tQ%8(ZY<|PHs@cD|5k< zQ1*`9Xe7eSgAP^hV)}=*HCX$g&K9yvsU#x(GMxtD9aDUWG9g3yuH9B+**W9-2_6}Y zWH&`(tHj|w7~b0 zmm5vf&2U zwd*Y+)Vmc4pNcrpkL#=;R6pODc-YKF1o3NpZ?t?>N=pQ58j9mio4Z%m@3$YNcw)7c ze|(dV`{W_MGlmdX!rpVJDLUL8LE|QffiJ!VbTf(d76ZVMM(#`Mgl{&{_JMUx8Le zX@TeU_;cK&D?iI_gNiV&+QucmJj8b0!)Y=eIYwKU_bC2FJ0wfYXnJ{)vFyX9Z#_5? zSIrx{o+EH9dJ9rt3d5wIKy&q9eRD(^VK@wsPKmLT-x7?LTX!A*#Cfe_1-Os446S^< zti$2O3(Je9@-Djgl4O zQIZ_qR`UaNd`bZr3bTc|1QE|!+iX#On^rJ5htdW-*qi=8io2Hwd_l_T&Zwf{TS6WV?&nXdU zL%%9UMT$T4MS-ieQa{EwN0_ht-wzk4fwVD=BhEn*z`rz45MNe?6pY99*ZmlUm%Hmc zo-+gm>hyQ}jMy4xy6Ea`o85nsXAN;_IdWYRSPjNb_LHyv5){ zTqrm}k9?iofG4JANXQ-L&l9#Lp|E`5eY~|8Jq454~Fx%}&Yhowv5W>y{fh zYq{TXpPGbe%mR4^ys_G_pM6V(mqZzNa6V*A@5w|}?C-%by9cC5sN9z+oHV%g zI$raH_Psy55v@DuikExA%k^S^{GJ^BsHEN(mhkcp{{2m!nBb)FCQ~q6PrXmNz@6{} zR%_zh>0TuT7T*m#(7_=I=jCrQ2r6xG{RvMwmckZ4y0uMN(!^aW9n5Z6%T}2^nb&W;kmjak5}$?9T_sTb!zZ2fK{KLkVmrqUZDN3`#wS=cWEe63`Jd4xQb11 zPUuoQEX3%=pr6Uh;)B9l_uvh#RBJN`GWCH|ZigG7uNB0UG->J|v*T|&GJn>-@q16i zxfhtl_NO^7Um#Oc+c!+t*1`Q2K#14Vc?O$k?T-w*Vg2v$DCMnX4n*ARRJ!}50-&2< z3jYwhjKky+I>y8sZ#T)PzAsgB3*MuZ#Oto?sP%t!F(O`t`L0r?G>Mu73ORzc+6R{+^?p;#SQkkq15?OSh#-)f+rz}&zBQutdGQl@uEuw8BKTY*XW!tn6XZHa z+gWL5?tNQS=C5pFW2RTS@-f#JD>;3?&vHzA@65vczbR%z;#)?|wvvCsyFB8;PO z(Idz`^ZL1P642SM(WG3h-;^E&T;IFDf75U$bSlhZHTBKB2qmcDlV2<}fT7Y#_%4>3 zzZ0qK7*B!H$Bse0grQWUo9i-1fD~aP(8v0nOMTB4sIk0m($Jm6eu7>7&sBp)f4d&; zrJq@@;41%qz~(x_*IJ9pYQJ#S*FAz&*4NFC-`_q20)4weTwKE=QHz2cPp^ihMNrJuFBO+~_ zjDiaAl;Ncdu7XG6JBTT?9cMP#&}pJdVE_vu;3kA!9%XW&Yn_(6}?)mHxeNeUCj z+I&g+gutA8m_>Q61)?e(lL+{f8~VBZWOa&Wg{P(tj19 z{c6%giB6f17N^vHWk+3EZsz1%5n%yAsQ?^51wa=U_;}|3943SAE+)0It7lojN~LX& z36s<7O9P5!)3{wW)WzrBPL=X3ZKuG`ucwbG_8)}*b$0o9#lYJ_>TD0OE3kab?5Xc@ zDkE?{n{O}zTj}!=bW8Y}p3pcu>X=YS+r54wi)Y(e4R>L-4Q|wo$WYA1yIW{lZu^es zMjp6K4!#h*=&C0I%oI5{XQd<9^c%`O_DA3XtbM(5CnraNq;vKHEarURj>OX^F=wMU zG;#YTtIKI@`nJiV?U*7MqakLeYp!pvRF$#6+QB}1dRD17hZiMd|0i<%d(U-T;r41Z zSxo5zB_Agmn8S_w@g!=8QB+&7q`IiW#cb5>;8lgenPV5jRR$DZP!)TldV5BGR}_PdT~{iTqhRR%I>9!lMg&~b3LiN5_*^%zP~DT+L00)@=SJEHbA-v*hyoo2 z3BB}Qe2hZi`QaZ#8&Dz5_NCpOL7@Gyt>i+bUT1mLHDgN(y>zfPci>2l#(YP^DWaa` z#Ts~+vhoA_wcjcbyhC^)LX3t^mO5bE!ZnwHJX>BC=Q`7d+YYN;x)7*ESw8Ikw_Meh z0f(83nawPo+I(?B4X``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{(Mgt$B+ufw^Q!&HXHD?_|I+Ny(M^~q343& zF30c}X|jxF2`o1b%xRri;c%qoKD*t^B_8RqN~ie>imjA{R@h(l=$}`-rjgNp)e``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBIc`rE$B+ufrIYst9(E9Dy>D$^V8LLla?C>E zu&M+51xDEftqXySkGUkQ3fQ+O6y;1g=@P^9IC}ll{hOKod&C!9I+r#7-kW!Vszudz z)&9+MxR-t7UW$t9#5RGrbG6fsn)WnzzWwG{c~s72g;RW<=Dn{yMkgOLU!01oyPhpQCd=te4iYRjdxwy8LLN0?(=K6>OVNMBm`A S+c^gqObni`elF{r5}E+fUz2G7 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Prefabs/UI/images/button_alarm_badge.png.meta b/Assets/Resources/Prefabs/UI/images/button_alarm_badge.png.meta new file mode 100644 index 00000000..a7a97516 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/images/button_alarm_badge.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a7a3559e69268d744be3754913e39359 +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: 8, y: 7, z: 8, w: 7} + 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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/images/button_alert_close.png b/Assets/Resources/Prefabs/UI/images/button_alert_close.png new file mode 100644 index 0000000000000000000000000000000000000000..93efd9b2830e24478ecb6cba932a0eeceec2c026 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^5GZx^prwfgF}}M_)$E)e-c@N{76q1$B+ufx04TYGAMAk+WTJM=zH+*v`Lp} z$qRv?KTUjgA1<}4FJWTro|&pHJfSEvH0q_&<%y{VK1yHjtux)J7jI%YN&U}(%lcJT nPxduQXKN*VVEMw!GMCGJ`IL!ILX_tKEn)C<^>bP0l+XkK+WS1x literal 0 HcmV?d00001 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_copy_white.png.meta b/Assets/Resources/Prefabs/UI/images/button_alert_close.png.meta similarity index 98% rename from Assets/Resources/Prefabs/UI/Toolbar/images/ic_copy_white.png.meta rename to Assets/Resources/Prefabs/UI/images/button_alert_close.png.meta index 8fe479a5..dc6c7d0d 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_copy_white.png.meta +++ b/Assets/Resources/Prefabs/UI/images/button_alert_close.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e9bf139426584794688292dae70dfd4c +guid: 17863240a1386604e8c74d85d4a95818 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 4 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 32 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Prefabs/UI/images/button_copy.png b/Assets/Resources/Prefabs/UI/images/button_copy.png new file mode 100644 index 0000000000000000000000000000000000000000..cef446941cfd65eabbc95fd92df923747381177f GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBzPqQ3V@L(#*@?Hg7!-J%bbl56zf;Ajw5WQ^ z=N-JuIcB&BU2RupJp0a;?_FVdQ&MBb@0BP``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBeuAfqV@L(#+sTf641zqa|4-cc-&G}iIpv0C zd}ru=H;-EXSxg5@yPB9)EG~X8{(15Z>!}@ABfq|!adA~=>JzhfEN}lFFq*eE?{TQo v46bRnBox0V-#9t@W7)YQ!v8cl)_r0O*;UI}*u;7tXcvR0tDnm{r-UW|-*iY{ literal 0 HcmV?d00001 diff --git a/Assets/Resources/Prefabs/UI/images/button_dashboard.png.meta b/Assets/Resources/Prefabs/UI/images/button_dashboard.png.meta new file mode 100644 index 00000000..253e7dae --- /dev/null +++ b/Assets/Resources/Prefabs/UI/images/button_dashboard.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 9852e725550bcac4fb33156760fc4645 +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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/images/button_setting.png b/Assets/Resources/Prefabs/UI/images/button_setting.png new file mode 100644 index 0000000000000000000000000000000000000000..b57372d1dc04437209a2e1c4cc94dac575df38a4 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBIUY|J$B+ufw;_Ro%?3PY(-Niza9S|1&t_Kf z;S!p`tfIikIrW0&iCMd^D}UJ)^yAsxrwt~xo^rmOdNPd0=l3Kn+RQP#SAb>nk8cO( z8Su~NHS>BScu94JbE~`!uaAMkO{UxG?xJ!kVw`iL`aPqM?9i%oP&+dB)qy3k4{t7H z_BIVzEA=!x$>{0itm9ILI9qzAx;5*V9xc%xKJ7Q1V8!(UaqA;pdp*I|d4TEVB2+ zZ*9}xCub;K>2;)V$>L?qC1-lKJiawC?1^%|zT(OcN7MBe+IOnO8D4Hx{=w+uF0-}r TpZgDBI5Bv-`njxgN@xNA-WQKS literal 0 HcmV?d00001 diff --git a/Assets/Resources/Prefabs/UI/images/button_setting.png.meta b/Assets/Resources/Prefabs/UI/images/button_setting.png.meta new file mode 100644 index 00000000..ae273c20 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/images/button_setting.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 36a1a00566c5c1d4684e2bf4419e69db +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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/images/check_mark.png b/Assets/Resources/Prefabs/UI/images/check_mark.png new file mode 100644 index 0000000000000000000000000000000000000000..d49774eb466551c83f105666e5ec92ebc205f90c GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VXMsm#F#`j)FbFd;%$g$s6l5$8 za(7}_cTVOdki(Mh=?JZLZR3o}%Bbr`1 zSZ`pp-Y{iK0_QXV^MXd3PX=lVPHfMLCp_K3d*P?Z`@df5TO1DiX{~5gOg?R}P+T^k zyRG%?vq|pLW}Uec;4VJp0K2rU(PvxpdLaq(jVE=?vOcsu30tJTB0r>gj+s`5qlUsC d%aVU*c@;MHZaJ75co66s22WQ%mvv4FO#lz7PSF4W literal 0 HcmV?d00001 diff --git a/Assets/Resources/Prefabs/UI/images/check_mark.png.meta b/Assets/Resources/Prefabs/UI/images/check_mark.png.meta new file mode 100644 index 00000000..702d4057 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/images/check_mark.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 459350b8e25ec894daa9ec8b62bdc029 +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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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: 4 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/images/ic_close.png b/Assets/Resources/Prefabs/UI/images/ic_close.png index 4157603bd0a7cd58a329ac12a136f0080a3fc1ac..9add18d902ae4bf36e0faf692e16584097da26cf 100644 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^xK$DJnSs*<31 zYsHU`ak+)9o@W>s4!pl(`@W+1uFk8I4-C4htt`Gw6gs%@*gP)3Hn(@xCwLd#IW^f< c4`>=UD+jmz_P0+J9{@QFp00i_>zopr0Elin^#A|> literal 459 zcmV;+0W|)JP)Px$g-Jv~R9Hvt*D+4RPz(m(xF_HM(UXq=BU_IGH-L?eGBTALz)fIegCkf`7EWRG zszwS?QakT=M2B=u;(YyI{G3pA=07@fU$p|!6VMdS@muq(jK#mG`zzPBqu1c~5g1LrO`iYo$okrB9JpoNUWLBJ{G zX0!Rp`&@4;adqodH_vL4u_D9n?w>r3B{&Bcg>)xaf{Q@9fCvsn zn!x;lqpDvKvvt@wM0718pQrX(6PPbfDLoR=E@FIjNFurykr!(axPZqu7x$;4b<^F z!!Qg$RTh8^@Ce<2Y(SX+HedwU05-@7g$Y6@047M7pll%Ii^3_&huT&`de?WSBQ&ur zS#n~_04Gi)u>u1S@q+$jBv&MB62~I>AgM@RNOr5$s)GN949`dkl0Ak~klez5APl#l zOmQSAg|JSQoMh8;`wi+e@$yNsr!@KEHjd;R>NIOaQ<2b^H#P$6kEJAwZRj8ZJ%1nqHIUmw z8|4>DhDS8<(< zKB>ZGx?D&B+pB@r!cj*+PLc}JIxSNt@qjH(-p~&G-t=pESPpWJ;N*>=2zdoq%ETk$jP#X1;7I-ZTXbThDm;5%r)fnE=36t)H*){`6o zjNMkMMV(!dDFE!&qg+Vixc#UR*e&UV?+meB+9+|RvI=%95^;T-DGKj*tD+xQ*kWbA zJ~T^dkq4|$#y>zR*k9Z=Ep%aj>3-4*wI@%F29Nr4pKh>bV3Zn1f);*k_#^h8t)-{U zNXHJ_g)g02{?KE?&Rz&(9shoh!)I&0{X7du96lb3p*g0SfB!+9USs#QcPOQW;g$#8 xKKvQf>-XklvN5iLdMDMKV(un8jXZH8j33B!y;ERuyJr9Z002ovPDHLkV1hM0P@Vt) literal 0 HcmV?d00001 diff --git a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_capture_white.png.meta b/Assets/Resources/Prefabs/UI/images/icon_alert.png.meta similarity index 98% rename from Assets/Resources/Prefabs/UI/Toolbar/images/ic_capture_white.png.meta rename to Assets/Resources/Prefabs/UI/images/icon_alert.png.meta index 3fe2a2a9..877dc8a2 100644 --- a/Assets/Resources/Prefabs/UI/Toolbar/images/ic_capture_white.png.meta +++ b/Assets/Resources/Prefabs/UI/images/icon_alert.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 74c1c73ba4570294c83286832b679e66 +guid: b41cf0d337ea8b64b8c8f672815bc8df TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Prefabs/UI/images/search_box.png b/Assets/Resources/Prefabs/UI/images/search_box.png new file mode 100644 index 0000000000000000000000000000000000000000..b27defb5ee08f2b830a4563ec437008c47ad6392 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O(Ate!58Ar*{oryg9{>>%R$zGsDk9+MJBp00xG z57%7fmnzFz;t!tBcNUz)7u1;Y*sEnt%!-VA%`BVDxFRbK91PrfymGeo2NfRYc#gsa zw{>HseV+SRE;sT0U#VQt`Pky+u6F^UqPMmkHQ<@il_;@6hkMm3InPNQ8eQLN@Bg2g z`ZMr@b&%JNb=bl?FX82swqPu$LCV#I$5%cq(6J{;*zssXl@6*~` z8r%NZ;?8l;dC&Jh`f9|{WLvvovD{a~xz>NbPBogOb6W4u1IGWSV#Q<&n=b { new MenuItemData("alert", "Alert", new ActionCommand(async () => { - await Alert.Show("알림", "이것은 간단한 알림 메시지입니다."); + await Alert.Show("알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림알림", "이것은 간단한 알림 메시지입니다."); await Alert.Show("경고", "데이터를 저장할 수 없습니다.", "알겠습니다"); await Alert.Show("error", "error_network_not", "button_retry"); })), diff --git a/Assets/Scripts/UVC/Factory/Buttons/UISearchInput.cs b/Assets/Scripts/UVC/Factory/Buttons/UISearchInput.cs index ce4d3214..f12ac8d9 100644 --- a/Assets/Scripts/UVC/Factory/Buttons/UISearchInput.cs +++ b/Assets/Scripts/UVC/Factory/Buttons/UISearchInput.cs @@ -1,4 +1,4 @@ -using Cysharp.Threading.Tasks; +using Cysharp.Threading.Tasks; using SampleProject; using TMPro; using UnityEngine; @@ -7,7 +7,6 @@ using UnityEngine.UI; using UVC.Factory.Component; using UVC.Locale; using UVC.UI.Modal; - namespace UVC.Factory.Buttons { public class UISearchInput : MonoBehaviour @@ -43,6 +42,7 @@ namespace UVC.Factory.Buttons }); inputField.onEndEdit.AddListener(OnFindLocation); + inputField.onSubmit.AddListener(OnFindLocation); Init(); } diff --git a/Assets/Scripts/UVC/UI/Buttons.meta b/Assets/Scripts/UVC/UI/Buttons.meta new file mode 100644 index 00000000..4241c422 --- /dev/null +++ b/Assets/Scripts/UVC/UI/Buttons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28c2743eed2320646baf3f2ad2dd307a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UVC/UI/Buttons/ImageButton.cs b/Assets/Scripts/UVC/UI/Buttons/ImageButton.cs new file mode 100644 index 00000000..0fa62b00 --- /dev/null +++ b/Assets/Scripts/UVC/UI/Buttons/ImageButton.cs @@ -0,0 +1,130 @@ +using System; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.EventSystems; +using UnityEngine.Serialization; +using UnityEngine.UI; + +namespace UVC.UI.Buttons +{ + /// + /// 이미지 color를 변경하여 버튼과 같은 UI 요소에 시각적 피드백을 제공하는 이미지 버튼입니다. + /// + public class ImageButton : Image, IPointerDownHandler, IPointerUpHandler, + IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler + { + [SerializeField] + private Color originalColor = Color.white; // 기본 상태일 때의 색상 + [SerializeField] + private Color hoverColor = Color.gray; // 마우스 포인터가 위에 있을 때의 색상 + [SerializeField] + private Color clickColor = Color.gray; // 클릭했을 때의 색상 + [SerializeField] + private Color disabledColor = Color.gray; // 비활성화 상태일 때의 색상 + + [SerializeField] + private bool interactable = true; + public bool Interactable + { + get => interactable; + set + { + if (interactable == value) return; + interactable = value; + raycastTarget = value; // 상호 작용 가능 상태에 따라 raycastTarget 설정 + color = value ? originalColor : disabledColor; + } + } + + [Serializable] + /// + /// 버튼 클릭 이벤트에 대한 함수 정의. + /// + public class ButtonClickedEvent : UnityEvent { } + + // onClick 이벤트는 인스펙터에 노출되며, 버튼 클릭 시 호출될 함수를 등록할 수 있습니다. + [FormerlySerializedAs("onClick")] + [SerializeField] + private ButtonClickedEvent m_OnClick = new ButtonClickedEvent(); + + /// + /// 버튼을 클릭할 때마다 호출되는 UnityEvent입니다. + /// + public ButtonClickedEvent onClick + { + get { return m_OnClick; } + set { m_OnClick = value; } + } + + protected override void Awake() + { + base.Awake(); + // 초기화 시 Interactable 프로퍼티를 통해 색상과 raycastTarget을 설정합니다. + raycastTarget = interactable; + color = interactable ? originalColor : disabledColor; + } + + /// + /// 포인터가 버튼을 눌렀을 때 호출됩니다. + /// + public virtual void OnPointerDown(PointerEventData eventData) + { + if (Interactable) + { + color = clickColor; // 클릭 시 컬러 변경 + } + } + + /// + /// 포인터가 버튼 영역에 들어왔을 때 호출됩니다. + /// + public virtual void OnPointerEnter(PointerEventData eventData) + { + if (Interactable) + { + color = hoverColor; // 마우스 오버 시 컬러 변경 + } + } + + /// + /// 포인터가 버튼 영역을 벗어났을 때 호출됩니다. + /// + public virtual void OnPointerExit(PointerEventData eventData) + { + // 상호작용 가능 여부와 관계없이 포인터가 나가면 상태에 맞는 기본 색상으로 돌아갑니다. + color = interactable ? originalColor : disabledColor; + } + + /// + /// 포인터가 버튼에서 떼어졌을 때 호출됩니다. + /// + public virtual void OnPointerUp(PointerEventData eventData) + { + if (Interactable) + { + color = hoverColor; // 클릭 후 원래 컬러로 변경 + } + } + + /// + /// 버튼 클릭이 완료되었을 때 호출됩니다. (PointerDown과 PointerUp이 같은 대상에서 발생) + /// + public virtual void OnPointerClick(PointerEventData eventData) + { + // 왼쪽 마우스 버튼 클릭이 아니면 무시합니다. + if (eventData.button != PointerEventData.InputButton.Left) return; + Press(); + } + + /// + /// 내부적으로 클릭 이벤트를 실행합니다. + /// + private void Press() + { + // 컴포넌트가 활성화 상태가 아니거나 상호작용 불가능하면 이벤트를 호출하지 않습니다. + if (!IsActive() || !interactable) return; + m_OnClick.Invoke(); + } + + } +} diff --git a/Assets/Scripts/UVC/UI/Buttons/ImageButton.cs.meta b/Assets/Scripts/UVC/UI/Buttons/ImageButton.cs.meta new file mode 100644 index 00000000..2e4c0e13 --- /dev/null +++ b/Assets/Scripts/UVC/UI/Buttons/ImageButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4185643eda515744385d49b83fe88dce \ No newline at end of file diff --git a/Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs b/Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs new file mode 100644 index 00000000..82600608 --- /dev/null +++ b/Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs @@ -0,0 +1,43 @@ +#nullable enable +using UnityEngine; +#if UNITY_STANDALONE_WIN +using System; +using System.Runtime.InteropServices; +#endif + +namespace UVC.UI.Commands +{ + public class MinimizeApplicationCommand : ICommand + { + +#if UNITY_STANDALONE_WIN + [DllImport("user32.dll")] + private static extern bool ShowWindow(IntPtr hwnd, int nCmdShow); + + [DllImport("user32.dll")] + private static extern IntPtr GetActiveWindow(); + + private const int SW_MINIMIZE = 6; +#endif + + public void Execute(object? parameter = null) + { + // 파라미터는 여기서는 사용되지 않을 수 있음 + if (parameter != null) + { + Debug.Log($"MinimizeApplicationCommand 실행됨 (파라미터 무시됨: {parameter})"); + } + else + { + Debug.Log("MinimizeApplicationCommand 실행됨"); + } + +#if UNITY_STANDALONE_WIN + ShowWindow(GetActiveWindow(), SW_MINIMIZE); +#else + Debug.Log("창 최소화는 Windows 독립 실행형에서만 지원됩니다."); +#endif + + } + } +} diff --git a/Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs.meta b/Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs.meta new file mode 100644 index 00000000..704ab2b5 --- /dev/null +++ b/Assets/Scripts/UVC/UI/Commands/MinimizeApplicationCommand.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: def4dca38129c4d4fb17f819b3e799bf \ No newline at end of file diff --git a/Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs b/Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs new file mode 100644 index 00000000..26b1b737 --- /dev/null +++ b/Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs @@ -0,0 +1,13 @@ +using UVC.UI.Commands; +using UVC.UI.Commands.Mono; + +namespace Assets.Scripts.UVC.UI.Commands.Mono +{ + internal class MinimizeApplicationCommandMono : MonoBehaviourCommand + { + public override void Execute() + { + new MinimizeApplicationCommand().Execute(); + } + } +} diff --git a/Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs.meta b/Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs.meta new file mode 100644 index 00000000..b1c77eec --- /dev/null +++ b/Assets/Scripts/UVC/UI/Commands/Mono/MinimizeApplicationCommandMono.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f3c6fc4cbf58b35409c0bbd44175ecec \ No newline at end of file diff --git a/Assets/Scripts/UVC/UI/Menu/TopMenuController.cs b/Assets/Scripts/UVC/UI/Menu/TopMenuController.cs index 6a35f316..65e4015c 100644 --- a/Assets/Scripts/UVC/UI/Menu/TopMenuController.cs +++ b/Assets/Scripts/UVC/UI/Menu/TopMenuController.cs @@ -236,7 +236,7 @@ namespace UVC.UI.Menu new MenuItemData("confirm", "Confirm", new ActionCommand(async () => { bool result = await Confirm.Show("확인", "이것은 간단한 알림 메시지입니다."); ULog.Debug($"사용자가 확인 버튼을 눌렀나요? {result}"); - result = await Confirm.Show("경고", "데이터를 저장할 수 없습니다.", "알겠습니다", "아니요"); + result = await Confirm.Show("경고", "데이터를 저장할 수 없습니다.", "알겠습니다~~~~", "아니요"); ULog.Debug($"사용자가 알림을 확인했나요? {result}"); result = await Confirm.Show("error", "error_network_not", "button_retry", "button_cancel"); ULog.Debug($"사용자가 네트워크 오류 알림을 확인했나요? {result}"); diff --git a/Assets/Scripts/UVC/UI/Modal/ModalView.cs b/Assets/Scripts/UVC/UI/Modal/ModalView.cs index 3bef62f7..72a0d72e 100644 --- a/Assets/Scripts/UVC/UI/Modal/ModalView.cs +++ b/Assets/Scripts/UVC/UI/Modal/ModalView.cs @@ -3,6 +3,7 @@ using Cysharp.Threading.Tasks; using TMPro; using UnityEngine; using UnityEngine.UI; +using UVC.Extention; using UVC.Log; namespace UVC.UI.Modal @@ -128,6 +129,18 @@ namespace UVC.UI.Modal if (messageText != null && content != null) { messageText.text = content.Message; + if(titleText != null) + { + // 메시지 텍스트의 위치를 제목 아래로 조정해요. messageText를 titleText 높이 + 14만큼 아래로 이동시켜요. + RectTransform messageRect = messageText.GetComponent(); + if (messageRect != null) + { + float preferredHeight = titleText.preferredHeight; + Vector2 anchoredPosition = titleText.rectTransform.anchoredPosition; + float newY = anchoredPosition.y - (content.Title.IsNullOrEmpty() ? 0 : preferredHeight + 14); + messageRect.anchoredPosition = new Vector2(messageRect.anchoredPosition.x, newY); + } + } } // 확인 버튼 설정 @@ -137,6 +150,25 @@ namespace UVC.UI.Modal if (content.ShowConfirmButton && confirmButtonText != null && !string.IsNullOrEmpty(content.ConfirmButtonText)) { confirmButtonText.text = content.ConfirmButtonText; + // text가 너무 길면 버튼 크기를 조정해요. + RectTransform confirmButtonRect = confirmButton.GetComponent(); + if (confirmButtonRect != null && confirmButtonText.preferredWidth > confirmButtonRect.sizeDelta.x - 10) + { + // 버튼의 너비를 글자 크기에 맞춰 조정해요. + confirmButtonRect.sizeDelta = new Vector2(confirmButtonText.preferredWidth + 20, confirmButtonRect.sizeDelta.y); + + //취소 버튼이 null이 아니고, 취소 버튼이 활성화되어 있다면 변경 된 confirmButtonRect에 맞춰 왼쪽으로 이동시켜요. + //confirm 버튼과 cancel 버튼 간격은 12 + if (cancelButton != null && content.ShowCancelButton) + { + RectTransform cancelButtonRect = cancelButton.GetComponent(); + if (cancelButtonRect != null) + { + // confirm 버튼의 왼쪽에 cancel 버튼을 배치해요. + cancelButtonRect.anchoredPosition = new Vector2(confirmButtonRect.anchoredPosition.x - confirmButtonRect.sizeDelta.x - 12, cancelButtonRect.anchoredPosition.y); + } + } + } } } @@ -147,6 +179,13 @@ namespace UVC.UI.Modal if (content.ShowCancelButton && cancelButtonText != null && !string.IsNullOrEmpty(content.CancelButtonText)) { cancelButtonText.text = content.CancelButtonText; + // text가 너무 길면 버튼 크기를 조정해요. + RectTransform cancelButtonRect = cancelButton.GetComponent(); + if (cancelButtonRect != null && cancelButtonText.preferredWidth > cancelButtonRect.sizeDelta.x - 10) + { + // 버튼의 너비를 글자 크기에 맞춰 조정해요. + cancelButtonRect.sizeDelta = new Vector2(cancelButtonText.preferredWidth + 20, cancelButtonRect.sizeDelta.y); + } } } @@ -169,6 +208,7 @@ namespace UVC.UI.Modal /// protected virtual void AdjustButtonPositions() { + return; // 기본 구현은 아무것도 안 해요. 필요하면 재정의해서 사용하세요. bool isConfirmActive = confirmButton != null && confirmButton.gameObject.activeSelf; bool isCancelActive = cancelButton != null && cancelButton.gameObject.activeSelf; diff --git a/Assets/Scripts/UVC/UI/ToolBar/Toolbar.cs b/Assets/Scripts/UVC/UI/ToolBar/Toolbar.cs index f3d10eea..729ff1ba 100644 --- a/Assets/Scripts/UVC/UI/ToolBar/Toolbar.cs +++ b/Assets/Scripts/UVC/UI/ToolBar/Toolbar.cs @@ -76,6 +76,9 @@ namespace UVC.UI.Toolbar new ActionCommand(() => Debug.Log("화면 축소 버튼 클릭됨")), "화면을 한 단계 축소 합니다."); + // 구분선 + mainToolbar.AddSeparator(); + // RadioButtonGroup 샘플 mainToolbar.AddRadioButton("CameraControlGroup", "Top View", true, "Prefabs/UI/Toolbar/images/ic_camera_top_on", @@ -99,7 +102,6 @@ namespace UVC.UI.Toolbar // 구분선 mainToolbar.AddSeparator(); - // 기존 확장 버튼 (예시로 남겨두거나 필요에 따라 수정/제거) var expandableBtnModel = mainToolbar.AddExpandableButton("button_brush_size", "Prefabs/UI/Toolbar/images/ic_brush_default_white", diff --git a/Assets/Scripts/UVC/UI/ToolBar/Toolbox.cs b/Assets/Scripts/UVC/UI/ToolBar/Toolbox.cs index 733ad217..62f14639 100644 --- a/Assets/Scripts/UVC/UI/ToolBar/Toolbox.cs +++ b/Assets/Scripts/UVC/UI/ToolBar/Toolbox.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using UnityEngine; +using UVC.Factory.Playback; using UVC.Locale; using UVC.UI.Commands; using UVC.UI.Toolbar; @@ -89,24 +90,60 @@ namespace UVC.UI.ToolBar // --- 툴바 모델 구성 시작 --- // 여기에 다양한 툴바 항목(버튼, 구분선 등)을 mainToolbar 모델에 추가합니다. - // 예시 1: 카메라 조절 라디오 버튼 그룹 - // "CameraControlGroup"이라는 이름으로 라디오 버튼 그룹을 만듭니다. - // AddRadioButton의 세 번째 파라미터(initialState)는 해당 버튼이 초기에 선택될지 여부입니다. - // 각 버튼은 아이콘 경로(선택 시/해제 시), OnToggle 콜백, ClickCommand, 툴팁 키를 가질 수 있습니다. + // 컴포넌트 목록 + mainToolbar.AddStandardButton("컴포넌트 목록", + "Prefabs/UI/Toolbar/images/ic_menu_elements", + new ActionCommand(() => Debug.Log("컴포넌트 목록 버튼 클릭됨")), + "컴포넌트 목록 창을 엽니다."); + + // playback + mainToolbar.AddStandardButton("Playback", + "Prefabs/UI/Toolbar/images/ic_menu_playback", + new PlaybackCommand(), + "Playback을 실행 시킵니다."); + + // 화면 캡처 + mainToolbar.AddStandardButton("button_capture_screen", + "Prefabs/UI/Toolbar/images/ic_menu_capture", + new ActionCommand(() => Debug.Log("화면 캡처 버튼 클릭됨")), + "tooltip_capture_screen"); + + // 화면 녹화 시작/중지 (ToggleButton) + mainToolbar.AddToggleButton("button_record_screen", false, + "Prefabs/UI/Toolbar/images/ic_menu_camera_on", + "Prefabs/UI/Toolbar/images/ic_menu_camera_off", + (isSelected) => Debug.Log($"화면 녹화 상태: {(isSelected ? "녹화 중" : "중지")} (OnToggle 콜백)"), + new ActionCommand((isRecording) => Debug.Log($"화면 녹화 Command 실행: {(isRecording ? "녹화 시작" : "녹화 중지")}")), + "tooltip_record_screen"); + + // 화면 확대 + mainToolbar.AddStandardButton("화면 확대", + "Prefabs/UI/Toolbar/images/ic_menu_zoom_in", + new ActionCommand(() => Debug.Log("화면 확대 버튼 클릭됨")), + "화면을 한 단계 확대 합니다."); + + //화면 축소 + mainToolbar.AddStandardButton("화면 축소", + "Prefabs/UI/Toolbar/images/ic_menu_zoom_out", + new ActionCommand(() => Debug.Log("화면 축소 버튼 클릭됨")), + "화면을 한 단계 축소 합니다."); + + // 구분선 + mainToolbar.AddSeparator(); + + // RadioButtonGroup 샘플 mainToolbar.AddRadioButton("CameraControlGroup", "Top View", true, "Prefabs/UI/Toolbar/images/ic_camera_top_on", "Prefabs/UI/Toolbar/images/ic_camera_top_off_white", (isSelected) => { if (isSelected) Debug.Log("탑뷰 카메라 선택됨"); }, new ActionCommand(() => Debug.Log("탑뷰 카메라 Command 실행")), "Top View 시점으로 변경합니다."); - mainToolbar.AddRadioButton("CameraControlGroup", "Quarter View", false, "Prefabs/UI/Toolbar/images/ic_camera_quarter_on", "Prefabs/UI/Toolbar/images/ic_camera_quarter_off_white", (isSelected) => { if (isSelected) Debug.Log("쿼터뷰 카메라 선택됨"); }, new ActionCommand(() => Debug.Log("쿼터뷰 카메라 Command 실행")), "Quarter View 시점으로 변경합니다."); - mainToolbar.AddRadioButton("CameraControlGroup", "Front View", false, "Prefabs/UI/Toolbar/images/ic_camera_top_on", "Prefabs/UI/Toolbar/images/ic_camera_top_off_white", @@ -114,66 +151,9 @@ namespace UVC.UI.ToolBar new ActionCommand(() => Debug.Log("프런트뷰 카메라 Command 실행")), "Front View 시점으로 변경합니다."); - // 예시 2: 구분선 추가 mainToolbar.AddSeparator(); - // 예시 3: 표준 버튼 (객체 선택) - // AddStandardButton은 텍스트, 아이콘 경로, 클릭 커맨드, 툴팁 키를 파라미터로 받습니다. - mainToolbar.AddStandardButton("선택", // 버튼 텍스트 (또는 다국어 키) - "Prefabs/UI/Toolbar/images/ic_select_white", // 아이콘 경로 - new ActionCommand(() => Debug.Log("객체 선택 버튼 클릭됨")), // 클릭 시 실행될 커맨드 - "객체를 선택합니다."); // 툴팁 - - // 객체 이동 - mainToolbar.AddStandardButton("이동", - "Prefabs/UI/Toolbar/images/ic_move_white", - new ActionCommand(() => Debug.Log("객체 이동 버튼 클릭됨")), - "객체를 이동 시킵니다."); - - // 객체 회전 - mainToolbar.AddStandardButton("회전", - "Prefabs/UI/Toolbar/images/ic_rotation_white", - new ActionCommand(() => Debug.Log("객체 회전 버튼 클릭됨")), - "객체의 각도를 조절합니다."); - - // 객체 크기조절 - mainToolbar.AddStandardButton("크기조절", - "Prefabs/UI/Toolbar/images/ic_scale_white", - new ActionCommand(() => Debug.Log("객체 크기조절 버튼 클릭됨")), - "객체 크기를 조절합니다."); - - // 객체 복제 - mainToolbar.AddStandardButton("복제", - "Prefabs/UI/Toolbar/images/ic_copy_white", - new ActionCommand(() => Debug.Log("객체 복제 버튼 클릭됨")), - "객체를 복제 합니다."); - - // 객체 삭제 - mainToolbar.AddStandardButton("삭제", - "Prefabs/UI/Toolbar/images/ic_delete_white", - new ActionCommand(() => Debug.Log("객체 삭제 버튼 클릭됨")), - "객체를 삭제 합니다."); - - mainToolbar.AddSeparator(); - - // 예시 4: 화면 캡처 버튼 (텍스트가 다국어 키일 수 있음) - mainToolbar.AddStandardButton("button_capture_screen", // 다국어 키로 사용될 수 있는 텍스트 - "Prefabs/UI/Toolbar/images/ic_capture_white", - new ActionCommand(() => Debug.Log("화면 캡처 버튼 클릭됨")), - "tooltip_capture_screen"); // 툴팁도 다국어 키 사용 가능 - - // 예시 5: 화면 녹화 시작/중지 토글 버튼 - // AddToggleButton은 초기 상태, 선택/해제 아이콘, OnToggle 콜백 등을 설정합니다. - // ClickCommand는 ActionCommand을 사용하여 현재 토글 상태를 파라미터로 받을 수 있습니다. - mainToolbar.AddToggleButton("button_record_screen", false, // 초기 상태: 꺼짐(false) - "Prefabs/UI/Toolbar/images/ic_record_on_white", // 켜짐(selected) 상태 아이콘 - "Prefabs/UI/Toolbar/images/ic_record_off_white", // 꺼짐(deselected) 상태 아이콘 - (isSelected) => Debug.Log($"화면 녹화 상태: {(isSelected ? "녹화 중" : "중지")} (OnToggle 콜백)"), - new ActionCommand((isRecording) => Debug.Log($"화면 녹화 Command 실행: {(isRecording ? "녹화 시작" : "녹화 중지")}")), - "tooltip_record_screen"); - - - // 예시 6: 확장 버튼 (브러시 크기 선택) + // 예시 : 확장 버튼 (브러시 크기 선택) // AddExpandableButton으로 주 버튼을 만들고, 반환된 객체의 SubButtons 리스트에 하위 버튼들을 추가합니다. var expandableBtnModel = mainToolbar.AddExpandableButton("button_brush_size", // 주 버튼 텍스트/키 "Prefabs/UI/Toolbar/images/ic_brush_default_white", // 주 버튼 기본 아이콘 diff --git a/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarRadioButtonViewProcessor.cs b/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarRadioButtonViewProcessor.cs index 3df47b67..757a1659 100644 --- a/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarRadioButtonViewProcessor.cs +++ b/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarRadioButtonViewProcessor.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; using UnityEngine.UI; using UVC.UI.Toolbar.Model; @@ -85,7 +85,7 @@ namespace UVC.UI.Toolbar.View // 같은 GroupName을 가진 라디오 버튼들은 이 ToggleGroup에 의해 관리됩니다. ToggleGroup uiToggleGroup = viewContext.GetOrCreateToggleGroup(radioModel.GroupName); toggleComponent.group = uiToggleGroup; // UI Toggle을 해당 그룹에 할당 - + // 모델의 현재 IsSelected 상태로 UI Toggle의 초기 상태를 설정합니다. toggleComponent.SetIsOnWithoutNotify(radioModel.IsSelected); diff --git a/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarStandardButtonViewProcessor.cs b/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarStandardButtonViewProcessor.cs index 26c90b79..53d1fca6 100644 --- a/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarStandardButtonViewProcessor.cs +++ b/Assets/Scripts/UVC/UI/ToolBar/View/ToolbarStandardButtonViewProcessor.cs @@ -5,122 +5,122 @@ using UVC.UI.Toolbar.Model; namespace UVC.UI.Toolbar.View { /// - /// ǥ ư(ToolbarStandardButton) UI , ̺Ʈ , ð Ʈ óϴ ŬԴϴ. - /// IButtonViewProcessor ̽ Ͽ ToolbarView ǥ ư ϰ ٷ ֵ մϴ. + /// 표준 툴바 버튼(ToolbarStandardButton)의 UI 생성, 이벤트 연결, 시각적 업데이트를 처리하는 클래스입니다. + /// IButtonViewProcessor 인터페이스를 구현하여 ToolbarView가 표준 버튼을 일관된 방식으로 다룰 수 있도록 합니다. /// /// - /// Ŭ ֿ : - /// 1. UI : ToolbarView 'ǥ ư ' Ͽ ư GameObject ϴ. - /// 2. ȣۿ : ư UI(UnityEngine.UI.Button) ŬǾ , - /// ToolbarStandardButton ExecuteClick ޼尡 ȣǵ մϴ. - /// 3. ð Ʈ: ư (ؽƮ, , Ȱȭ ) Ǹ, - /// ȭ鿡 ̴ ư ׿ ° Ʈմϴ. + /// 이 클래스의 주요 역할: + /// 1. UI 생성: ToolbarView에 설정된 '표준 버튼 프리팹'을 사용하여 버튼의 GameObject를 만듭니다. + /// 2. 상호작용 설정: 생성된 버튼 UI(UnityEngine.UI.Button)가 클릭되었을 때, + /// 연결된 ToolbarStandardButton 모델의 ExecuteClick 메서드가 호출되도록 설정합니다. + /// 3. 시각적 업데이트: 버튼 모델의 상태(텍스트, 아이콘, 활성화 상태 등)가 변경되면, + /// 화면에 보이는 버튼의 모습도 그에 맞게 업데이트합니다. /// /// /// - /// // ToolbarView μ Ǵ (ȭ ): - /// // 1. ToolbarModelκ ToolbarStandardButton ü ɴϴ. + /// // ToolbarView 내에서 이 프로세서가 사용되는 방식 (간략화된 예시): + /// // 1. ToolbarModel로부터 ToolbarStandardButton 객체를 가져옵니다. /// // ToolbarStandardButton standardButtonModel = new ToolbarStandardButton { Text = "Save", ... }; /// - /// // 2. ToolbarView ش ŸԿ ´ Processor ãϴ. + /// // 2. ToolbarView는 해당 모델 타입에 맞는 Processor를 찾습니다. /// // IButtonViewProcessor processor = GetButtonViewProcessor(typeof(ToolbarStandardButton)); - /// // (̶, ToolbarStandardButtonViewProcessor νϽ ȯ˴ϴ) + /// // (이때, ToolbarStandardButtonViewProcessor 인스턴스가 반환됩니다) /// - /// // 3. UI û + /// // 3. UI 생성 요청 /// // GameObject buttonUI = processor.CreateButtonUI(standardButtonModel, toolbarContainer, this); /// - /// // 4. ȣۿ ʱ ð û + /// // 4. 상호작용 및 초기 시각적 요소 설정 요청 /// // processor.SetupButtonInteractions(standardButtonModel, buttonUI, this); /// - /// // 5. ° Ǹ(: standardButtonModel.Text = "Save As";) OnStateChanged ̺Ʈ ߻ϰ, - /// // ToolbarView ٽ processor.UpdateCommonButtonVisuals() ȣϿ UI Ʈմϴ. + /// // 5. 모델의 상태가 변경되면(예: standardButtonModel.Text = "Save As";) OnStateChanged 이벤트가 발생하고, + /// // ToolbarView는 다시 processor.UpdateCommonButtonVisuals()를 호출하여 UI를 업데이트합니다. /// // standardButtonModel.OnStateChanged += () => processor.UpdateCommonButtonVisuals(standardButtonModel, buttonUI, this); /// /// public class ToolbarStandardButtonViewProcessor : IButtonViewProcessor { /// - /// ToolbarStandardButton 𵨿 شϴ UI GameObject մϴ. - /// ToolbarView ִ standardButtonPrefab Ͽ մϴ. + /// ToolbarStandardButton 모델에 해당하는 UI GameObject를 생성합니다. + /// ToolbarView에 있는 standardButtonPrefab을 복제하여 사용합니다. /// - /// UI Ǵ ư (ToolbarButtonBase Ÿ, δ ToolbarStandardButton ֵ). - /// ư UI ڽ ߰ θ Transform üԴϴ. - /// ToolbarView νϽ. ٸ ɿ ˴ϴ. - /// ư GameObject. null ȯմϴ. + /// UI를 생성할 기반이 되는 버튼 데이터 모델 (ToolbarButtonBase 타입이지만, 실제로는 ToolbarStandardButton으로 간주됨). + /// 생성된 버튼 UI가 자식으로 추가될 부모 Transform 객체입니다. + /// 현재 ToolbarView의 인스턴스. 프리팹 참조나 다른 뷰 관련 기능에 접근할 때 사용됩니다. + /// 성공적으로 생성된 버튼의 GameObject. 프리팹이 없으면 null을 반환합니다. public GameObject CreateButtonUI(ToolbarButtonBase buttonModel, Transform parentContainer, ToolbarView viewContext) { if (viewContext.standardButtonPrefab == null) { - Debug.LogError("StandardButtonViewProcessor: standardButtonPrefab ToolbarView Ҵ ʾҽϴ.", viewContext); + Debug.LogError("StandardButtonViewProcessor: standardButtonPrefab이 ToolbarView에 할당되지 않았습니다.", viewContext); return null; } - // standardButtonPrefab Ͽ ο ư UI GameObject ϴ. - // parentContainer ڽ Ǿ ̾ƿ Ե˴ϴ. + // standardButtonPrefab을 복제하여 새로운 버튼 UI GameObject를 만듭니다. + // parentContainer의 자식으로 생성되어 툴바 레이아웃에 포함됩니다. return Object.Instantiate(viewContext.standardButtonPrefab, parentContainer); } /// - /// ǥ ư UI GameObject ʿ ȣۿ ϰ ʱ ð ¸ Ʈմϴ. - /// - UI ư Ŭ ExecuteClick ޼ ȣ - /// - ʱ ؽƮ, , Ȱȭ ¸ UI ݿ + /// 생성된 표준 버튼 UI GameObject에 필요한 상호작용을 설정하고 초기 시각적 상태를 업데이트합니다. + /// - UI 버튼 클릭 시 모델의 ExecuteClick 메서드 호출 설정 + /// - 모델의 초기 텍스트, 아이콘, 활성화 상태를 UI에 반영 /// - /// ư (ToolbarStandardButton ijϿ ). - /// ȭ鿡 ǥõ, ư UI GameObject. - /// ToolbarView νϽ. + /// 설정 대상 버튼의 데이터 모델 (ToolbarStandardButton으로 캐스팅하여 사용). + /// 화면에 표시된, 설정할 버튼의 UI GameObject. + /// 현재 ToolbarView의 인스턴스. public void SetupButtonInteractions(ToolbarButtonBase buttonModel, GameObject buttonUIObject, ToolbarView viewContext) { - // buttonModel Ÿ ToolbarStandardButton ȯմϴ. + // buttonModel을 실제 타입인 ToolbarStandardButton으로 변환합니다. ToolbarStandardButton standardModel = buttonModel as ToolbarStandardButton; if (standardModel == null) return; - // ư UI GameObject UnityEngine.UI.Button Ʈ ɴϴ. + // 버튼 UI GameObject에서 UnityEngine.UI.Button 컴포넌트를 가져옵니다. Button uiButton = buttonUIObject.GetComponent