From 640afc25c3dcb2cbde5c0e43d16af4bf94e5dd9a Mon Sep 17 00:00:00 2001 From: Katherine <60979280+KatherineRude@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:02:16 -0600 Subject: [PATCH] King Menu >Radial menu has been added in a rough state >Can be turned on and off --- Assets/Scenes/Demos/KingImpGraybox.unity | 81 ++++++++++++++----- Assets/Scripts/KingScripts/KingPlace.cs | 1 - Assets/Scripts/KingScripts/RadialMenu.cs | 40 +++++++++ Assets/Scripts/KingScripts/RadialMenu.cs.meta | 11 +++ ProjectSettings/InputManager.asset | 16 ++++ 5 files changed, 130 insertions(+), 19 deletions(-) create mode 100644 Assets/Scripts/KingScripts/RadialMenu.cs create mode 100644 Assets/Scripts/KingScripts/RadialMenu.cs.meta diff --git a/Assets/Scenes/Demos/KingImpGraybox.unity b/Assets/Scenes/Demos/KingImpGraybox.unity index efbbbd2..69d288b 100644 --- a/Assets/Scenes/Demos/KingImpGraybox.unity +++ b/Assets/Scenes/Demos/KingImpGraybox.unity @@ -50255,6 +50255,23 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1883906605} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1884077319 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8183403963399572359, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + m_PrefabInstance: {fileID: 8183403963536638187} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1884077323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1884077319} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d94be097208c22f4daa3776bd00128b4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1885653570 GameObject: m_ObjectHideFlags: 0 @@ -61649,6 +61666,10 @@ PrefabInstance: propertyPath: HailSprite value: objectReference: {fileID: 454718203} + - target: {fileID: 8183403963077248726, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_RenderMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8183403963077248726, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_PlaneDistance value: 2.33 @@ -61675,7 +61696,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403963399572358, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.y - value: -440 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8183403963399572358, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8183403963399572358, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_LocalScale.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 8183403963399572358, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_LocalPosition.z @@ -61687,7 +61716,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403963399572358, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.y - value: 220 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8183403963399572359, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_IsActive @@ -61695,11 +61724,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403963861912047, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.x - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403963861912047, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403963861912047, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_LocalPosition.z @@ -61707,11 +61736,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403963861912047, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.x - value: 300 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8183403963861912047, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8183403963968820400, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_RootOrder @@ -61779,11 +61808,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403964692436328, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.x - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403964692436328, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403964692436328, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_LocalPosition.z @@ -61791,11 +61820,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403964692436328, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.x - value: -300 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8183403964692436328, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 8183403964692436329, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 8183403964692436334, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_Color.b @@ -61809,17 +61842,29 @@ PrefabInstance: propertyPath: m_Color.r value: 0.9607844 objectReference: {fileID: 0} + - target: {fileID: 8183403964692436334, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8183403965069105119, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_Text value: Thunder objectReference: {fileID: 0} + - target: {fileID: 8183403965069105119, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_FontData.m_MinSize + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8183403965069105119, guid: d23bf55f2a40d494487eb188930f895d, type: 3} + propertyPath: m_FontData.m_FontSize + value: 10 + objectReference: {fileID: 0} - target: {fileID: 8183403965182652614, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.x - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403965182652614, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403965182652614, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_LocalPosition.z @@ -61827,19 +61872,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403965182652614, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.x - value: -100 + value: -50 objectReference: {fileID: 0} - target: {fileID: 8183403965182652614, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8183403965183742968, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.x - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403965183742968, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 45 objectReference: {fileID: 0} - target: {fileID: 8183403965183742968, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_LocalPosition.z @@ -61847,11 +61892,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8183403965183742968, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8183403965183742968, guid: d23bf55f2a40d494487eb188930f895d, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d23bf55f2a40d494487eb188930f895d, type: 3} diff --git a/Assets/Scripts/KingScripts/KingPlace.cs b/Assets/Scripts/KingScripts/KingPlace.cs index 49fe594..721a6ef 100644 --- a/Assets/Scripts/KingScripts/KingPlace.cs +++ b/Assets/Scripts/KingScripts/KingPlace.cs @@ -46,7 +46,6 @@ public class KingPlace : NetworkBehaviour } } - public GameObject Block; public GameObject BlockWithoutNetwork; diff --git a/Assets/Scripts/KingScripts/RadialMenu.cs b/Assets/Scripts/KingScripts/RadialMenu.cs new file mode 100644 index 0000000..1b45ce3 --- /dev/null +++ b/Assets/Scripts/KingScripts/RadialMenu.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RadialMenu : MonoBehaviour +{ + + bool UIOn = false; + // Update is called once per frame + void Update() + { + if (UIOn == false) { + transform.position = Input.mousePosition;//Moved the UI to where the mouse is + } + if(Input.GetAxis("RadialMenu") > 0) {//Pressing Q makes the UI appear + MenuOn(); + } + if (Input.GetAxis("RadialMenu") < 0) {//Pressing E makes the UI dissapear + MenuOff(); + } + } + + void MenuOn() + { + foreach (Transform child in transform) { //Turns on all of the different buttons attached to this panel and stops it from moving + child.gameObject.SetActive(true); + Debug.Log("Wax On"); + UIOn = true; + } + } + + void MenuOff() + { + foreach (Transform child in transform) { //Turns off all of the different buttons attached to this panel and starts it moving again + child.gameObject.SetActive(false); + Debug.Log("Wax Off"); + UIOn = false; + } + } +} diff --git a/Assets/Scripts/KingScripts/RadialMenu.cs.meta b/Assets/Scripts/KingScripts/RadialMenu.cs.meta new file mode 100644 index 0000000..1dc0e1d --- /dev/null +++ b/Assets/Scripts/KingScripts/RadialMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d94be097208c22f4daa3776bd00128b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 2610014..0b77629 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -373,3 +373,19 @@ InputManager: type: 2 axis: 8 joyNum: 0 + - serializedVersion: 3 + m_Name: RadialMenu + descriptiveName: + descriptiveNegativeName: + negativeButton: e + positiveButton: q + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: 0.001 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0