From df9fec4cbc6cfddbe41aba2625964bb9c5271e36 Mon Sep 17 00:00:00 2001 From: davidmfinol Date: Fri, 9 Feb 2018 01:10:07 -0600 Subject: [PATCH] Release version 0.18.0 --- Assets/Editor.meta | 10 + Assets/Editor/PassThroughScrollRectEditor.cs | 24 ++ .../PassThroughScrollRectEditor.cs.meta | 13 + Assets/Prefabs/Card Game Manager.prefab | 12 + .../DeckEditor/Card Search Menu.prefab | 124 ++++----- .../Prefabs/DeckEditor/Deck Load Menu.prefab | 2 +- Assets/Prefabs/MainMenu/Lobby Menu.prefab | 2 +- Assets/Resources/Game Selection Menu.prefab | 31 ++- Assets/Scenes/DeckEditor.unity | 248 +++++++++++------- Assets/Scripts/CardGameManager.cs | 2 +- Assets/Scripts/CardIn.cs | 7 + Assets/Scripts/CardInfoViewer.cs | 11 +- Assets/Scripts/CardModel.cs | 2 +- Assets/Scripts/DeckEditor/CardSearchMenu.cs | 182 ++++++++++--- Assets/Scripts/DeckEditor/DeckEditorLayout.cs | Bin 3076 -> 4818 bytes Assets/Scripts/DeckEditor/DeckLoadMenu.cs | 1 + .../ScrollRects/PassThroughScrollRect.cs | 3 + ProjectSettings/GraphicsSettings.asset | 1 - ProjectSettings/ProjectSettings.asset | 10 +- 19 files changed, 465 insertions(+), 220 deletions(-) create mode 100644 Assets/Editor.meta create mode 100644 Assets/Editor/PassThroughScrollRectEditor.cs create mode 100644 Assets/Editor/PassThroughScrollRectEditor.cs.meta diff --git a/Assets/Editor.meta b/Assets/Editor.meta new file mode 100644 index 000000000..aa9644a5c --- /dev/null +++ b/Assets/Editor.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: cbaa68f36cee17348bee0d380c1b5858 +folderAsset: yes +timeCreated: 1518152555 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/PassThroughScrollRectEditor.cs b/Assets/Editor/PassThroughScrollRectEditor.cs new file mode 100644 index 000000000..93e0b3633 --- /dev/null +++ b/Assets/Editor/PassThroughScrollRectEditor.cs @@ -0,0 +1,24 @@ +using UnityEngine; +using UnityEditor; +using UnityEditor.UI; + +[CustomEditor(typeof(PassThroughScrollRect))] +public class ScrollRectNestedEditor : ScrollRectEditor +{ + SerializedProperty parentScrollRectProp; + GUIContent parentScrollRectGUIContent = new GUIContent("Parent ScrollRect"); + + protected override void OnEnable() + { + base.OnEnable(); + parentScrollRectProp = serializedObject.FindProperty("parentScrollRect"); + } + + public override void OnInspectorGUI() + { + base.OnInspectorGUI(); + serializedObject.Update(); + EditorGUILayout.PropertyField(parentScrollRectProp, parentScrollRectGUIContent); + serializedObject.ApplyModifiedProperties(); + } +} diff --git a/Assets/Editor/PassThroughScrollRectEditor.cs.meta b/Assets/Editor/PassThroughScrollRectEditor.cs.meta new file mode 100644 index 000000000..7b8a805a1 --- /dev/null +++ b/Assets/Editor/PassThroughScrollRectEditor.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: cac37999241eb9847bead7802ecee1f1 +timeCreated: 1518152572 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Card Game Manager.prefab b/Assets/Prefabs/Card Game Manager.prefab index 63285eb59..d73f853a2 100644 --- a/Assets/Prefabs/Card Game Manager.prefab +++ b/Assets/Prefabs/Card Game Manager.prefab @@ -21,6 +21,7 @@ GameObject: - component: {fileID: 4566502268858140} - component: {fileID: 114614180611090904} - component: {fileID: 114214761007353596} + - component: {fileID: 114208327254760074} m_Layer: 0 m_Name: Card Game Manager m_TagString: CardGameManager @@ -41,6 +42,17 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114208327254760074 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1565440365293990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3196a10ecc192d0498acb20855dfbcf4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &114214761007353596 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/DeckEditor/Card Search Menu.prefab b/Assets/Prefabs/DeckEditor/Card Search Menu.prefab index 1ac4b656b..b7e702197 100644 --- a/Assets/Prefabs/DeckEditor/Card Search Menu.prefab +++ b/Assets/Prefabs/DeckEditor/Card Search Menu.prefab @@ -105,7 +105,7 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 224455533259717526} - - component: {fileID: 114857370907840008} + - component: {fileID: 114835729657597548} m_Layer: 5 m_Name: Scroll View m_TagString: Untagged @@ -1040,6 +1040,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: nameInputField: {fileID: 114432526856898742} + idInputField: {fileID: 114583128488254470} + setCodeInputField: {fileID: 114512750675783502} propertyFiltersContent: {fileID: 224318153937612578} stringPropertyPanel: {fileID: 114569757667774452} integerPropertyPanel: {fileID: 114492265758174768} @@ -1366,7 +1368,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1374,7 +1376,7 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1} m_PressedColor: {r: 1, g: 1, b: 1, a: 1} m_DisabledColor: {r: 0.409, g: 0.409, b: 0.434, a: 0.447} m_ColorMultiplier: 1 @@ -1537,7 +1539,7 @@ MonoBehaviour: m_HandleRect: {fileID: 224682449570546798} m_Direction: 2 m_Value: 0 - m_Size: 0.99999994 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2661,7 +2663,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114126704938545522} - m_MethodName: ClearFilters + m_MethodName: PromptClearFilters m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2871,6 +2873,39 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Enter card name... +--- !u!114 &114835729657597548 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1087516799333832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c33e2368229eeaa459c196bf17c7e71d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 224559312487078428} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 30 + m_Viewport: {fileID: 224859827954773996} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + parentScrollRect: {fileID: 114565237960133700} + routeToParent: 0 --- !u!114 &114841040392389466 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2931,37 +2966,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: String Property ---- !u!114 &114857370907840008 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1087516799333832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 224559312487078428} - m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 45 - m_Viewport: {fileID: 224859827954773996} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &114865119356969238 MonoBehaviour: m_ObjectHideFlags: 1 @@ -3431,7 +3435,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1502.6975, y: -75} + m_AnchoredPosition: {x: 1501.5094, y: -75} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224051524254763044 @@ -3452,7 +3456,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -450} - m_SizeDelta: {x: 980, y: 150} + m_SizeDelta: {x: 950, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224110979428933976 RectTransform: @@ -3562,7 +3566,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: 650, y: 0} + m_AnchoredPosition: {x: 625, y: 0} m_SizeDelta: {x: 250, y: 75} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224173042166155030 @@ -3617,7 +3621,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 901.61847, y: -75} + m_AnchoredPosition: {x: 900.90564, y: -75} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224198085844350976 @@ -3660,7 +3664,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -750} - m_SizeDelta: {x: 980, y: 150} + m_SizeDelta: {x: 950, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224236657539015784 RectTransform: @@ -3678,7 +3682,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: 133.04515, y: 47.516125} + m_SizeDelta: {x: 133.11533, y: 47.54119} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224249250195301654 RectTransform: @@ -3750,7 +3754,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300.5395, y: -75} + m_AnchoredPosition: {x: 300.30188, y: -75} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224318153937612578 @@ -3771,7 +3775,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000008005919} + m_AnchoredPosition: {x: 0, y: -0.000008709343} m_SizeDelta: {x: 0, y: 450} m_Pivot: {x: 0, y: 1} --- !u!224 &224334909741877138 @@ -3793,7 +3797,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -600} - m_SizeDelta: {x: 980, y: 150} + m_SizeDelta: {x: 950, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224383818070444768 RectTransform: @@ -3848,7 +3852,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: 250, y: 0} + m_AnchoredPosition: {x: 225, y: 0} m_SizeDelta: {x: 250, y: 75} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224455533259717526 @@ -3867,8 +3871,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: 125, y: 0} - m_SizeDelta: {x: -250, y: 0} + m_AnchoredPosition: {x: 112.5, y: 0} + m_SizeDelta: {x: -225, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224457410146012908 RectTransform: @@ -3943,7 +3947,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.000031408712, y: 0} m_SizeDelta: {x: 1460, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224566002591185584 @@ -4016,7 +4020,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.99999994} + m_AnchorMax: {x: 1, y: 0.9999994} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -4037,8 +4041,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: 878.11847, y: -150} - m_SizeDelta: {x: 980, y: 150} + m_AnchoredPosition: {x: 877.4056, y: -150} + m_SizeDelta: {x: 950, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224729768024331750 RectTransform: @@ -4057,8 +4061,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: 878.11847, y: -300} - m_SizeDelta: {x: 980, y: 150} + m_AnchoredPosition: {x: 877.4056, y: -300} + m_SizeDelta: {x: 950, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224747296365312216 RectTransform: @@ -4077,7 +4081,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: 250, y: 0} + m_AnchoredPosition: {x: 225, y: 0} m_SizeDelta: {x: 650, y: 75} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224760115712263306 @@ -4097,8 +4101,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: 878.11847, y: 0} - m_SizeDelta: {x: 980, y: 150} + m_AnchoredPosition: {x: 877.4056, y: 0} + m_SizeDelta: {x: 950, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224767118729177316 RectTransform: @@ -4190,7 +4194,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: 250, y: 0} + m_AnchoredPosition: {x: 225, y: 0} m_SizeDelta: {x: 650, y: 75} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224859827954773996 @@ -4342,7 +4346,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: 250, y: 0} + m_AnchoredPosition: {x: 225, y: 0} m_SizeDelta: {x: 650, y: 75} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224972423980820094 @@ -4362,7 +4366,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: 250, y: 0} + m_AnchoredPosition: {x: 225, y: 0} m_SizeDelta: {x: 650, y: 75} m_Pivot: {x: 0, y: 0.5} --- !u!224 &224986423223172556 diff --git a/Assets/Prefabs/DeckEditor/Deck Load Menu.prefab b/Assets/Prefabs/DeckEditor/Deck Load Menu.prefab index 8b9d3e818..2c4fccd84 100644 --- a/Assets/Prefabs/DeckEditor/Deck Load Menu.prefab +++ b/Assets/Prefabs/DeckEditor/Deck Load Menu.prefab @@ -2791,7 +2791,7 @@ MonoBehaviour: 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_HighlightedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 diff --git a/Assets/Prefabs/MainMenu/Lobby Menu.prefab b/Assets/Prefabs/MainMenu/Lobby Menu.prefab index d31981154..f1e5d1585 100644 --- a/Assets/Prefabs/MainMenu/Lobby Menu.prefab +++ b/Assets/Prefabs/MainMenu/Lobby Menu.prefab @@ -512,7 +512,7 @@ MonoBehaviour: 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_HighlightedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 diff --git a/Assets/Resources/Game Selection Menu.prefab b/Assets/Resources/Game Selection Menu.prefab index 647f8aa5f..34a42efbf 100644 --- a/Assets/Resources/Game Selection Menu.prefab +++ b/Assets/Resources/Game Selection Menu.prefab @@ -1378,7 +1378,6 @@ MonoBehaviour: urlInput: {fileID: 114657005557505868} cancelButton: {fileID: 114663664709839382} downloadButton: {fileID: 114872100714644854} - deleteButton: {fileID: 114159646184659914} --- !u!114 &114449633991390616 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1451,7 +1450,7 @@ MonoBehaviour: m_HandleRect: {fileID: 224627027903471596} m_Direction: 2 m_Value: 0 - m_Size: 0.9999997 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1795,7 +1794,7 @@ MonoBehaviour: 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_HighlightedColor: {r: 0.38875425, g: 0.28925174, b: 0.78676474, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 @@ -2513,7 +2512,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1201.7861, y: -75} + m_AnchoredPosition: {x: 1351.3584, y: -75} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224205767111189000 @@ -2679,11 +2678,11 @@ RectTransform: m_Children: - {fileID: 224902995897543960} m_Father: {fileID: 224620449700565398} - m_RootOrder: 3 + m_RootOrder: 2 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: 150, y: 150} + m_AnchoredPosition: {x: -150, y: 150} m_SizeDelta: {x: 160, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224434210310463488 @@ -2698,11 +2697,11 @@ RectTransform: m_Children: - {fileID: 224056285341046372} m_Father: {fileID: 224620449700565398} - m_RootOrder: 2 + m_RootOrder: 3 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: -150, y: 150} + m_AnchoredPosition: {x: 150, y: 150} m_SizeDelta: {x: 160, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224442466893439156 @@ -2743,7 +2742,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 676.21387, y: -150} + m_AnchoredPosition: {x: 675.6792, y: -150} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0} --- !u!224 &224538275318263948 @@ -2796,8 +2795,8 @@ RectTransform: m_Children: - {fileID: 224923869356156796} - {fileID: 224055463880623310} - - {fileID: 224434210310463488} - {fileID: 224434181771594732} + - {fileID: 224434210310463488} - {fileID: 224705495831368044} m_Father: {fileID: 224442466893439156} m_RootOrder: 3 @@ -2821,7 +2820,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.9999993} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -2859,7 +2858,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 400.5954, y: -75} + m_AnchoredPosition: {x: 450.4528, y: -75} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224705495831368044 @@ -2934,7 +2933,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1127.0231, y: -150} + m_AnchoredPosition: {x: 1126.132, y: -150} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0} --- !u!224 &224859769213183740 @@ -2952,7 +2951,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000009761517} + m_AnchoredPosition: {x: 0, y: -0.000021019574} m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 1} --- !u!224 &224885025437741184 @@ -2971,7 +2970,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1677.8324, y: -150} + m_AnchoredPosition: {x: 1676.5848, y: -150} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 1, y: 0} --- !u!224 &224885441671494252 @@ -3101,6 +3100,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 125.40462, y: -150} + m_AnchoredPosition: {x: 125.226395, y: -150} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0, y: 0} diff --git a/Assets/Scenes/DeckEditor.unity b/Assets/Scenes/DeckEditor.unity index f96200e71..32b13210b 100644 --- a/Assets/Scenes/DeckEditor.unity +++ b/Assets/Scenes/DeckEditor.unity @@ -321,16 +321,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1516954977} - {fileID: 205390414} - - {fileID: 211486271} - {fileID: 1460975682} + - {fileID: 2061901252} - {fileID: 586658829} - {fileID: 1644094389} - {fileID: 446946375} - {fileID: 1956326055} - {fileID: 1315809170} - - {fileID: 2061901252} - - {fileID: 760113309} + - {fileID: 1599741431} + - {fileID: 211486271} - {fileID: 1291215082} - {fileID: 1073676899} - {fileID: 2037950163} @@ -431,7 +432,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 437914881} - m_Father: {fileID: 760113309} + m_Father: {fileID: 1599741431} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} @@ -654,7 +655,7 @@ Prefab: - target: {fileID: 224134245546147898, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.x - value: -58.703217 + value: -58.25879 objectReference: {fileID: 0} - target: {fileID: 224844730852030870, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} @@ -669,17 +670,17 @@ Prefab: - target: {fileID: 224844730852030870, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_AnchoredPosition.y - value: -69.67943 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224844730852030870, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.x - value: 480.8632 + value: 480.483 objectReference: {fileID: 0} - target: {fileID: 224844730852030870, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.y - value: 139.35886 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224494150876344956, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} @@ -694,22 +695,22 @@ Prefab: - target: {fileID: 224494150876344956, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_AnchoredPosition.x - value: 480.8632 + value: 480.483 objectReference: {fileID: 0} - target: {fileID: 224494150876344956, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_AnchoredPosition.y - value: -69.67943 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224494150876344956, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.x - value: 480.8632 + value: 480.483 objectReference: {fileID: 0} - target: {fileID: 224494150876344956, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.y - value: 139.35886 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224409994527677996, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} @@ -724,37 +725,52 @@ Prefab: - target: {fileID: 224409994527677996, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_AnchoredPosition.x - value: 961.7264 + value: 960.966 objectReference: {fileID: 0} - target: {fileID: 224409994527677996, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_AnchoredPosition.y - value: -69.67943 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224409994527677996, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.x - value: 480.8632 + value: 480.483 objectReference: {fileID: 0} - target: {fileID: 224409994527677996, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.y - value: 139.35886 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224461052092812746, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.y - value: -53.954227 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224695748224604718, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.y - value: -89.35886 + value: 0 objectReference: {fileID: 0} - target: {fileID: 224162416682328514, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} propertyPath: m_SizeDelta.y - value: -89.35886 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224695748224604718, guid: 04f1873b7f6a8324887109e8e76da3d7, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0.000013848702 + objectReference: {fileID: 0} + - target: {fileID: 224162416682328514, guid: 04f1873b7f6a8324887109e8e76da3d7, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 0.000013848702 + objectReference: {fileID: 0} + - target: {fileID: 224461052092812746, guid: 04f1873b7f6a8324887109e8e76da3d7, + type: 2} + propertyPath: m_AnchoredPosition.y + value: 50.77259 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 04f1873b7f6a8324887109e8e76da3d7, type: 2} @@ -872,7 +888,7 @@ RectTransform: 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.000081739985, y: 0} + m_AnchoredPosition: {x: -0.00011493606, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &179835150 @@ -965,7 +981,7 @@ RectTransform: 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.000050034632, y: 0} + m_AnchoredPosition: {x: 0.000015258789, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &196520020 @@ -1055,7 +1071,7 @@ RectTransform: m_Children: - {fileID: 2069437} m_Father: {fileID: 62766702} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1163,7 +1179,7 @@ GameObject: - component: {fileID: 211486273} - component: {fileID: 211486272} m_Layer: 5 - m_Name: Filter Button + m_Name: Search Filter Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1182,13 +1198,13 @@ RectTransform: m_Children: - {fileID: 977496616} m_Father: {fileID: 62766702} - m_RootOrder: 1 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 187.5, y: 0} - m_SizeDelta: {x: 150, y: 87.5} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -675, y: 375.00003} + m_SizeDelta: {x: 160, y: 87.5} + m_Pivot: {x: 1, y: 0} --- !u!114 &211486272 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1309,7 +1325,7 @@ RectTransform: m_Children: - {fileID: 1885726307} m_Father: {fileID: 62766702} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1436,7 +1452,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1120692483} - m_Father: {fileID: 760113309} + m_Father: {fileID: 1599741431} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -1940,7 +1956,7 @@ RectTransform: - {fileID: 1581076311} - {fileID: 1141354601} m_Father: {fileID: 62766702} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2277,7 +2293,7 @@ RectTransform: m_Children: - {fileID: 1434746453} m_Father: {fileID: 62766702} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2512,41 +2528,6 @@ MonoBehaviour: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 ---- !u!1 &760113308 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 760113309} - m_Layer: 5 - m_Name: Results Selector Buttons Group - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &760113309 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 760113308} - 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_Children: - - {fileID: 267393137} - - {fileID: 64640898} - m_Father: {fileID: 62766702} - m_RootOrder: 9 - 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: 100, y: 375} - m_SizeDelta: {x: 160, y: 87.5} - m_Pivot: {x: 0.5, y: 0} --- !u!1 &763821994 GameObject: m_ObjectHideFlags: 0 @@ -2751,7 +2732,7 @@ RectTransform: 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.00012450758, y: 0} + m_AnchoredPosition: {x: -0.000030517578, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &796070842 @@ -2876,7 +2857,7 @@ RectTransform: 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.000043414107, y: 0} + m_AnchoredPosition: {x: -0.00011493606, y: 0} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &836546758 @@ -3229,8 +3210,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 335690431} m_HandleRect: {fileID: 335690429} m_Direction: 0 - m_Value: 0.0000036410772 - m_Size: 0.9907896 + m_Value: 0 + m_Size: 0.9900062 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -3324,7 +3305,7 @@ RectTransform: m_Children: - {fileID: 2131642175} m_Father: {fileID: 62766702} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3944,7 +3925,7 @@ RectTransform: m_Children: - {fileID: 1103951962} m_Father: {fileID: 62766702} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4048,7 +4029,7 @@ RectTransform: - {fileID: 640063689} - {fileID: 1712701547} m_Father: {fileID: 62766702} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4178,9 +4159,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 350, y: -43.75} + m_AnchoredPosition: {x: 187.5, y: 0} m_SizeDelta: {x: 150, y: 87.5} - m_Pivot: {x: 0, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &1460975683 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4409,6 +4390,58 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ignoreDeselect: 0 +--- !u!1 &1516954976 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1516954977} + - component: {fileID: 1516954978} + m_Layer: 5 + m_Name: DeckEditor Layout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1516954977 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1516954976} + 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_Children: [] + m_Father: {fileID: 62766702} + m_RootOrder: 0 + 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!114 &1516954978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1516954976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b227be9232b9f9b4088e4ffb88147fcc, type: 3} + m_Name: + m_EditorClassIdentifier: + sortButton: {fileID: 1460975682} + deckSelectorButtons: {fileID: 2061901252} + deckButtons: {fileID: 446946375} + deckEditorLayout: {fileID: 1956326055} + selectorButtons: {fileID: 1599741431} + searchName: {fileID: 1315809170} + searchResults: {fileID: 62766703} --- !u!1 &1581076310 GameObject: m_ObjectHideFlags: 0 @@ -4536,6 +4569,41 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1581076310} +--- !u!1 &1599741430 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1599741431} + m_Layer: 5 + m_Name: Search Selector Buttons Group + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1599741431 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1599741430} + 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_Children: + - {fileID: 267393137} + - {fileID: 64640898} + m_Father: {fileID: 62766702} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 675, y: 367.5} + m_SizeDelta: {x: 160, y: 87.5} + m_Pivot: {x: 0, y: 0} --- !u!1 &1644094388 GameObject: m_ObjectHideFlags: 0 @@ -4568,7 +4636,7 @@ RectTransform: m_Children: - {fileID: 470349678} m_Father: {fileID: 62766702} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4754,11 +4822,11 @@ RectTransform: m_Father: {fileID: 1315809170} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430, y: 0} m_SizeDelta: {x: 190, y: 0} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1712701548 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5216,7 +5284,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 62766702} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -5318,7 +5386,7 @@ RectTransform: - {fileID: 375741845} - {fileID: 1015008766} m_Father: {fileID: 62766702} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.4125} m_AnchorMax: {x: 1, y: 1} @@ -5590,7 +5658,7 @@ RectTransform: m_Children: - {fileID: 763821995} m_Father: {fileID: 62766702} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5713,13 +5781,13 @@ RectTransform: - {fileID: 1881430988} - {fileID: 1483459132} m_Father: {fileID: 62766702} - m_RootOrder: 8 + m_RootOrder: 3 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: -100, y: 375.00003} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 365, y: 0} m_SizeDelta: {x: 160, y: 87.5} - m_Pivot: {x: 0.5, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!1 &2126943657 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CardGameManager.cs b/Assets/Scripts/CardGameManager.cs index e59492ce0..073847596 100644 --- a/Assets/Scripts/CardGameManager.cs +++ b/Assets/Scripts/CardGameManager.cs @@ -25,7 +25,7 @@ public class CardGameManager : MonoBehaviour public static string GamesFilePathBase => Application.persistentDataPath + "/games"; public static string CurrentGameName { get; private set; } = Set.DefaultCode; - + public static bool IsMultiplayer { get; set; } public static bool IsQuitting { get; private set; } diff --git a/Assets/Scripts/CardIn.cs b/Assets/Scripts/CardIn.cs index 3d4fb3c70..a8be80a15 100644 --- a/Assets/Scripts/CardIn.cs +++ b/Assets/Scripts/CardIn.cs @@ -17,4 +17,11 @@ public static class CardIn public const string SortInput = "Sort"; public const string SubmitInput = "Submit"; public const string VerticalInput = "Vertical"; + + public static char FilterFocusNameInput(char charToValidate) + { + if (charToValidate == '`') + charToValidate = '\0'; + return charToValidate; + } } diff --git a/Assets/Scripts/CardInfoViewer.cs b/Assets/Scripts/CardInfoViewer.cs index 91ca6e770..8a5a7c414 100644 --- a/Assets/Scripts/CardInfoViewer.cs +++ b/Assets/Scripts/CardInfoViewer.cs @@ -38,7 +38,7 @@ void Update() new Vector2(infoPanel.anchorMax.x, Mathf.Lerp(infoPanel.anchorMax.y, VisibleYMax, AnimationSpeed * Time.deltaTime)) : new Vector2(infoPanel.anchorMax.x, Mathf.Lerp(infoPanel.anchorMax.y, HiddenYMax, AnimationSpeed * Time.deltaTime)); } - + void LateUpdate() { if (!IsVisible || SelectedCardModel == null || !Input.anyKeyDown || CardGameManager.TopMenuCanvas != null) @@ -87,7 +87,7 @@ public void IncrementProperty() public void SetContentText() { if (SelectedCardModel != null) - contentText.text = SelectedPropertyIndex != 0 ? + contentText.text = SelectedPropertyIndex != 0 ? SelectedCardModel.Value.GetPropertyValueString(SelectedPropertyName) : CardGameManager.Current.Sets [SelectedCardModel.Value.SetCode].ToString(); else @@ -180,10 +180,13 @@ public bool IsVisible { if (!_isVisible && zoomPanel != null) zoomPanel.gameObject.SetActive(false); + if (SelectedCardModel == null) + return; + if (_isVisible) - SelectedCardModel?.ShowHighlight(); + SelectedCardModel.ShowHighlight(); else - SelectedCardModel?.HideHighlight(); + SelectedCardModel.HideHighlight(); } } public bool WasVisible => infoPanel.anchorMax.y < (HiddenYMax + VisibleYMax) / 2.0f; diff --git a/Assets/Scripts/CardModel.cs b/Assets/Scripts/CardModel.cs index 22d726e12..cbde6a418 100644 --- a/Assets/Scripts/CardModel.cs +++ b/Assets/Scripts/CardModel.cs @@ -21,7 +21,7 @@ public class CardModel : NetworkBehaviour, IPointerDownHandler, IPointerUpHandle { public const float MovementSpeed = 600f; public const float AlphaHitTestMinimumThreshold = 0.1f; - public static readonly Color SelectedHighlightColor = new Color(0, 140, 255); + public static readonly Color SelectedHighlightColor = new Color(0.39f, 0.29f, 0.79f); public static readonly Vector2 OutlineHighlightDistance = new Vector2(10, 10); public bool IsOnline => NetworkManager.singleton != null && NetworkManager.singleton.isNetworkActive diff --git a/Assets/Scripts/DeckEditor/CardSearchMenu.cs b/Assets/Scripts/DeckEditor/CardSearchMenu.cs index 00e852803..ca9d58645 100644 --- a/Assets/Scripts/DeckEditor/CardSearchMenu.cs +++ b/Assets/Scripts/DeckEditor/CardSearchMenu.cs @@ -10,42 +10,11 @@ public class CardSearchMenu : MonoBehaviour { public const string ClearFiltersPrompt = "Clear Filters?"; - - public string Filters { - get { string filters = string.Empty; - if (!string.IsNullOrEmpty(IdFilter)) - filters += "id:" + IdFilter + "; "; - if (!string.IsNullOrEmpty(SetCodeFilter)) - filters += "set:" + SetCodeFilter + "; "; - foreach (PropertyDef property in CardGameManager.Current.CardProperties) { - switch (property.Type) { - case PropertyType.Integer: - if (IntMinPropertyFilters.ContainsKey(property.Name)) - filters += property.Name + ">=" + IntMinPropertyFilters[property.Name] + "; "; - if (IntMaxPropertyFilters.ContainsKey(property.Name)) - filters += property.Name + "<=" + IntMaxPropertyFilters[property.Name] + "; "; - break; - case PropertyType.Enum: - case PropertyType.EnumList: - if (!EnumPropertyFilters.ContainsKey(property.Name)) - break; - EnumDef enumDef = CardGameManager.Current.Enums.FirstOrDefault(def => def.Property.Equals(property.Name)); - if (enumDef != null) - filters += property.Name + ":=" + EnumPropertyFilters[property.Name] + "; "; - break; - case PropertyType.String: - default: - if (StringPropertyFilters.ContainsKey(property.Name)) - filters += property.Name + ":" + StringPropertyFilters[property.Name] + "; "; - break; - } - } - return filters; - } - } public float PropertyPanelHeight => ((RectTransform)stringPropertyPanel.transform).rect.height; public InputField nameInputField; + public InputField idInputField; + public InputField setCodeInputField; public RectTransform propertyFiltersContent; public SearchPropertyPanel stringPropertyPanel; public SearchPropertyPanel integerPropertyPanel; @@ -57,10 +26,8 @@ public string Filters { public List FilterPanels { get; } = new List(); public List InputFields { get; } = new List(); - public InputField ActiveInputField { get; private set; } = null; public List Toggles { get; } = new List(); - public Toggle ActiveToggle { get; private set; } = null; - + public Dictionary StringPropertyFilters { get; } = new Dictionary(); public Dictionary IntMinPropertyFilters { get; } = new Dictionary(); public Dictionary IntMaxPropertyFilters { get; } = new Dictionary(); @@ -94,12 +61,88 @@ void LateUpdate() public void FocusInputField() { + if (ActiveInputField == null || InputFields.Count < 1) { + InputFields.FirstOrDefault()?.ActivateInputField(); + ActiveInputField = InputFields.FirstOrDefault(); + return; + } + + if (Input.GetButtonDown(CardIn.FocusNameInput)) { // up + InputField previous = InputFields.Last(); + for (int i = 0; i < InputFields.Count; i++) { + if (ActiveInputField == InputFields[i]) { + previous.ActivateInputField(); + ActiveInputField = previous; + break; + } + previous = InputFields[i]; + } + } else { // down + InputField next = InputFields.First(); + for (int i = InputFields.Count - 1; i >= 0; i--) { + if (ActiveInputField == InputFields[i]) { + next.ActivateInputField(); + ActiveInputField = next; + break; + } + next = InputFields[i]; + } + } } - + public void FocusToggle() { + if (ActiveToggle == null || Toggles.Count < 1) { + ActiveToggle = Toggles.FirstOrDefault(); + return; + } + + if (Input.GetButtonDown(CardIn.VerticalInput)) { + Transform currentPanel = ActiveToggle.transform.parent; + if (Input.GetAxis(CardIn.VerticalInput) > 0) { // up + Toggle previous = Toggles.Last(); + for (int i = 0; i < Toggles.Count; i++) { + if (ActiveToggle == Toggles[i]) { + ActiveToggle = previous; + break; + } + if (Toggles[i].transform.parent != ActiveToggle.transform.parent) + previous = Toggles[i]; + } + } else { // down + Toggle next = Toggles.First(); + for (int i = Toggles.Count - 1; i >= 0; i--) { + if (ActiveToggle == Toggles[i]) { + ActiveToggle = next; + break; + } + if (Toggles[i].transform.parent != ActiveToggle.transform.parent) + next = Toggles[i]; + } + } + } else if (Input.GetButton(CardIn.HorizontalInput)) { + if (Input.GetAxis(CardIn.HorizontalInput) > 0) { // right + Toggle next = Toggles.First(); + for (int i = Toggles.Count - 1; i >= 0; i--) { + if (ActiveToggle == Toggles[i]) { + ActiveToggle = next; + break; + } + next = Toggles[i]; + } + } else { // left + Toggle previous = Toggles.Last(); + for (int i = 0; i < Toggles.Count; i++) { + if (ActiveToggle == Toggles[i]) { + ActiveToggle = previous; + break; + } + previous = Toggles[i]; + } + } + } } - + public void ToggleEnum() { if (ActiveToggle == null) @@ -125,6 +168,13 @@ public void Show(OnDeckNameChangeDelegate nameChangeCallback, OnFilterChangeDele InputFields.Clear(); Toggles.Clear(); + nameInputField.onValidateInput += delegate (string input, int charIndex, char addedChar) { return CardIn.FilterFocusNameInput(addedChar); }; + InputFields.Add(nameInputField); + idInputField.onValidateInput += delegate (string input, int charIndex, char addedChar) { return CardIn.FilterFocusNameInput(addedChar); }; + InputFields.Add(idInputField); + setCodeInputField.onValidateInput += delegate (string input, int charIndex, char addedChar) { return CardIn.FilterFocusNameInput(addedChar); }; + InputFields.Add(setCodeInputField); + propertyFiltersContent.sizeDelta = new Vector2(propertyFiltersContent.sizeDelta.x, PropertyPanelHeight * CardGameManager.Current.CardProperties.Count + (PropertyPanelHeight * 3)); foreach (PropertyDef property in CardGameManager.Current.CardProperties) { GameObject newPanel; @@ -135,8 +185,10 @@ public void Show(OnDeckNameChangeDelegate nameChangeCallback, OnFilterChangeDele else //if (property.Type == PropertyType.String) newPanel = CreateStringPropertyFilterPanel(property.Name); FilterPanels.Add(newPanel); - foreach(InputField inputField in newPanel.GetComponentsInChildren()) + foreach(InputField inputField in newPanel.GetComponentsInChildren()) { + inputField.onValidateInput += delegate (string input, int charIndex, char addedChar) { return CardIn.FilterFocusNameInput(addedChar); }; InputFields.Add(inputField); + } foreach(Toggle toggle in newPanel.GetComponentsInChildren()) Toggles.Add(toggle); } @@ -281,7 +333,7 @@ public void SetEnumPropertyFilter(string propertyName, int filterValue, bool isO EnumPropertyFilters [propertyName] = newFilter; FilterChangeCallback?.Invoke(Filters); } - + public void PromptClearFilters() { CardGameManager.Instance.Messenger.Prompt(ClearFiltersPrompt, ClearFilters); @@ -322,6 +374,41 @@ public void Hide() gameObject.SetActive(false); } + public string Filters + { + get { + string filters = string.Empty; + if (!string.IsNullOrEmpty(IdFilter)) + filters += "id:" + IdFilter + "; "; + if (!string.IsNullOrEmpty(SetCodeFilter)) + filters += "set:" + SetCodeFilter + "; "; + foreach (PropertyDef property in CardGameManager.Current.CardProperties) { + switch (property.Type) { + case PropertyType.Integer: + if (IntMinPropertyFilters.ContainsKey(property.Name)) + filters += property.Name + ">=" + IntMinPropertyFilters[property.Name] + "; "; + if (IntMaxPropertyFilters.ContainsKey(property.Name)) + filters += property.Name + "<=" + IntMaxPropertyFilters[property.Name] + "; "; + break; + case PropertyType.Enum: + case PropertyType.EnumList: + if (!EnumPropertyFilters.ContainsKey(property.Name)) + break; + EnumDef enumDef = CardGameManager.Current.Enums.FirstOrDefault(def => def.Property.Equals(property.Name)); + if (enumDef != null) + filters += property.Name + ":=" + EnumPropertyFilters[property.Name] + "; "; + break; + case PropertyType.String: + default: + if (StringPropertyFilters.ContainsKey(property.Name)) + filters += property.Name + ":" + StringPropertyFilters[property.Name] + "; "; + break; + } + } + return filters; + } + } + public string NameFilter { get { return _nameFilter ?? (_nameFilter = string.Empty); } set { @@ -347,4 +434,19 @@ public string SetCodeFilter { FilterChangeCallback?.Invoke(Filters); } } + public InputField ActiveInputField { + get { return EventSystem.current.currentSelectedGameObject?.GetComponent(); } + set { + if (!EventSystem.current.alreadySelecting) + EventSystem.current.SetSelectedGameObject(value.gameObject); + } + } + + public Toggle ActiveToggle { + get { return EventSystem.current.currentSelectedGameObject?.GetComponent(); } + set { + if (!EventSystem.current.alreadySelecting) + EventSystem.current.SetSelectedGameObject(value.gameObject); + } + } } diff --git a/Assets/Scripts/DeckEditor/DeckEditorLayout.cs b/Assets/Scripts/DeckEditor/DeckEditorLayout.cs index 6bddcd6104fe832c99da3d25e569b824a6d375dc..bf11c31fc9642d80d56a56eaaf3eb9cc4aae82bf 100644 GIT binary patch delta 572 zcmZpXxTHGa3cDeLB@m`fwr7!^xIjWXm?4!R2Z)myN*MAPiWtHfG8s~U>pkbT0I0o_MvK8$mGmx0kaRJX|gR-;A9PEvB@@!5kTvrCVyab znry{`3+}~tS-<}oc^0^$`m{K2&)v(WCvD| zDW;QOGU-qLz#=!ff+b*b9Batr11vs3%rVhNVzL8^#pFY*W)_ZhV9=bL$RWOY1E&ciI2`&oW|_&ufyr6|N|QhEvP}*E%6(vA z0n6pG>rd8W5}5poS!{9*qt9d~Hn+)Vm{frJO}Nt-G8u9hN*GcZiYD)8cb>e1J!rBQ zH{WDA&Xmc094eE!I70Y~fU?C5rC@c%48fBbIn5_GaaOTrGNdsmOtxnWoxG1