character restore

shnok · Dec 6, 2024 · 34dbd8b · 34dbd8b
1 parent 8814cc1
commit 34dbd8b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 3 deletions.
diff --git a/l2-unity/Assets/Scripts/Animation/Controller/HumanoidAnimationController.cs b/l2-unity/Assets/Scripts/Animation/Controller/HumanoidAnimationController.cs
@@ -73,7 +73,7 @@ public void SetBool(HumanoidAnimType animType, bool value)
         _lastValue = value;
         _lastAnimationType = animType;
 
-        Debug.LogWarning($"{transform.name} - SetBool: {animType}={value}");
+        // Debug.LogWarning($"{transform.name} - SetBool: {animType}={value}");
 
         base.SetBool(GetParameterId(animType, _weaponAnim), value);
     }

diff --git a/l2-unity/Assets/Scripts/Game/Character/CharacterSelector.cs b/l2-unity/Assets/Scripts/Game/Character/CharacterSelector.cs
@@ -155,6 +155,7 @@ public void SelectCharacter(int slot)
             {
                 L2ConfirmWindow.Instance.ShowWindow(1555, () =>
                 {
+                    GameClient.Instance.ClientPacketHandler.SendRequestRestoreCharacter(slot);
                 },
                 () =>
                 {

diff --git a/...Networking/ClientLibrary/Packet/Gameserver/ClientPackets/Auth/RequestCharRestorePacket.cs b/...Networking/ClientLibrary/Packet/Gameserver/ClientPackets/Auth/RequestCharRestorePacket.cs
@@ -0,0 +1,8 @@
+public class RequestCharRestorePacket : ClientPacket
+{
+    public RequestCharRestorePacket(int slot) : base((byte)GameClientPacketType.RequestCharRestore)
+    {
+        WriteI(slot);
+        BuildPacket();
+    }
+}
diff --git a/...rking/ClientLibrary/Packet/Gameserver/ClientPackets/Auth/RequestCharRestorePacket.cs.meta b/...rking/ClientLibrary/Packet/Gameserver/ClientPackets/Auth/RequestCharRestorePacket.cs.meta
diff --git a/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/GameClientPacketType.cs b/l2-unity/Assets/Scripts/Networking/ClientLibrary/Packet/Gameserver/GameClientPacketType.cs
@@ -26,6 +26,7 @@ public enum GameClientPacketType : byte
     ValidatePosition = 0x48,
     RequestDestroyItem = 0x59,
     GMCommand = 0x5b,
+    RequestCharRestore = 0x62,
     RequestRestartPoint = 0x6d,
     DoubleOPCode = 0xd0,
 

diff --git a/...sets/Scripts/Networking/ClientLibrary/PacketHandler/Gameserver/GameClientPacketHandler.cs b/...sets/Scripts/Networking/ClientLibrary/PacketHandler/Gameserver/GameClientPacketHandler.cs
@@ -233,4 +233,10 @@ public void SendRequestDeleteCharacter(int slot)
         RequestCharDeletePacket packet = new RequestCharDeletePacket(slot);
         SendPacket(packet);
     }
+
+    public void SendRequestRestoreCharacter(int slot)
+    {
+        RequestCharRestorePacket packet = new RequestCharRestorePacket(slot);
+        SendPacket(packet);
+    }
 }
diff --git a/...sets/Scripts/Networking/ClientLibrary/PacketHandler/Gameserver/GameServerPacketHandler.cs b/...sets/Scripts/Networking/ClientLibrary/PacketHandler/Gameserver/GameServerPacketHandler.cs
@@ -225,7 +225,7 @@ private void OnCharSelectionInfoReceive(byte[] data)
                 GameManager.Instance.NotifyEvent(GameEvent.AUTH_ALLOWED);
             });
         }
-        else if (GameManager.Instance.State == GameState.CHAR_SELECT)
+        else if (GameManager.Instance.State == GameState.CHAR_SELECT || GameManager.Instance.State == GameState.CHAR_CREATION)
         {
             EventProcessor.Instance.QueueEvent(() =>
             {

diff --git a/l2-unity/Assets/Scripts/UI/L2Window.cs b/l2-unity/Assets/Scripts/UI/L2Window.cs
@@ -57,7 +57,6 @@ protected virtual void InitWindow(VisualElement root)
 
     public virtual void HideWindow(bool silent)
     {
-        Debug.LogWarning("HideWindow: " + silent);
         _isWindowHidden = true;
         _windowEle.style.display = DisplayStyle.None;
         _mouseOverDetection.Disable();
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,6 +155,7 @@ public void SelectCharacter(int slot) @@
                 {
                     L2ConfirmWindow.Instance.ShowWindow(1555, () =>
                     {
+                        GameClient.Instance.ClientPacketHandler.SendRequestRestoreCharacter(slot);
                     },
                     () =>
                     {
@@ Expand Down @@