From f44774f92f13aaf62e5372c8638ffb3df6e80394 Mon Sep 17 00:00:00 2001 From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com> Date: Thu, 28 Apr 2022 00:47:39 -0500 Subject: [PATCH] the hover text modifies with replaced buttons --- .../Player/NetworkSMPlayerPrefab.prefab | 2 +- Assets/Scenes/Lobby.unity | 36 ++++--------------- .../Resources/ItemObjects/Dash.asset | 2 +- .../Resources/ItemObjects/Glider.asset | 2 +- .../Resources/ItemObjects/Grapple.asset | 2 +- .../Resources/ItemObjects/Nitro.asset | 3 +- Assets/Scripts/UI/Controls/GameManager.cs | 8 +++++ Assets/Scripts/UI/Lobby/LobbyItems.cs | 24 ++++++++++++- UserSettings/EditorUserSettings.asset | 4 +-- 9 files changed, 44 insertions(+), 39 deletions(-) diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index 4504cc4..c75acd2 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -1604,7 +1604,7 @@ Transform: m_GameObject: {fileID: 2080873442886702253} 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_LocalScale: {x: 10, y: 10, z: 10} m_Children: - {fileID: 3428075745657322556} - {fileID: 6696434663218085850} diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 3bc9956..f7d7bf0 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -589,26 +589,10 @@ PrefabInstance: propertyPath: m_Name value: NetworkSMPlayerPrefab objectReference: {fileID: 0} - - target: {fileID: 2990189160485986625, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalPosition.x value: 23 @@ -649,14 +633,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4098918742861069263, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4748546854517208321, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} --- !u!1 &1129569236 stripped @@ -709,6 +685,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4748546854517208321, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} m_PrefabInstance: {fileID: 1129569235} m_PrefabAsset: {fileID: 0} +--- !u!1 &1129569246 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6875021042914849118, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} + m_PrefabInstance: {fileID: 1129569235} + m_PrefabAsset: {fileID: 0} --- !u!1 &1226483723 GameObject: m_ObjectHideFlags: 0 @@ -841,11 +822,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1608428008624389940, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} m_PrefabInstance: {fileID: 1129569235} m_PrefabAsset: {fileID: 0} ---- !u!1 &1557924177 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4098918742861069263, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} - m_PrefabInstance: {fileID: 1129569235} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1822173499 PrefabInstance: m_ObjectHideFlags: 0 @@ -1122,7 +1098,7 @@ PrefabInstance: - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: runnerBodyModifiers.Array.data[1] value: - objectReference: {fileID: 1557924177} + objectReference: {fileID: 1129569246} - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: runnerBodyModifiers.Array.data[2] value: diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset index 5e90b4f..2deafd7 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 1 itemName: Dash - description: (Active) Press R to quickly dash your player forward. + description: to quickly dash your player forward. itemSprite: {fileID: 2061666376165797104, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset index 816a54c..c5df987 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Glider.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 2 itemName: Glider - description: (Active) Hold space while falling to slow your descent. + description: (Active) Hold Space while falling to slow your descent. itemSprite: {fileID: 4561481026067350109, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset index 19455f6..f09fc5c 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Grapple.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 3 itemName: Grapple - description: (Active) Press E to grapple to a nearby grapple point. + description: to grapple to a nearby grapple point. itemSprite: {fileID: 4914967321489272866, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset index c8504dc..9f1bb8e 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset +++ b/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Nitro.asset @@ -14,8 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 4 itemName: Nitro - description: (Active) Press Left Shift to boost your player speed beyond its max - for a short period. + description: to boost your player speed beyond its max for a short period. itemSprite: {fileID: 3495826128427586484, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} maxVelM: 0 minVelM: 0 diff --git a/Assets/Scripts/UI/Controls/GameManager.cs b/Assets/Scripts/UI/Controls/GameManager.cs index 7c2c5a7..98112b5 100644 --- a/Assets/Scripts/UI/Controls/GameManager.cs +++ b/Assets/Scripts/UI/Controls/GameManager.cs @@ -12,6 +12,7 @@ public class GameManager : MonoBehaviour [SerializeField] public Dictionary bindableActions = new Dictionary(); public Dictionary keyToSpriteDict = new Dictionary(); + public Dictionary keyToStringDict = new Dictionary(); public Sprite[] allSprites; private void Awake() @@ -53,6 +54,13 @@ public class GameManager : MonoBehaviour keyToSpriteDict.Add(KeyCode.R, allSprites[2]); keyToSpriteDict.Add(KeyCode.F, allSprites[3]); keyToSpriteDict.Add(KeyCode.LeftShift, allSprites[4]); + + //dictionary with keycode as key and value as string of key + keyToStringDict.Add(KeyCode.Q, "Q"); + keyToStringDict.Add(KeyCode.E, "E"); + keyToStringDict.Add(KeyCode.R, "R"); + keyToStringDict.Add(KeyCode.F, "F"); + keyToStringDict.Add(KeyCode.LeftShift, "Left Shift"); } // Start is called before the first frame update void Start() diff --git a/Assets/Scripts/UI/Lobby/LobbyItems.cs b/Assets/Scripts/UI/Lobby/LobbyItems.cs index 3c8cbdd..435a72e 100644 --- a/Assets/Scripts/UI/Lobby/LobbyItems.cs +++ b/Assets/Scripts/UI/Lobby/LobbyItems.cs @@ -76,6 +76,7 @@ public class LobbyItems : MonoBehaviour private void InitializeItemB(){ Debug.Log("Initialize Items"); int index = 0; + if(itemOptPrefab != null){ foreach(var item in invMan.ItemDict){ Debug.Log("Create Button"); @@ -105,7 +106,28 @@ public class LobbyItems : MonoBehaviour tooltipEntry.eventID = EventTriggerType.PointerEnter; tooltipExit.eventID = EventTriggerType.PointerExit; - tooltipEntry.callback.AddListener((data) => {tooltip.ShowTooltip(item.Value.description);}); + //Modify description button for Dash, Nitro, & Grapple + if(item.Value.id == 1 || item.Value.id == 3 || item.Value.id == 4){ + //Dash + if(item.Value.id == 1){ + tooltipEntry.callback.AddListener((data) => {tooltip.ShowTooltip("(Active) Press " + GameManager.GM.keyToStringDict[GameManager.GM.bindableActions["dashKey"]] + " " + item.Value.description);}); + } + + //Grapple + else if(item.Value.id == 3){ + tooltipEntry.callback.AddListener((data) => {tooltip.ShowTooltip("(Active) Press " + GameManager.GM.keyToStringDict[GameManager.GM.bindableActions["grappleKey"]] + " " + item.Value.description);}); + } + + //Nitro + else{ + tooltipEntry.callback.AddListener((data) => {tooltip.ShowTooltip("(Active) Press " + GameManager.GM.keyToStringDict[GameManager.GM.bindableActions["nitroKey"]] + " " + item.Value.description);}); + } + } + else{ + tooltipEntry.callback.AddListener((data) => {tooltip.ShowTooltip(item.Value.description);}); + } + + tooltipEntry.callback.AddListener((data) => {hoverButton.Play(); }); //Button on hover play Sound tooltipExit.callback.AddListener((data) => {tooltip.HideTooltip();}); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 36574eb..2153e28 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,13 +27,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 vcSharedLogLevel: value: 0d5e400f0650