diff --git a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml index ec265876b..39176016e 100644 --- a/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml +++ b/.idea/.idea.Aetheria-Economy/.idea/contentModel.xml @@ -1753,12 +1753,14 @@ + + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 4f4d9adb3..c0ac61422 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -874,12 +874,14 @@ + + diff --git a/Assets/Prefabs/Context Menu Option.prefab b/Assets/Prefabs/Context Menu Option.prefab index 7d8646be3..20999aefc 100644 --- a/Assets/Prefabs/Context Menu Option.prefab +++ b/Assets/Prefabs/Context Menu Option.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4271092340480064605 +--- !u!1 &2147126713262799487 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,30 +8,33 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4271092340480064602} - - component: {fileID: 4271092340480064598} - - component: {fileID: 4271092340480064601} - - component: {fileID: 4271092340480064600} - - component: {fileID: 4271092340480064603} + - component: {fileID: 2147126713262799480} + - component: {fileID: 2147126713262799476} + - component: {fileID: 2147126713262799483} + - component: {fileID: 2147126713262799482} + - component: {fileID: 2147126713262799481} + - component: {fileID: 3523328438153607920} + - component: {fileID: 1963641399357161325} m_Layer: 5 - m_Name: Button 1 + m_Name: Context Menu Option m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4271092340480064602 +--- !u!224 &2147126713262799480 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092340480064605} + m_GameObject: {fileID: 2147126713262799487} 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: 4271092341023254464} + - {fileID: 2147126713793274338} + - {fileID: 1944744018361081348} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -40,21 +43,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4271092340480064598 +--- !u!222 &2147126713262799476 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092340480064605} + m_GameObject: {fileID: 2147126713262799487} m_CullTransparentMesh: 0 ---- !u!114 &4271092340480064601 +--- !u!114 &2147126713262799483 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092340480064605} + m_GameObject: {fileID: 2147126713262799487} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -75,13 +78,13 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &4271092340480064600 +--- !u!114 &2147126713262799482 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092340480064605} + m_GameObject: {fileID: 2147126713262799487} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -111,17 +114,17 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 4271092340480064601} + m_TargetGraphic: {fileID: 2147126713262799483} m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &4271092340480064603 +--- !u!114 &2147126713262799481 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092340480064605} + m_GameObject: {fileID: 2147126713262799487} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -135,7 +138,35 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &4271092341023254467 +--- !u!114 &3523328438153607920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147126713262799487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 741dca7ca8716dd438516c4f8bafd441, type: 3} + m_Name: + m_EditorClassIdentifier: + Label: {fileID: 2147126713793274364} + Arrow: {fileID: 1628239746935905733} + Button: {fileID: 2147126713262799482} + Hover: {fileID: 1963641399357161325} +--- !u!114 &1963641399357161325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147126713262799487} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6435d6126b6f8694292cb94466cf1df4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2147126713793274337 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -143,10 +174,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4271092341023254464} - - component: {fileID: 4271092341023254495} - - component: {fileID: 4271092341023254494} - - component: {fileID: 4271092341023254465} + - component: {fileID: 2147126713793274338} + - component: {fileID: 2147126713793274365} + - component: {fileID: 2147126713793274364} + - component: {fileID: 2147126713793274339} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -154,18 +185,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4271092341023254464 +--- !u!224 &2147126713793274338 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092341023254467} + m_GameObject: {fileID: 2147126713793274337} 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: 4271092340480064602} + m_Father: {fileID: 2147126713262799480} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -173,21 +204,21 @@ RectTransform: m_AnchoredPosition: {x: 4, y: 0} m_SizeDelta: {x: -24, y: -8} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4271092341023254495 +--- !u!222 &2147126713793274365 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092341023254467} + m_GameObject: {fileID: 2147126713793274337} m_CullTransparentMesh: 0 ---- !u!114 &4271092341023254494 +--- !u!114 &2147126713793274364 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092341023254467} + m_GameObject: {fileID: 2147126713793274337} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -268,7 +299,7 @@ MonoBehaviour: m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: - textComponent: {fileID: 4271092341023254494} + textComponent: {fileID: 2147126713793274364} characterCount: 14 spriteCount: 0 spaceCount: 1 @@ -292,13 +323,13 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &4271092341023254465 +--- !u!114 &2147126713793274339 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4271092341023254467} + m_GameObject: {fileID: 2147126713793274337} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -312,3 +343,75 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &7016173882347324599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1944744018361081348} + - component: {fileID: 1986380382041583511} + - component: {fileID: 1628239746935905733} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1944744018361081348 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016173882347324599} + 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: 2147126713262799480} + 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: -2, y: 0} + m_SizeDelta: {x: 24, y: -8} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &1986380382041583511 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016173882347324599} + m_CullTransparentMesh: 0 +--- !u!114 &1628239746935905733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016173882347324599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ef87bbaa6e6f6824fa1b758cc93393d5, 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 diff --git a/Assets/Prefabs/Context Menu.prefab b/Assets/Prefabs/Context Menu.prefab new file mode 100644 index 000000000..a8d17132e --- /dev/null +++ b/Assets/Prefabs/Context Menu.prefab @@ -0,0 +1,364 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3452408986865468161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3452408986865468174} + - component: {fileID: 3452408986865468172} + - component: {fileID: 3452408986865468175} + - component: {fileID: 3452408986865468173} + m_Layer: 5 + m_Name: Context Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3452408986865468174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408986865468161} + 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: 3452408988660256314} + - {fileID: 3452408986885472817} + - {fileID: 3452408987762814048} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -35.87} + m_SizeDelta: {x: 250, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3452408986865468172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408986865468161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &3452408986865468175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408986865468161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 2 + m_Right: 2 + m_Top: 2 + m_Bottom: 2 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &3452408986865468173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408986865468161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f50aaf220f9a82a4a817fa3164bcd62b, type: 3} + m_Name: + m_EditorClassIdentifier: + Canvas: {fileID: 0} + Root: {fileID: 0} + CancelClickCatcher: {fileID: 0} + OptionPrefab: {fileID: 3523328438153607920, guid: 8cabdd9c2f8e4be45b917debb4762707, + type: 3} + DropMenuPrefab: {fileID: 3452408986865468173} + IsDropdown: 0 + ForceDirectionRight: 0 + ForcePosition: {x: 0, y: 0, z: 0} + ContentRoot: {fileID: 3452408986885472817} + OptionHeight: 34 + PaddingHeight: 16 +--- !u!1 &3452408986885472816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3452408986885472817} + - component: {fileID: 3452408986885472831} + - component: {fileID: 3452408986885472830} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3452408986885472817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408986885472816} + 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: 3452408986865468174} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3452408986885472831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408986885472816} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 3 + m_Bottom: 3 + m_ChildAlignment: 0 + m_Spacing: 1 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &3452408986885472830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408986885472816} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 1 +--- !u!1 &3452408987762814051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3452408987762814048} + - component: {fileID: 3452408987762814063} + - component: {fileID: 3452408987762814062} + - component: {fileID: 3452408987762814049} + m_Layer: 5 + m_Name: Outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3452408987762814048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408987762814051} + 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: 3452408986865468174} + m_RootOrder: 2 + 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 &3452408987762814063 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408987762814051} + m_CullTransparentMesh: 0 +--- !u!114 &3452408987762814062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408987762814051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f86ca8785ddc5524d9f125ad626ffcf8, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3452408987762814049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408987762814051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &3452408988660256317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3452408988660256314} + - component: {fileID: 3452408988660256313} + - component: {fileID: 3452408988660256312} + - component: {fileID: 3452408988660256315} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3452408988660256314 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408988660256317} + 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: 3452408986865468174} + 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!222 &3452408988660256313 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408988660256317} + m_CullTransparentMesh: 0 +--- !u!114 &3452408988660256312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408988660256317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0.041666675, b: 0.1, a: 0.79607844} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d43f9691259ed984fa09c853c5cda7f0, 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 +--- !u!114 &3452408988660256315 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3452408988660256317} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 diff --git a/Assets/Prefabs/Context Menu.prefab.meta b/Assets/Prefabs/Context Menu.prefab.meta new file mode 100644 index 000000000..b2b17ad34 --- /dev/null +++ b/Assets/Prefabs/Context Menu.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 75d78a753ab7e4e41995db4f59fd74b7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Icons/rightArrow.png b/Assets/Resources/Sprites/Icons/rightArrow.png new file mode 100644 index 000000000..29b99f3da --- /dev/null +++ b/Assets/Resources/Sprites/Icons/rightArrow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98b1c0d0375cc527e89ed65997f4630a7ad7125aa25486636ec7de56bbd686a3 +size 6107 diff --git a/Assets/Resources/Sprites/Icons/rightArrow.png.meta b/Assets/Resources/Sprites/Icons/rightArrow.png.meta new file mode 100644 index 000000000..dec6cf18a --- /dev/null +++ b/Assets/Resources/Sprites/Icons/rightArrow.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ef87bbaa6e6f6824fa1b758cc93393d5 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 29e18919e5ea9284a9e1964ab5ce7934 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 8ac18bc62..41d150c3b 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -112,6 +112,92 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &24242564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 24242568} + - component: {fileID: 24242565} + - component: {fileID: 24242567} + - component: {fileID: 24242566} + m_Layer: 5 + m_Name: Context Menu Cancel + m_TagString: UIBackground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &24242565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24242564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20fa7724865c6b04097615292a325dfe, type: 3} + m_Name: + m_EditorClassIdentifier: + DragDistance: 25 +--- !u!114 &24242566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24242564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 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 +--- !u!222 &24242567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24242564} + m_CullTransparentMesh: 0 +--- !u!224 &24242568 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24242564} + 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: 784574043} + m_RootOrder: 3 + 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!1001 &24711095 PrefabInstance: m_ObjectHideFlags: 0 @@ -122,32 +208,32 @@ PrefabInstance: - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 83.65 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 167.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3856099931455214244, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -247,22 +333,22 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 1205.2351 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -34 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 167.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -272,7 +358,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -282,7 +368,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -307,57 +393,57 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 103.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 83.65 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 167.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4377430353563539876, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -442,7 +528,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 26245407} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Name: @@ -514,7 +600,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43948816} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Name: @@ -778,7 +864,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105783974} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Name: @@ -3268,7 +3354,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 426675034} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Name: @@ -5105,32 +5191,32 @@ PrefabInstance: - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 78.765 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 157.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3856099931455214244, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -5235,22 +5321,22 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 879.30005 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -34 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 157.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -5260,7 +5346,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -5270,7 +5356,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -5295,57 +5381,57 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 93.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 78.765 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 157.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4377430353563539876, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -6044,32 +6130,32 @@ PrefabInstance: - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 80.130005 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 160.26001 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3856099931455214244, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -6169,22 +6255,22 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 720.405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -34 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 160.26001 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -6194,7 +6280,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -6204,7 +6290,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -6229,57 +6315,57 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 96.26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 80.130005 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 160.26001 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4377430353563539876, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -6430,7 +6516,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 650897773} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Name: @@ -7416,7 +7502,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &784574043 RectTransform: m_ObjectHideFlags: 0 @@ -7431,6 +7517,7 @@ RectTransform: - {fileID: 143833100} - {fileID: 1723832127} - {fileID: 1059548285} + - {fileID: 24242568} - {fileID: 831625848} m_Father: {fileID: 323746067} m_RootOrder: 2 @@ -7872,7 +7959,7 @@ RectTransform: - {fileID: 843504455} - {fileID: 1713239318} m_Father: {fileID: 784574043} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7929,8 +8016,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Canvas: {fileID: 323746066} - OptionPrefab: {fileID: 4271092340480064602, guid: 8cabdd9c2f8e4be45b917debb4762707, + Root: {fileID: 784574043} + CancelClickCatcher: {fileID: 24242565} + OptionPrefab: {fileID: 3523328438153607920, guid: 8cabdd9c2f8e4be45b917debb4762707, type: 3} + DropMenuPrefab: {fileID: 3452408986865468173, guid: 75d78a753ab7e4e41995db4f59fd74b7, + type: 3} + Parent: {fileID: 0} + ForceDirectionRight: 0 + ForcePosition: {x: 0, y: 0, z: 0} ContentRoot: {fileID: 843504455} OptionHeight: 34 PaddingHeight: 16 @@ -11239,32 +11333,32 @@ PrefabInstance: - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 90.43 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -32 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 116.86 objectReference: {fileID: 0} - target: {fileID: 878382121558056004, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 56 objectReference: {fileID: 0} - target: {fileID: 1713457305180270767, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} @@ -11419,62 +11513,62 @@ PrefabInstance: - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 150 objectReference: {fileID: 0} - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -32 objectReference: {fileID: 0} - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 180.86 objectReference: {fileID: 0} - target: {fileID: 3873577224371502733, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 64 objectReference: {fileID: 0} - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 90.43 objectReference: {fileID: 0} - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -32 objectReference: {fileID: 0} - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 180.86 objectReference: {fileID: 0} - target: {fileID: 4710256612221957410, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 64 objectReference: {fileID: 0} - target: {fileID: 7183058363224579084, guid: 2758dfa2744d7ad4d8877545189d116e, type: 3} @@ -11866,32 +11960,32 @@ PrefabInstance: - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 115.185 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 230.37 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3856099931455214244, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -11991,22 +12085,22 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 1404.0701 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -34 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 230.37 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -12016,7 +12110,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -12026,7 +12120,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -12051,57 +12145,57 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 166.37 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 115.185 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 230.37 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4377430353563539876, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -15304,7 +15398,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1619776840 RectTransform: m_ObjectHideFlags: 0 @@ -18458,32 +18552,32 @@ PrefabInstance: - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 81.759995 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 163.51999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3856099931455214244, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -18588,22 +18682,22 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 1039.8251 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -34 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 163.51999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -18613,7 +18707,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -18623,7 +18717,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -18648,57 +18742,57 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 99.51999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 81.759995 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 163.51999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4377430353563539876, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -18783,7 +18877,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1913509429} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Name: @@ -20468,32 +20562,32 @@ PrefabInstance: - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 119.765 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 239.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1689683968015809418, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3856099931455214244, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -20603,22 +20697,22 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 520.51 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -34 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 239.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -20628,7 +20722,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -20638,7 +20732,7 @@ PrefabInstance: - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5318229203699776728, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} @@ -20663,57 +20757,57 @@ PrefabInstance: - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 175.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6493174789768221420, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 44 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.x - value: 119.765 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_AnchoredPosition.y - value: -26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.x - value: 239.53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7200536746924797989, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} propertyPath: m_SizeDelta.y - value: 52 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4377430353563539876, guid: b93e36d73a071274d8e9225e077ce92a, type: 3} diff --git a/Assets/Scripts/StrategyGameManager.cs b/Assets/Scripts/StrategyGameManager.cs index 1b24a6e21..a0d40b6fb 100644 --- a/Assets/Scripts/StrategyGameManager.cs +++ b/Assets/Scripts/StrategyGameManager.cs @@ -266,7 +266,6 @@ public class StrategyGameManager : MonoBehaviour ClickRaycaster.OnClickMiss += () => { - ContextMenu.gameObject.SetActive(false); if (_currentTab == GalaxyTabButton) PopulateGalaxyProperties(); else if (_currentTab == ZoneTabButton) PopulateZoneProperties(_populatedZone); else if (_currentTab == TechTabButton) PopulateTechProperties(); @@ -345,6 +344,25 @@ public class StrategyGameManager : MonoBehaviour } } + void ShowContextMenu(object clickTarget) + { + ContextMenu.gameObject.SetActive(true); + ContextMenu.Clear(); + if (clickTarget is PlanetData planet) + { + ContextMenu.AddOption("Test Option 1", () => Debug.Log("Test Option 1 Selected")); + ContextMenu.AddOption("Test Option 2", () => Debug.Log("Test Option 2 Selected")); + ContextMenu.AddDropdown("Test Dropdown", new [] + { + ("Dropdown Option 1", (Action) (() => Debug.Log("Dropdown Option 1 Selected"))), + ("Dropdown Option 2", (Action) (() => Debug.Log("Dropdown Option 2 Selected"))), + ("Dropdown Option 3", (Action) (() => Debug.Log("Dropdown Option 3 Selected"))) + }); + ContextMenu.AddOption("Test Option 3", () => Debug.Log("Test Option 3 Selected")); + } + ContextMenu.Show(); + } + void PopulateGalaxy() { _galaxyPopulated = true; @@ -507,11 +525,7 @@ public class StrategyGameManager : MonoBehaviour } else if (data.button == PointerEventData.InputButton.Right) { - ContextMenu.gameObject.SetActive(true); - ContextMenu.SetOptions(new [] - { - ("Test Option", (Action) (() => Debug.Log("Test Option Selected"))) - }); + ShowContextMenu(planetData); } }; } @@ -537,7 +551,7 @@ public class StrategyGameManager : MonoBehaviour } else if (data.button == PointerEventData.InputButton.Right) { - + ShowContextMenu(planetData); } }; } diff --git a/Assets/Scripts/UI/ContextMenu.cs b/Assets/Scripts/UI/ContextMenu.cs index e623d3de3..68c8ef6b7 100644 --- a/Assets/Scripts/UI/ContextMenu.cs +++ b/Assets/Scripts/UI/ContextMenu.cs @@ -9,7 +9,13 @@ using UnityEngine.UI; public class ContextMenu : MonoBehaviour { public Canvas Canvas; - public RectTransform OptionPrefab; + public RectTransform Root; + public ClickCatcher CancelClickCatcher; + public ContextMenuOption OptionPrefab; + public ContextMenu DropMenuPrefab; + public ContextMenu Parent; + public bool ForceDirectionRight; + public Vector3 ForcePosition; public RectTransform ContentRoot; @@ -17,31 +23,100 @@ public class ContextMenu : MonoBehaviour public float PaddingHeight; private List _options = new List(); + private bool _hasDropdown; + private bool _dropdownRight; + private GameObject _dropdown; + private ContextMenuOption _currentDropdown; - public void SetOptions(IEnumerable<(string text, Action action)> options) + private void Start() + { + if (CancelClickCatcher != null) + CancelClickCatcher.OnClick += data => + { + End(); + }; + } + + private void End() + { + if (_dropdown != null) + Destroy(_dropdown); + CancelClickCatcher.gameObject.SetActive(false); + gameObject.SetActive(false); + } + + public void Clear() { - var rect = transform as RectTransform; - var pivot = rect.pivot; - pivot.x = Input.mousePosition.x > Screen.width - rect.sizeDelta.x * Canvas.scaleFactor ? 1 : 0; - pivot.y = Input.mousePosition.y < (PaddingHeight + options.Count() * OptionHeight) * Canvas.scaleFactor ? 0 : 1; - rect.pivot = pivot; - rect.position = Input.mousePosition; - // Destroy previous options foreach(var option in _options) Destroy(option); _options.Clear(); - - foreach (var option in options) + _hasDropdown = false; + } + + public void AddOption(string text, Action action) + { + var optionButton = Instantiate(OptionPrefab, ContentRoot); + optionButton.Label.text = text; + optionButton.Button.onClick.AddListener(() => { - var optionButton = Instantiate(OptionPrefab, ContentRoot); - optionButton.GetComponentInChildren().text = option.text; - optionButton.GetComponent