diff --git a/Assets/Scripts/CharacterSettingPanel.cs b/Assets/Scripts/CharacterSettingPanel.cs index 6f982e2..20a89e0 100644 --- a/Assets/Scripts/CharacterSettingPanel.cs +++ b/Assets/Scripts/CharacterSettingPanel.cs @@ -101,8 +101,6 @@ public class CharacterSettingPanel : MonoBehaviour direction3 += In.GetButtonDown(ButtonPinMapping.startOnePlayer) ? -1 : 0; direction3 += In.GetButtonDown(ButtonPinMapping.startTwoPlayers) ? +1 : 0; - //holdingSave = In.GetButton(ButtonPinMapping.startOnePlayer) && In.GetButton(ButtonPinMapping.startTwoPlayers); - //holdingSave = In.GetButton(ButtonPinMapping.down2); holdingSave = In.GetButton(ButtonPinMapping.startOnePlayer) && In.GetButton(ButtonPinMapping.startTwoPlayers); } @@ -245,6 +243,7 @@ public class CharacterSettingPanel : MonoBehaviour PrizeSerializer.SetPrizes(prizes); CharacterController.I.RefreshPrizes(); timeRest = timeToConfirm; + GameManager.instance.stateMachine.ChangeState(new SettingsState()); } diff --git a/Assets/Scripts/GameFSM/EnterPanels/EnterPrizesForCharactersState.cs b/Assets/Scripts/GameFSM/EnterPanels/EnterPrizesForCharactersState.cs index 8151245..ca489b3 100644 --- a/Assets/Scripts/GameFSM/EnterPanels/EnterPrizesForCharactersState.cs +++ b/Assets/Scripts/GameFSM/EnterPanels/EnterPrizesForCharactersState.cs @@ -21,8 +21,8 @@ public class EnterPrizesForCharactersState : IState public void exit() { - GameManager.instance.stateMachine.ChangeState(prevState); rootPanel.SetActive(false); + //GameManager.instance.stateMachine.ChangeState(prevState); } public void update() {