From 992f31ad851bd100a634dc050195c8f74c8da75c Mon Sep 17 00:00:00 2001 From: Vladimir Date: Thu, 21 Nov 2024 19:19:44 +0200 Subject: [PATCH] radial menu work as expected --- Assets/Prefabs/UI/RadialMenu.prefab | 2 +- Assets/Prefabs/UI/RadialMenuItem.prefab | 338 +++++++----------- Assets/Scenes/MainScene.unity | 319 ++++++++++++++++- Assets/Scripts/Managers/GameManager.cs | 4 +- .../Managers/InputSystem/InputActions.cs | 40 ++- .../InputSystem/InputActions.inputactions | 30 +- Assets/Scripts/UIElements/RadialMenuItem.cs | 2 +- Assets/Textures.meta | 8 + Assets/Textures/RadialButton.png | Bin 0 -> 1134 bytes Assets/Textures/RadialButton.png.meta | 117 ++++++ Assets/Textures/RadialButton_Whole.png | Bin 0 -> 1423 bytes Assets/Textures/RadialButton_Whole.png.meta | 117 ++++++ Packages/manifest.json | 1 + Packages/packages-lock.json | 6 + 14 files changed, 762 insertions(+), 222 deletions(-) create mode 100644 Assets/Textures.meta create mode 100644 Assets/Textures/RadialButton.png create mode 100644 Assets/Textures/RadialButton.png.meta create mode 100644 Assets/Textures/RadialButton_Whole.png create mode 100644 Assets/Textures/RadialButton_Whole.png.meta diff --git a/Assets/Prefabs/UI/RadialMenu.prefab b/Assets/Prefabs/UI/RadialMenu.prefab index e255966e..a6d7e897 100644 --- a/Assets/Prefabs/UI/RadialMenu.prefab +++ b/Assets/Prefabs/UI/RadialMenu.prefab @@ -48,5 +48,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0652e5472d3afcf4f8d99f61ca2dc62e, type: 3} m_Name: m_EditorClassIdentifier: - _radialMenuItemPrefab: {fileID: 8504314472782682815, guid: 07f2894d03b374a4092012178c7bb823, + _radialMenuItemPrefab: {fileID: 1838467640973478665, guid: 07f2894d03b374a4092012178c7bb823, type: 3} diff --git a/Assets/Prefabs/UI/RadialMenuItem.prefab b/Assets/Prefabs/UI/RadialMenuItem.prefab index 34820d1b..3a96dcf9 100644 --- a/Assets/Prefabs/UI/RadialMenuItem.prefab +++ b/Assets/Prefabs/UI/RadialMenuItem.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &492131538223937763 +--- !u!1 &3347331662772499829 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,231 +8,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3130607672295543197} - - component: {fileID: 7523537103864575754} - - component: {fileID: 6614086836352695636} - - component: {fileID: 8504314472782682815} - - component: {fileID: 994226882788141464} - - component: {fileID: -1890459355742183395} - m_Layer: 0 - m_Name: RadialMenuItem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3130607672295543197 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492131538223937763} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1713882555190663192} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7523537103864575754 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492131538223937763} - m_CullTransparentMesh: 1 ---- !u!114 &6614086836352695636 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492131538223937763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 0.4 ---- !u!114 &8504314472782682815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492131538223937763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0.93333334, g: 0.9843137, b: 0.96862745, a: 1} - m_HighlightedColor: {r: 0.67058825, g: 0.92156863, b: 1, a: 1} - m_PressedColor: {r: 0.7058824, g: 0.84313726, b: 1, a: 1} - m_SelectedColor: {r: 0.67058825, g: 0.92156863, b: 1, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6614086836352695636} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: JobItemUITemplate, Assembly-CSharp - m_MethodName: Click - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!223 &994226882788141464 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492131538223937763} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &-1890459355742183395 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492131538223937763} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1024} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 200 - m_PresetInfoIsWorld: 1 ---- !u!1 &1152554228420413990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1713882555190663192} - - component: {fileID: 1225893704235431694} - - component: {fileID: 8565607513003572763} - m_Layer: 0 + - component: {fileID: 1520577106929066875} + - component: {fileID: 468639643416719293} + - component: {fileID: 1566186023065476820} + m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1713882555190663192 +--- !u!224 &1520577106929066875 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1152554228420413990} + m_GameObject: {fileID: 3347331662772499829} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3130607672295543197} + m_Father: {fileID: 3681628611267386900} 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 &1225893704235431694 +--- !u!222 &468639643416719293 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1152554228420413990} + m_GameObject: {fileID: 3347331662772499829} m_CullTransparentMesh: 1 ---- !u!114 &8565607513003572763 +--- !u!114 &1566186023065476820 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1152554228420413990} + m_GameObject: {fileID: 3347331662772499829} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -255,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278584838 - m_fontColor: {r: 0.025157154, g: 0.025157154, b: 0.025157154, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -273,10 +92,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 71.6 - m_fontSizeBase: 50 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -294,7 +113,7 @@ MonoBehaviour: m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 + m_enableKerning: 0 m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -317,3 +136,124 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6788883134238066687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3681628611267386900} + - component: {fileID: 2951920458159613850} + - component: {fileID: 4969908457437572764} + - component: {fileID: 1838467640973478665} + m_Layer: 5 + m_Name: RadialMenuItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3681628611267386900 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6788883134238066687} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1520577106929066875} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2951920458159613850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6788883134238066687} + m_CullTransparentMesh: 1 +--- !u!114 &4969908457437572764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6788883134238066687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b9859c4c1b2fe1445bc367dadd628f57, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1838467640973478665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6788883134238066687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.743147, g: 0.9433962, b: 0.9433962, a: 1} + m_PressedColor: {r: 0.62793696, g: 0.82754016, b: 0.9716981, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4969908457437572764} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 3f5567fd..06fb4c80 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -533,8 +533,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 182040536} serializedVersion: 2 - m_LocalRotation: {x: 0.21470922, y: -2.8246667e-16, z: -5.0453756e-16, w: 0.976678} - m_LocalPosition: {x: 29.11, y: 0, z: -10} + m_LocalRotation: {x: 0.43528566, y: 0.000000026830808, z: -0.000000012972524, w: 0.90029246} + m_LocalPosition: {x: 29.11, y: 8, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -554,11 +554,11 @@ MonoBehaviour: m_EditorClassIdentifier: TrackerSettings: BindingMode: 4 - PositionDamping: {x: 1, y: 1, z: 1} + PositionDamping: {x: 0, y: 0, z: 0} AngularDampingMode: 0 RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 - FollowOffset: {x: 0, y: 0, z: -10} + FollowOffset: {x: 0, y: 8, z: -10} --- !u!114 &182040541 MonoBehaviour: m_ObjectHideFlags: 0 @@ -582,7 +582,7 @@ MonoBehaviour: Offset: {x: 0, y: 0} CenterOnActivate: 1 TargetOffset: {x: 0, y: -4.62, z: 0} - Damping: {x: 0.5, y: 0.5} + Damping: {x: 0, y: 0} Lookahead: Enabled: 0 Time: 0 @@ -598,6 +598,7 @@ GameObject: m_Component: - component: {fileID: 314976162} - component: {fileID: 314976163} + - component: {fileID: 314976164} m_Layer: 0 m_Name: Event System m_TagString: Untagged @@ -635,6 +636,48 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!114 &314976164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314976161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -1680190386980627800, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!1 &580921796 GameObject: m_ObjectHideFlags: 0 @@ -662,7 +705,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 580921796} - m_LocalRotation: {x: 0.21470924, y: -4.1335915e-16, z: 9.0871316e-17, w: 0.976678} + m_LocalRotation: {x: 0.43528566, y: 0.00000002683081, z: -0.000000012972526, w: 0.9002924} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -671,7 +714,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 57.16, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 29.11, y: 0} + m_AnchoredPosition: {x: 29.11, y: 8} m_SizeDelta: {x: 594.6667, y: 299.66666} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &580921798 @@ -1234,6 +1277,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 940848059} m_CullTransparentMesh: 1 +--- !u!1 &954199924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 954199925} + - component: {fileID: 954199927} + - component: {fileID: 954199926} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &954199925 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954199924} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1284986499} + 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 &954199926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954199924} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Button + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &954199927 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954199924} + m_CullTransparentMesh: 1 --- !u!1 &1006829694 GameObject: m_ObjectHideFlags: 0 @@ -1569,6 +1748,127 @@ Transform: m_Children: [] m_Father: {fileID: 1976674304} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1284986498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1284986499} + - component: {fileID: 1284986502} + - component: {fileID: 1284986501} + - component: {fileID: 1284986500} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1284986499 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284986498} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 954199925} + m_Father: {fileID: 1737216623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1284986500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284986498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.9150943, g: 0.16834284, b: 0.16834284, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1284986501} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1284986501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284986498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1284986502 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284986498} + m_CullTransparentMesh: 1 --- !u!1 &1361955493 GameObject: m_ObjectHideFlags: 0 @@ -1728,6 +2028,7 @@ RectTransform: - {fileID: 1361955494} - {fileID: 627412322} - {fileID: 1580833477} + - {fileID: 1284986499} m_Father: {fileID: 1098219117} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1751,7 +2052,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 32 --- !u!114 &1737216625 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1792,7 +2093,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 + m_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 5412e6e6..63690a02 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -41,12 +41,12 @@ public class GameManager : MonoBehaviour } private void OnEnable() { - Instance._inputSystem.Enable(); + Instance._inputSystem?.Enable(); } private void OnDisable() { - Instance._inputSystem.Disable(); + Instance._inputSystem?.Disable(); } public void Pause() diff --git a/Assets/Scripts/Managers/InputSystem/InputActions.cs b/Assets/Scripts/Managers/InputSystem/InputActions.cs index bafbf2a9..7517ba35 100644 --- a/Assets/Scripts/Managers/InputSystem/InputActions.cs +++ b/Assets/Scripts/Managers/InputSystem/InputActions.cs @@ -29,18 +29,18 @@ public partial class @InputActions: IInputActionCollection2, IDisposable ""actions"": [ { ""name"": ""PointClick"", - ""type"": ""Button"", + ""type"": ""PassThrough"", ""id"": ""fb720cef-8db9-45ea-94b8-34ee20907014"", - ""expectedControlType"": """", + ""expectedControlType"": ""Button"", ""processors"": """", ""interactions"": """", - ""initialStateCheck"": false + ""initialStateCheck"": true }, { ""name"": ""CancelClick"", ""type"": ""Button"", ""id"": ""a045f2ab-c0ec-42fc-9343-39839caf2ba4"", - ""expectedControlType"": ""Button"", + ""expectedControlType"": """", ""processors"": """", ""interactions"": """", ""initialStateCheck"": false @@ -354,11 +354,20 @@ public partial class @InputActions: IInputActionCollection2, IDisposable ""actions"": [ { ""name"": ""Click"", - ""type"": ""Button"", + ""type"": ""PassThrough"", ""id"": ""cddc5ce5-b808-4da9-b23b-f24a5126f838"", ""expectedControlType"": ""Button"", ""processors"": """", ""interactions"": """", + ""initialStateCheck"": true + }, + { + ""name"": ""Point"", + ""type"": ""PassThrough"", + ""id"": ""8fe62ab9-ffe9-4edc-8a1a-e66417e475c8"", + ""expectedControlType"": ""Vector2"", + ""processors"": """", + ""interactions"": """", ""initialStateCheck"": false } ], @@ -373,6 +382,17 @@ public partial class @InputActions: IInputActionCollection2, IDisposable ""action"": ""Click"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""6013fd8b-2f52-4b27-8549-249c73d113b2"", + ""path"": ""/{Point}"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Point"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -391,6 +411,7 @@ public partial class @InputActions: IInputActionCollection2, IDisposable // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); m_UI_Click = m_UI.FindAction("Click", throwIfNotFound: true); + m_UI_Point = m_UI.FindAction("Point", throwIfNotFound: true); } ~@InputActions() @@ -576,11 +597,13 @@ public partial class @InputActions: IInputActionCollection2, IDisposable private readonly InputActionMap m_UI; private List m_UIActionsCallbackInterfaces = new List(); private readonly InputAction m_UI_Click; + private readonly InputAction m_UI_Point; public struct UIActions { private @InputActions m_Wrapper; public UIActions(@InputActions wrapper) { m_Wrapper = wrapper; } public InputAction @Click => m_Wrapper.m_UI_Click; + public InputAction @Point => m_Wrapper.m_UI_Point; public InputActionMap Get() { return m_Wrapper.m_UI; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -593,6 +616,9 @@ public partial class @InputActions: IInputActionCollection2, IDisposable @Click.started += instance.OnClick; @Click.performed += instance.OnClick; @Click.canceled += instance.OnClick; + @Point.started += instance.OnPoint; + @Point.performed += instance.OnPoint; + @Point.canceled += instance.OnPoint; } private void UnregisterCallbacks(IUIActions instance) @@ -600,6 +626,9 @@ public partial class @InputActions: IInputActionCollection2, IDisposable @Click.started -= instance.OnClick; @Click.performed -= instance.OnClick; @Click.canceled -= instance.OnClick; + @Point.started -= instance.OnPoint; + @Point.performed -= instance.OnPoint; + @Point.canceled -= instance.OnPoint; } public void RemoveCallbacks(IUIActions instance) @@ -631,5 +660,6 @@ public partial class @InputActions: IInputActionCollection2, IDisposable public interface IUIActions { void OnClick(InputAction.CallbackContext context); + void OnPoint(InputAction.CallbackContext context); } } diff --git a/Assets/Scripts/Managers/InputSystem/InputActions.inputactions b/Assets/Scripts/Managers/InputSystem/InputActions.inputactions index 21b147b6..48b4a176 100644 --- a/Assets/Scripts/Managers/InputSystem/InputActions.inputactions +++ b/Assets/Scripts/Managers/InputSystem/InputActions.inputactions @@ -7,18 +7,18 @@ "actions": [ { "name": "PointClick", - "type": "Button", + "type": "PassThrough", "id": "fb720cef-8db9-45ea-94b8-34ee20907014", - "expectedControlType": "", + "expectedControlType": "Button", "processors": "", "interactions": "", - "initialStateCheck": false + "initialStateCheck": true }, { "name": "CancelClick", "type": "Button", "id": "a045f2ab-c0ec-42fc-9343-39839caf2ba4", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false @@ -332,11 +332,20 @@ "actions": [ { "name": "Click", - "type": "Button", + "type": "PassThrough", "id": "cddc5ce5-b808-4da9-b23b-f24a5126f838", "expectedControlType": "Button", "processors": "", "interactions": "", + "initialStateCheck": true + }, + { + "name": "Point", + "type": "PassThrough", + "id": "8fe62ab9-ffe9-4edc-8a1a-e66417e475c8", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", "initialStateCheck": false } ], @@ -351,6 +360,17 @@ "action": "Click", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "6013fd8b-2f52-4b27-8549-249c73d113b2", + "path": "/{Point}", + "interactions": "", + "processors": "", + "groups": "", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Scripts/UIElements/RadialMenuItem.cs b/Assets/Scripts/UIElements/RadialMenuItem.cs index 3973fdfa..9c8c6ece 100644 --- a/Assets/Scripts/UIElements/RadialMenuItem.cs +++ b/Assets/Scripts/UIElements/RadialMenuItem.cs @@ -19,7 +19,7 @@ public class RadialMenuItem : MonoBehaviour { var button = Instantiate(_radialMenuItemPrefab); button.transform.SetParent(transform, false); - + //button.transform.localScale *= 2; float theta = (2 * Mathf.PI / actions.Count) * buttonsCount; float posX = Mathf.Sin(theta); float posY = Mathf.Cos(theta); diff --git a/Assets/Textures.meta b/Assets/Textures.meta new file mode 100644 index 00000000..a27d7e5d --- /dev/null +++ b/Assets/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed717cfe7847cdf4082c270af4d9f357 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/RadialButton.png b/Assets/Textures/RadialButton.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf330f24481cd1e11d0c98ffc739d185c5c4b76 GIT binary patch literal 1134 zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv1|-9u9Lfh$jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL9r6oh?3y^w370~qEv=}#LT=BJwMkF1yeo4 z@6F#Q166EEjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*L2l7tWCn{f0ojI(ObmQLItqw0 z+gZTk89+7&Bmgl;Ka57Pl7X3lVFEh?3sBy`$k>2!0mMv@de#LHb0z`VAixAPg$b-O z$kGDHg6c9fFaXIWFHt)Zxb+Wwmb8-J1Z_#)=iRB z=weh*lj^;6US|1v4i+0byHyo7dc6Cc-nGgFtiK*Sd-iOeGf(FUH#XGmU+=bf;;kDu zW^9a!-pjM+?e4qlcuu{$9p92W^QiX%^fITvn+#&FG*?tsPP||6;6zVHdpkRK zkgkHq1GCGU_wJP~N`1uC-Cnw&@z#7k-fL1dA9nfOxpyz>n_1Ath@2>4n;WJ&A=f*9 z|E|8-b!N9@-Qu5F6~EK=+SuA^p0p}2FBiM~VYVK_wfRrv<=C1VXS4ow69{1lcUgRK z0{erlIwu%-?iD6k2xR}c!Y2EntK(ya&Z&sCaa$ePYEse!7j9NM^(T%`>j870u-~N* zwT3Sm!d-ffDS!R-OKa-08dlj4J1-0Nx@fZ0>9dPUDKUv#1TO zXUdEGGUZTukhT4GA4ggH++C{0uk7oUEl#~{zAU(L_ipWN3WvD&AB*SJkC+lu;KI@_ z9=Q7I5l&vIS>I~S_c%S6Z2jg-WU7&5X>ILVt*NKB9BZ_k^uDcg^=j>hx9;CBcS+fN zQy|L@R!>i_CBL@z@8QnFhYw#kcdl>FvZG0XQ%|R6W*oZx z@_q~Fyut+m8Yj{`mIl3g@#4kfKF%3JP1DbxJEyXvcD4bh9k+1IW3Q!?I1cpg-D^Ab z^wTF7X6?*nzRk!j9&l#MgTA+uyp~_CId!)5pSnSmpI6a^r%#uz*|~PDZfQZm0zZHM z*mstK3!>IWolOf~*7E0IouAs|M?y(E*fy*mdwbEZ&FWMN@lU7oGI zeYe1*$mN$O1~PfMNn{1`ISV`@iy0XB4ude`@%$AjKtZt**NBqf{Irtt#G+J&fW*wa5b$b#xJG%x_kCNEJt66E*y3@{X&JY5_^D&pSG@${B)lxRC$D=vPg@BnWhXOE=* zyygcN7ayPVd3w=_{1XQm1Jx}(71$m5-#s#V_hQHUsFmN1uS&YhdU{)Sy=Ttt-+N|Z z<*U`}_q~#GJrS++_Wi%Wyu7?GU%zhMwP#Pr%a<>Ubd;5yzh!3n-}5`MIAd)p|NaL; z-)7F7xry=dZQFx#rhJQL`Ocj`zk9(CA#EK+y@mrEJp$(H>h3k(Q@%MSD!zXAZr!QV zr$6VZJXyM-@zawhE}`@D_ zJ)q#zvUkUh3&q97tM=`?w|ZmLqv8msxUM7jWdFM_z8Ib8TQYT)c5(Q2o9!R>e;46p zWvpz{*4CCXz5eG<&9k+93pe~bxcTq_?|BbiyjYQ!pFdqjY%|Xh-t%)CD$l37E?G50 zS|Cx`UdifaIJyRG$nK({! zfYsPo``;+ASQ8x`9a>muxSEA8(d&VH2mN$?o;mvRI%{a>)LufJbA^OLEmX$7O(+_`g4o~+0@@^sp-x0-Uh zp0Ca8Oqj;4U+g_OJ|^ahu&}U^Y4^eDZ+8_uu720%@v5QuqwS?PZ`Rzpefzh%PMEa9 z6EhQ&70;ff?c_LAB;Xdr$QBtE@p$>HdGn@Cxf*;!VvV}Gx@ef}1DD9inKJbnHo}jj zw6zz#x^Y9|TFJ_N`}UbsM&Ew2F1~lhe4lv+vfW32nVFfXY??N0+9_YLQ{FL?EHqq0 z6SA_r`o4eve)^;{Km${k58XIy{T>4#*KlOnwy%KEcp{Pbqg7nY&n#qdFIfe zrdjjnPoFQv!NRm^`SR!cHng|5Cj-N5@v}qvC#27$hlYkOjf#p2DJ|W~b4o*}kTK=x zF5NHhBGzr)w-1zvQ+=-9zWutg$~|Jk{{8YM%o`58diAPYqVH&D#bs$rm)O|39o?R6 zf0TN11RYo@vT8fQAL-uUM_FmyO`+-DqX z3rkq6la<^MIQ_@LeY=~w7*0jJ_$SDbot?cj{r$Ul`<|y?x{$HvyvgD%_d9k?5EJHB z%bg&`_-5YLs7LH;lvxDCZ7sgdICALuwr$(k@A_!1Iok32>=MrTf`NjEa&yI)7PoE) s^ZwJ&!6gtY7%7-(ZDlpdV&xTi{y5GzqIL$rf|G&4)78&qol`;+0I(iL4*&oF literal 0 HcmV?d00001 diff --git a/Assets/Textures/RadialButton_Whole.png.meta b/Assets/Textures/RadialButton_Whole.png.meta new file mode 100644 index 00000000..f30b0704 --- /dev/null +++ b/Assets/Textures/RadialButton_Whole.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: b9859c4c1b2fe1445bc367dadd628f57 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index dc2229cb..92352e49 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", + "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "2.0.5", "com.unity.animation.rigging": "1.3.0", "com.unity.cinemachine": "3.1.2", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8f199ed0..83be492b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,6 +14,12 @@ "dependencies": {}, "hash": "5cc97c7f0085624b6ef57853d70b404440060cef" }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.ai.navigation": { "version": "2.0.5", "depth": 0,