login states

shnok · Dec 3, 2024 · f56a81e · f56a81e
1 parent 9963fd0
commit f56a81e
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 15 deletions.
diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/GameEvent.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/GameEvent.cs
@@ -2,11 +2,14 @@ public enum GameEvent
 {
     CONNECT_ALLOWED,
     AUTH_ALLOWED,
-    DISCONNECTED,
+    SERVER_LIST_RECEIVED,
+    LOGIN_DISCONNECTED,
+    GAME_DISCONNECTED,
     CHAR_CREATED,
     CHAR_SELECTED,
     CHAR_LOADED,
     RETURN,
     LOADING_STARTED,
-    LOADING_COMPLETE
+    LOADING_COMPLETE,
+    PLAY_ALLOWED
 }
diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/GameManager.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/GameManager.cs
@@ -443,13 +443,19 @@ 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),
             _ => throw new ArgumentException("Invalid state")
         };
     }
 
     public void NotifyEvent(GameEvent evt)
+    {
+        NotifyEvent(evt, null);
+    }
+
+    public void NotifyEvent(GameEvent evt, object arg0)
     {
         if (_enableLogs) Debug.Log("[GameStateMachine][EVENT] " + evt);
-        _stateInstance?.HandleEvent(evt);
+        _stateInstance?.HandleEvent(evt, arg0);
     }
 }
diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/CharSelectState.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/CharSelectState.cs
@@ -0,0 +1,41 @@
+using UnityEngine;
+
+public class CharSelectState : GameStateBase
+{
+    public CharSelectState(GameManager stateMachine) : base(stateMachine) { }
+
+    public override void Enter(object arg0)
+    {
+        L2LoginUI.Instance.ShowCharSelectWindow();
+
+        CharSelectWindow.Instance.SetCharacterList(CharacterSelector.Instance.Characters);
+
+        CharacterSelector.Instance.ApplyCharacterList();
+        CharacterSelector.Instance.SelectDefaultCharacter();
+
+        CharSelectWindow.Instance.SelectSlot(CharacterSelector.Instance.SelectedSlot);
+
+        LoginCameraManager.Instance.SwitchCamera("CharSelect");
+    }
+
+    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.AUTH_ALLOWED:
+                break;
+            default:
+                Debug.LogWarning($"[GameStateMachine] Unhandled event {evt} for state {_stateMachine.State}");
+                break;
+        }
+    }
+}
diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/CharSelectState.cs.meta b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/CharSelectState.cs.meta
diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/GameStateBase.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/GameStateBase.cs
@@ -10,5 +10,5 @@ public GameStateBase(GameManager stateMachine)
     public virtual void Enter(object arg0) { }
     public virtual void Exit() { }
     public virtual void Update() { }
-    public virtual void HandleEvent(GameEvent evt) { }
+    public virtual void HandleEvent(GameEvent evt, object arg0) { }
 }
diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/LoginAuthedState.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/LoginAuthedState.cs
@@ -4,18 +4,33 @@ public class LoginAuthedState : GameStateBase
 {
     public LoginAuthedState(GameManager stateMachine) : base(stateMachine) { }
 
+    public override void Enter(object arg0)
+    {
+        L2LoginUI.Instance.ShowLicenseWindow();
+    }
 
     public override void Update()
     {
 
     }
 
-    public override void HandleEvent(GameEvent evt)
+    public override void HandleEvent(GameEvent evt, object arg0)
     {
         switch (evt)
         {
-            case GameEvent.DISCONNECTED:
-                _stateMachine.ChangeState(GameState.LOGIN_AUTHED);
+            case GameEvent.LOGIN_DISCONNECTED:
+                L2LoginUI.Instance.ShowLoginWindow();
+                _stateMachine.ChangeState(GameState.LOGIN_SCREEN);
+                break;
+            case GameEvent.SERVER_LIST_RECEIVED:
+                L2LoginUI.Instance.ShowServerSelectWindow();
+                ServerSelectWindow.Instance.UpdateServerList((ServerListPacket)arg0);
+                break;
+            case GameEvent.PLAY_ALLOWED:
+                GameClient.Instance.Connect();
+                break;
+            case GameEvent.AUTH_ALLOWED:
+                _stateMachine.ChangeState(GameState.CHAR_SELECT);
                 break;
             default:
                 Debug.LogWarning($"[GameStateMachine] Unhandled event {evt} for state {_stateMachine.State}");

diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/LoginConnectedState.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/LoginConnectedState.cs
@@ -10,14 +10,14 @@ public override void Update()
 
     }
 
-    public override void HandleEvent(GameEvent evt)
+    public override void HandleEvent(GameEvent evt, object arg0)
     {
         switch (evt)
         {
             case GameEvent.AUTH_ALLOWED:
                 _stateMachine.ChangeState(GameState.LOGIN_AUTHED);
                 break;
-            case GameEvent.DISCONNECTED:
+            case GameEvent.LOGIN_DISCONNECTED:
                 _stateMachine.ChangeState(GameState.LOGIN_SCREEN);
                 break;
             default:

diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/LoginState.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/LoginState.cs
@@ -13,7 +13,7 @@ public override void Update()
 
     }
 
-    public override void HandleEvent(GameEvent evt)
+    public override void HandleEvent(GameEvent evt, object arg0)
     {
         switch (evt)
         {

diff --git a/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/StartingGameState.cs b/l2-unity/Assets/Scripts/Game/Manager/StateMachine/State/StartingGameState.cs
@@ -18,7 +18,7 @@ public override void Update()
 
     }
 
-    public override void HandleEvent(GameEvent evt)
+    public override void HandleEvent(GameEvent evt, object arg0)
     {
         switch (evt)
         {

diff --git a/...ts/Scripts/Networking/ClientLibrary/PacketHandler/LoginServer/LoginServerPacketHandler.cs b/...ts/Scripts/Networking/ClientLibrary/PacketHandler/LoginServer/LoginServerPacketHandler.cs
@@ -148,7 +148,7 @@ private void OnServerListReceived(byte[] data)
         ServerListPacket packet = new ServerListPacket(data);
 
         EventProcessor.Instance.QueueEvent(
-            () => LoginClient.Instance.OnServerListReceived(packet.LastServer, packet.ServersData, packet.CharsOnServers));
+            () => LoginClient.Instance.OnServerListReceived(packet));
     }
 
     private void OnPlayFail(byte[] data)

diff --git a/l2-unity/Assets/Scripts/Networking/DefaultClient.cs b/l2-unity/Assets/Scripts/Networking/DefaultClient.cs
@@ -104,7 +104,6 @@ public void Disconnect()
     public virtual void OnDisconnect()
     {
         _connected = false;
-        GameManager.Instance.NotifyEvent(GameEvent.DISCONNECTED);
     }
 
 #if UNITY_EDITOR

diff --git a/l2-unity/Assets/Scripts/Networking/GameClient.cs b/l2-unity/Assets/Scripts/Networking/GameClient.cs
@@ -86,6 +86,7 @@ public override void OnAuthAllowed()
         Debug.Log("Authed to GameServer.");
 
         // GameManager.Instance.OnAuthAllowed();
+        GameManager.Instance.NotifyEvent(GameEvent.AUTH_ALLOWED);
     }
 
     public void OnCharSelectAllowed()
@@ -98,6 +99,8 @@ public override void OnDisconnect()
     {
         base.OnDisconnect();
         Debug.Log("Disconnected from GameServer.");
+        GameManager.Instance.NotifyEvent(GameEvent.GAME_DISCONNECTED);
+
     }
 
     public void OnCharCreateOk()

diff --git a/l2-unity/Assets/Scripts/Networking/LoginClient.cs b/l2-unity/Assets/Scripts/Networking/LoginClient.cs
@@ -127,10 +127,18 @@ public void OnPlayOk()
         // {
         //     GameClient.Instance.Connect();
         // }
+
+        GameManager.Instance.NotifyEvent(GameEvent.PLAY_ALLOWED);
     }
 
-    public void OnServerListReceived(byte lastServer, List<ServerData> serverData, Dictionary<int, int> charsOnServers)
+    public void OnServerListReceived(ServerListPacket packet)
     {
+        GameManager.Instance.NotifyEvent(GameEvent.SERVER_LIST_RECEIVED, packet);
+        // /         GameState = GameState.SERVER_LIST;
+
+        //         L2LoginUI.Instance.ShowServerSelectWindow();
+
+        //         ServerSelectWindow.Instance.UpdateServerList(lastServer, serverData, charsOnServers);
         // GameManager.Instance.OnReceivedServerList(lastServer, serverData, charsOnServers);
     }
 
@@ -144,5 +152,7 @@ public override void OnDisconnect()
         base.OnDisconnect();
 
         Debug.Log("Disconnected from LoginServer.");
+
+        GameManager.Instance.NotifyEvent(GameEvent.LOGIN_DISCONNECTED);
     }
 }
diff --git a/l2-unity/Assets/Scripts/UI/Login/ServerSelectWindow.cs b/l2-unity/Assets/Scripts/UI/Login/ServerSelectWindow.cs
@@ -85,8 +85,12 @@ protected override IEnumerator BuildWindow(VisualElement root)
         yield return new WaitForEndOfFrame();
     }
 
-    public void UpdateServerList(int lastServer, List<ServerData> serverData, Dictionary<int, int> charsOnServers)
+    public void UpdateServerList(ServerListPacket packet)
     {
+        int lastServer = packet.LastServer;
+        List<ServerData> serverData = packet.ServersData;
+        Dictionary<int, int> charsOnServers = packet.CharsOnServers;
+
         ResetWindow();
 
         _serverData = serverData;
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ public override void Update() @@
         }
-        public override void HandleEvent(GameEvent evt)
+        public override void HandleEvent(GameEvent evt, object arg0)
         {
             switch (evt)
             {
@@ Expand Down @@