diff --git a/Assets/Scenes/Startup.unity b/Assets/Scenes/Startup.unity index 559911c9..3096021d 100644 --- a/Assets/Scenes/Startup.unity +++ b/Assets/Scenes/Startup.unity @@ -1920,7 +1920,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 370034730102636685, guid: 4512c09d24f3fa147afb198fa90d63c6, type: 3} propertyPath: VectorWallAbilityKey - value: VectorWall + value: VectorFence objectReference: {fileID: 0} - target: {fileID: 370034730102636685, guid: 4512c09d24f3fa147afb198fa90d63c6, type: 3} propertyPath: m_GeneralSwapActionPrototype diff --git a/Assets/Scripts/Gameplay/AbilitySystem.cs b/Assets/Scripts/Gameplay/AbilitySystem.cs index 8050fdb1..97caefc9 100644 --- a/Assets/Scripts/Gameplay/AbilitySystem.cs +++ b/Assets/Scripts/Gameplay/AbilitySystem.cs @@ -49,7 +49,7 @@ public class AbilitySystem : NetworkBehaviour { { GameDataSource.Instance.DashNCrashAbilityKey, CursorState.Dash }, { GameDataSource.Instance.FreezeThrowAbilityKey, CursorState.Freeze }, - { GameDataSource.Instance.VectorWallAbilityKey, CursorState.VectorWall }, + { GameDataSource.Instance.VectorFenceAbilityKey, CursorState.VectorFence }, { GameDataSource.Instance.TheExecutionerKey, CursorState.Executioner }, { GameDataSource.Instance.CrowsForesightKey, CursorState.Foresight }, }; @@ -84,7 +84,7 @@ public class AbilitySystem : NetworkBehaviour { if (isAbilityActive) { - if (activeAbility.abilityKey == "VectorFence") + if (activeAbility.abilityKey == GameDataSource.Instance.VectorFenceAbilityKey) { // For VectorFence, manage wall indicator and placement ManageVectorFenceIndicator(); diff --git a/Assets/Scripts/Gameplay/CursorState.cs b/Assets/Scripts/Gameplay/CursorState.cs index f206b8c8..3b76e0e8 100644 --- a/Assets/Scripts/Gameplay/CursorState.cs +++ b/Assets/Scripts/Gameplay/CursorState.cs @@ -3,7 +3,7 @@ public enum CursorState Default, Swap, Blocked, - VectorWall, + VectorFence, Dash, Freeze, Executioner, diff --git a/Assets/Scripts/Gameplay/GameplayObjects/RuntimeDataContainers/GameDataSource.cs b/Assets/Scripts/Gameplay/GameplayObjects/RuntimeDataContainers/GameDataSource.cs index d4b4b9f1..da7701a1 100644 --- a/Assets/Scripts/Gameplay/GameplayObjects/RuntimeDataContainers/GameDataSource.cs +++ b/Assets/Scripts/Gameplay/GameplayObjects/RuntimeDataContainers/GameDataSource.cs @@ -84,7 +84,7 @@ namespace Unity.BossRoom.Gameplay.GameplayObjects public string DashNCrashAbilityKey = "DashNCrash"; public string FreezeThrowAbilityKey = "FreezeThrow"; - public string VectorWallAbilityKey = "VectorWall"; + public string VectorFenceAbilityKey = "VectorFence"; public string TheExecutionerKey = "TheExecutioner"; public string CrowsForesightKey = "CrowsForesight"; public string SwapButtonKey = "Swap"; diff --git a/Assets/Scripts/Gameplay/PlatformManager.cs b/Assets/Scripts/Gameplay/PlatformManager.cs index ffe6124a..704b5344 100644 --- a/Assets/Scripts/Gameplay/PlatformManager.cs +++ b/Assets/Scripts/Gameplay/PlatformManager.cs @@ -46,7 +46,7 @@ namespace Unity.Multiplayer.Samples.BossRoom private IEnumerator DelayedServerSetup() { - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(1.5f); PlatformSelection(); } diff --git a/Assets/Scripts/Gameplay/UI/PartyHUD.cs b/Assets/Scripts/Gameplay/UI/PartyHUD.cs index ba40895b..23af4be4 100644 --- a/Assets/Scripts/Gameplay/UI/PartyHUD.cs +++ b/Assets/Scripts/Gameplay/UI/PartyHUD.cs @@ -267,30 +267,30 @@ namespace Unity.BossRoom.Gameplay.UI // make sure allies array is ready // InitPartyArrays(); - int openslot = -1; - for (int i = 0; i < m_PartyIds.Length; i++) - { - // if this ID is in the list, return the slot index - if (m_PartyIds[i] == id) { return i; } - // otherwise, record the first open slot (not slot 0 thats for the Hero) - if (openslot == -1 && i > 0 && m_PartyIds[i] == 0) - { - openslot = i; - } - } - - // if we don't add, we are done nw and didnt fint the ID - if (dontAdd) { return -1; } - - // Party slot was not found for this ID - add one in the open slot - if (openslot > 0) - { - // activeate the correct ally panel - m_AllyPanel[openslot - 1].SetActive(true); - // and save ally ID to party array - m_PartyIds[openslot] = id; - return openslot; - } + // int openslot = -1; + // for (int i = 0; i < m_PartyIds.Length; i++) + // { + // // if this ID is in the list, return the slot index + // if (m_PartyIds[i] == id) { return i; } + // // otherwise, record the first open slot (not slot 0 thats for the Hero) + // if (openslot == -1 && i > 0 && m_PartyIds[i] == 0) + // { + // openslot = i; + // } + // } + // + // // if we don't add, we are done nw and didnt fint the ID + // if (dontAdd) { return -1; } + // + // // Party slot was not found for this ID - add one in the open slot + // if (openslot > 0) + // { + // // activeate the correct ally panel + // m_AllyPanel[openslot - 1].SetActive(true); + // // and save ally ID to party array + // m_PartyIds[openslot] = id; + // return openslot; + // } // this should not happen unless there are too many players - we didn't find the ally or a slot return -1; diff --git a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs index f3256c66..5c1adf77 100644 --- a/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs +++ b/Assets/Scripts/Gameplay/UserInput/ClientInputSender.cs @@ -588,7 +588,7 @@ namespace Unity.BossRoom.Gameplay.UserInput } if (Input.GetKeyDown(KeyCode.F)) // Vector Wall { - ActivateAbilityIfAllowed(GameDataSource.Instance.VectorWallAbilityKey); + ActivateAbilityIfAllowed(GameDataSource.Instance.VectorFenceAbilityKey); } if (Input.GetKeyDown(KeyCode.C)) // The Executioner { @@ -881,9 +881,9 @@ namespace Unity.BossRoom.Gameplay.UserInput } ActivateAbilityIfAllowed(GameDataSource.Instance.FreezeThrowAbilityKey); } - if (CnInputManager.GetButtonDown("VectorWall")) + if (CnInputManager.GetButtonDown(GameDataSource.Instance.VectorFenceAbilityKey)) { - ActivateAbilityIfAllowed(GameDataSource.Instance.VectorWallAbilityKey); + ActivateAbilityIfAllowed(GameDataSource.Instance.VectorFenceAbilityKey); } if (CnInputManager.GetButtonDown(GameDataSource.Instance.TheExecutionerKey)) { diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 2e3408b8..c3abe97a 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -166,7 +166,7 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: VectorWall + m_Name: VectorFence descriptiveName: descriptiveNegativeName: negativeButton: