char select / char creation states

l2-unity/Assets/Scripts/Game/Manager/StateMachine/GameManager.cs

@@ -300,10 +300,10 @@ public class GameManager : MonoBehaviour
 {
     [SerializeField] private bool _enableLogs;
     [SerializeField] private int _protocolVersion = 740;
-    [SerializeField] private GameState _gameState = GameState.LOGIN_SCREEN;
     [SerializeField] private bool _autoLogin = false;
     [SerializeField] private Camera _loadingCamera;
     [SerializeField] private bool _loading;
+    public bool Loading { get { return _loading; } }
     public int ProtocolVersion { get { return _protocolVersion; } }
     public bool AutoLogin { get { return _autoLogin; } }
 
@@ -443,7 +443,8 @@ private void InitializeState()
             GameState.LOGIN_SCREEN => new LoginState(this),
             GameState.LOGIN_CONNECTED => new LoginConnectedState(this),
             GameState.LOGIN_AUTHED => new LoginAuthedState(this),
-            GameState.CHAR_SELECT => new CharSelectState(this),
+            GameState.CHAR_SELECT => new CharSelectionState(this),
+            GameState.CHAR_CREATION => new CharCreationState(this),
             _ => throw new ArgumentException("Invalid state")
         };
     }

l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/CharCreationState.cs

@@ -0,0 +1,40 @@
+using UnityEngine;
+
+public class CharCreationState : GameStateBase
+{
+    public CharCreationState(GameManager stateMachine) : base(stateMachine) { }
+
+    public override void Enter(object arg0)
+    {
+        L2LoginUI.Instance.ShowCharCreationWindow();
+
+        LoginCameraManager.Instance.SwitchCamera("Login");
+    }
+
+    public override void Update()
+    {
+
+    }
+
+    public override void HandleEvent(GameEvent evt, object arg0)
+    {
+        switch (evt)
+        {
+            case GameEvent.GAME_DISCONNECTED:
+                L2LoginUI.Instance.ShowLoginWindow();
+                _stateMachine.ChangeState(GameState.LOGIN_SCREEN);
+                break;
+            case GameEvent.CHAR_LOADED:
+            case GameEvent.RETURN:
+                L2LoginUI.Instance.ShowCharSelectWindow();
+                _stateMachine.ChangeState(GameState.CHAR_SELECT);
+                break;
+            case GameEvent.CHAR_CREATED:
+                _stateMachine.ChangeState(GameState.CHAR_CREATION);
+                break;
+            default:
+                Debug.LogWarning($"[GameStateMachine] Unhandled event {evt} for state {_stateMachine.State}");
+                break;
+        }
+    }
+}

l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/CharSelectState.cs

@@ -1,8 +1,8 @@
 using UnityEngine;
 
-public class CharSelectState : GameStateBase
+public class CharSelectionState : GameStateBase
 {
-    public CharSelectState(GameManager stateMachine) : base(stateMachine) { }
+    public CharSelectionState(GameManager stateMachine) : base(stateMachine) { }
 
     public override void Enter(object arg0)
     {

l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/LoginState.cs

@@ -6,6 +6,11 @@ public LoginState(GameManager stateMachine) : base(stateMachine) { }
 
     public override void Enter(object arg0)
     {
+        if (!_stateMachine.Loading)
+        {
+            LoginCameraManager.Instance.SwitchCamera("Login");
+            L2LoginUI.Instance.ShowLoginWindow();
+        }
     }
 
     public override void Update()
@@ -19,7 +24,6 @@ public override void HandleEvent(GameEvent evt, object arg0)
         {
             case GameEvent.LOADING_COMPLETE:
                 _stateMachine.StopLoading();
-
                 LoginCameraManager.Instance.SwitchCamera("Login");
                 LoginWindow.Instance.ShowWindow();
                 LoginWindow.Instance.ShowLogo();
@@ -33,4 +37,8 @@ public override void HandleEvent(GameEvent evt, object arg0)
                 break;
         }
     }
+
+    private void ResetLoginState()
+    {
+    }
 }

l2-unity/Assets/Scripts/Networking/ClientLibrary/PacketHandler/Gameserver/GameServerPacketHandler.cs

@@ -209,9 +209,10 @@ private void OnCharSelectionInfoReceive(byte[] data)
         CharacterSelector.Instance.Characters = packet.Characters;
         CharacterSelector.Instance.DefaultSelectedSlot = packet.SelectedSlotId;
 
-        if (GameManager.Instance.State != GameState.RESTARTING)
+        Debug.Log($"Received {packet.Characters.Count} character(s) from server.");
+
+        if (GameManager.Instance.State == GameState.LOGIN_AUTHED)
         {
-            Debug.Log($"Received {packet.Characters.Count} character(s) from server.");
 
             EventProcessor.Instance.QueueEvent(() =>
             {

l2-unity/Assets/Scripts/Networking/GameClient.cs

@@ -92,7 +92,8 @@ public override void OnAuthAllowed()
     public void OnCharSelectAllowed()
     {
         Debug.Log("Return to character selection.");
-        // GameManager.Instance.OnCharSelectAllowed();
+        // /GameManager.Instance.OnCharSelectAllowed();
+        GameManager.Instance.NotifyEvent(GameEvent.CHAR_LOADED);
     }
 
     public override void OnDisconnect()

l2-unity/Assets/Scripts/UI/Login/CharSelectWindow.cs

@@ -198,13 +198,12 @@ private void StartGamePressed()
 
     private void ReLoginPressed()
     {
-        GameManager.Instance.NotifyEvent(GameEvent.RETURN);
         GameClient.Instance.Disconnect();
     }
 
     private void CreatePressed()
     {
-        GameManager.Instance.NotifyEvent(GameEvent.CHAR_CREATED);
+        GameManager.Instance.ChangeState(GameState.CHAR_CREATION);
     }
 
     private void DeletePressed()