From 2015dbf73e06cb8dadd06bbfe8491575bfd00877 Mon Sep 17 00:00:00 2001
From: HungDK <>
Date: Thu, 12 Mar 2026 20:58:29 +0700
Subject: [PATCH 01/16] Add PROTOCOL_ADDFRIEND and enable add friend request
---
.../Prefab/UI/PlayerOptionPopup.prefab | 2 +-
.../Scripts/Network/CSNetwork/GameSession.cs | 76 ++++++++++++++++++-
.../Scripts/Network/CSNetwork/OctetsStream.cs | 17 +++++
.../CSNetwork/Protocols/addfriend_re.cs | 43 +++++++++++
.../CSNetwork/Protocols/addfriend_re.cs.meta | 2 +
.../CSNetwork/Protocols/addfriendrqst.cs | 42 ++++++++++
.../CSNetwork/Protocols/addfriendrqst.cs.meta | 2 +
.../Protocols/rpcdata/GFriendInfo.cs | 32 ++++++++
.../Protocols/rpcdata/GFriendInfo.cs.meta | 2 +
.../Scripts/Network/UnityGameSession.cs | 35 ++++++++-
.../Scripts/UI/Dialogs/DlgPlayerOptions.cs | 4 +-
.../Scripts/UI/Login/LoginScreenUI.cs | 1 +
12 files changed, 253 insertions(+), 5 deletions(-)
create mode 100644 Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs
create mode 100644 Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs.meta
create mode 100644 Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs
create mode 100644 Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs.meta
create mode 100644 Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs
create mode 100644 Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs.meta
diff --git a/Assets/PerfectWorld/Prefab/UI/PlayerOptionPopup.prefab b/Assets/PerfectWorld/Prefab/UI/PlayerOptionPopup.prefab
index d432d82ba0..c71763bd99 100644
--- a/Assets/PerfectWorld/Prefab/UI/PlayerOptionPopup.prefab
+++ b/Assets/PerfectWorld/Prefab/UI/PlayerOptionPopup.prefab
@@ -509,7 +509,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
- m_Interactable: 0
+ m_Interactable: 1
m_TargetGraphic: {fileID: 3492245093881047436}
m_OnClick:
m_PersistentCalls:
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
index 319935be24..c02d9adfa7 100644
--- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
@@ -51,6 +51,12 @@ namespace CSNetwork
/// Raised when server sends PROTOCOL_PLAYERLOGOUT(69).
public event Action PlayerLogoutReceived;
+ /// Raised when server sends RPC_ADDFRIENDRQST(204) — another player wants to add you as friend. Args: srcroleid, askerName.
+ public event Action FriendRequestReceived;
+
+ /// Raised when server sends PROTOCOL_ADDFRIEND_RE(203). Args: retcode (0=success), message.
+ public event Action AddFriendResultReceived;
+
/// Raised when the underlying network disconnects.
public event Action Disconnected;
@@ -587,6 +593,14 @@ namespace CSNetwork
}
break;
+ case ProtocolType.RPC_ADDFRIENDRQST:
+ OnAddFriendRqst((addfriendrqst)protocol);
+ break;
+
+ case ProtocolType.PROTOCOL_ADDFRIEND_RE:
+ OnAddFriendRe((addfriend_re)protocol);
+ break;
+
default:
_logger.Log(LogType.Warning, $"Received unhandled protocol type: {protocol.GetPType()}");
break;
@@ -601,6 +615,43 @@ namespace CSNetwork
// PostToUnityContext(() => PlayerLogoutReceived?.Invoke(protocol));
}
+ private void OnAddFriendRqst(addfriendrqst p)
+ {
+ string askerName = "";
+ if (p.Srcname != null && p.Srcname.Size > 0)
+ askerName = System.Text.Encoding.Unicode.GetString(p.Srcname.ToArray(), 0, p.Srcname.Size);
+ PostToUnityContext(() => FriendRequestReceived?.Invoke(p.Srcroleid, askerName));
+ }
+
+ private void OnAddFriendRe(addfriend_re p)
+ {
+ string friendName = "";
+ if (p.info?.name != null && p.info.name.Size > 0)
+ friendName = System.Text.Encoding.Unicode.GetString(p.info.name.ToArray(), 0, p.info.name.Size);
+ string msg = p.retcode == 0
+ ? $"Add friend success: {friendName}"
+ : $"Add friend failed: {GetAddFriendRetcodeMessage(p.retcode)}";
+ PostToUnityContext(() => AddFriendResultReceived?.Invoke(p.retcode, msg));
+ }
+
+ /// FS_ERR server retcodes for addfriend_re.
+ private static string GetAddFriendRetcodeMessage(byte retcode)
+ {
+ switch (retcode)
+ {
+ case 0: return "Success";
+ case 1: return "Player is offline";
+ case 2: return "Request was refused";
+ case 3: return "Timeout";
+ case 4: return "No remaining space";
+ case 5: return "Not found";
+ case 6: return "Invalid parameter";
+ case 7: return "Duplicate entry";
+ case 8: return "Friend list has not been retrieved yet";
+ default: return $"retcode={retcode}";
+ }
+ }
+
// void CECGameSession::OnPrtcPlayerLogout(GNET::Protocol* pProtocol)
// {
// using namespace GNET;
@@ -2039,6 +2090,29 @@ namespace CSNetwork
SendProtocol(g);
}
+ /// Send PROTOCOL_ADDFRIEND(202). Port of CECGameSession::friend_Add(idPlayer, szName).
+ public void Friend_Add(int idPlayer, string name)
+ {
+ var p = new addfriend();
+ p.Srcroleid = m_iCharID;
+ p.Dstroleid = idPlayer;
+ if (!string.IsNullOrEmpty(name))
+ p.Dstname = new Octets(System.Text.Encoding.Unicode.GetBytes(name));
+ else
+ p.Dstname = new Octets();
+ p.Srclsid = (int)_localsid;
+ SendProtocol(p);
+ }
+
+ /// Send PROTOCOL_GETFRIENDS(206). Port of CECGameSession::friend_GetList().
+ public void Friend_GetList()
+ {
+ var p = new getfriends();
+ p.Roleid = m_iCharID;
+ p.Localsid = (int)_localsid;
+ SendProtocol(p);
+ }
+
public void c2s_SendCmdTeamKickMember(int idMember)
{
var g = new gamedatasend();
@@ -2047,7 +2121,7 @@ namespace CSNetwork
}
public void c2s_SendCmdTeamLeaveParty()
- {
+ {
var g = new gamedatasend();
g.Data = C2SCommandFactory.CreateTeamLeavePartyCommand();
SendProtocol(g);
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/OctetsStream.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/OctetsStream.cs
index 5e9d7affe4..24402c1b0b 100644
--- a/Assets/PerfectWorld/Scripts/Network/CSNetwork/OctetsStream.cs
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/OctetsStream.cs
@@ -109,6 +109,23 @@ namespace CSNetwork
_position += 4;
}
+ /// Write int32 in little-endian (for GNET protocol compatibility with C++ client/server).
+ public void WriteInt32LE(int value)
+ {
+ var bytes = BitConverter.GetBytes(value);
+ _octets.Insert(_position, bytes);
+ _position += 4;
+ }
+
+ /// Read int32 in little-endian (for GNET protocol compatibility with C++ client/server).
+ public int ReadInt32LE()
+ {
+ if (_position + 4 > _octets.Length)
+ throw new IndexOutOfRangeException("Attempt to read beyond the end of the stream.");
+ var bytes = ReadBytes(4);
+ return BitConverter.ToInt32(bytes, 0);
+ }
+
public void Write(float value)
{
var bytes = BitConverter.GetBytes(value);
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs
new file mode 100644
index 0000000000..778976ce52
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs
@@ -0,0 +1,43 @@
+using CSNetwork.Protocols.RPCData;
+
+namespace CSNetwork.Protocols
+{
+ /// PROTOCOL_ADDFRIEND_RE(203). Port of GNET::AddFriend_Re (inl/addfriend_re).
+ public class addfriend_re : Protocol
+ {
+ public byte retcode { get; set; }
+ public GFriendInfo info { get; set; }
+ public uint srclsid { get; set; }
+
+ public addfriend_re() : base(ProtocolType.PROTOCOL_ADDFRIEND_RE)
+ {
+ info = new GFriendInfo();
+ }
+
+ public override Protocol Clone() => new addfriend_re
+ {
+ retcode = retcode,
+ info = info != null ? new GFriendInfo { rid = info.rid, cls = info.cls, gid = info.gid, name = new Octets(info.name?.ToArray() ?? System.Array.Empty()) } : new GFriendInfo(),
+ srclsid = srclsid
+ };
+
+ public override void Marshal(OctetsStream os)
+ {
+ os.Write(retcode);
+ if (info != null) info.Marshal(os); else new GFriendInfo().Marshal(os);
+ os.Write(srclsid);
+ }
+
+ public override void Unmarshal(OctetsStream os)
+ {
+ retcode = os.ReadByte();
+ info = new GFriendInfo();
+ info.Unmarshal(os);
+ srclsid = os.ReadUInt32();
+ }
+
+ public override int PriorPolicy() => 1;
+
+ public override bool SizePolicy(int size) => size <= 128;
+ }
+}
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs.meta b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs.meta
new file mode 100644
index 0000000000..8c52d27971
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriend_re.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 158e35cf46fa51a4cba4fa7485fdb534
\ No newline at end of file
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs
new file mode 100644
index 0000000000..09c5142f92
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs
@@ -0,0 +1,42 @@
+using System;
+
+namespace CSNetwork.Protocols
+{
+ /// RPC_ADDFRIENDRQST(204). Port of GNET AddFriendRqstArg; server notifies target of friend request.
+ public class addfriendrqst : Protocol
+ {
+ public int Srcroleid { get; set; }
+ public Octets Srcname { get; set; }
+ public uint Dstlsid { get; set; }
+
+ public addfriendrqst() : base(ProtocolType.RPC_ADDFRIENDRQST)
+ {
+ Srcname = new Octets();
+ }
+
+ public override Protocol Clone() => new addfriendrqst
+ {
+ Srcroleid = Srcroleid,
+ Srcname = new Octets(Srcname.ToArray()),
+ Dstlsid = Dstlsid
+ };
+
+ public override void Marshal(OctetsStream os)
+ {
+ os.Write(Srcroleid);
+ os.Write(Srcname);
+ os.Write(Dstlsid);
+ }
+
+ public override void Unmarshal(OctetsStream os)
+ {
+ Srcroleid = os.ReadInt32();
+ Srcname = os.ReadOctets();
+ Dstlsid = os.ReadUInt32();
+ }
+
+ public override int PriorPolicy() => 1;
+
+ public override bool SizePolicy(int size) => size <= 256;
+ }
+}
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs.meta b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs.meta
new file mode 100644
index 0000000000..d935487cb5
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/addfriendrqst.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: bf82fc1afd675674588f017b6f9e0621
\ No newline at end of file
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs
new file mode 100644
index 0000000000..c592b4b9f8
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs
@@ -0,0 +1,32 @@
+namespace CSNetwork.Protocols.RPCData
+{
+ /// Port of GNET::GFriendInfo (rpcdata/gfriendinfo).
+ public class GFriendInfo : IMarshallable
+ {
+ public int rid;
+ public byte cls;
+ public byte gid;
+ public Octets name;
+
+ public GFriendInfo()
+ {
+ name = new Octets();
+ }
+
+ public void Marshal(OctetsStream os)
+ {
+ os.Write(rid);
+ os.Write(cls);
+ os.Write(gid);
+ os.Write(name ?? new Octets());
+ }
+
+ public void Unmarshal(OctetsStream os)
+ {
+ rid = os.ReadInt32();
+ cls = os.ReadByte();
+ gid = os.ReadByte();
+ name = os.ReadOctets();
+ }
+ }
+}
diff --git a/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs.meta b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs.meta
new file mode 100644
index 0000000000..0a4b947df7
--- /dev/null
+++ b/Assets/PerfectWorld/Scripts/Network/CSNetwork/Protocols/rpcdata/GFriendInfo.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a0bf31ab9d8853a479215aa7e1fa5e94
\ No newline at end of file
diff --git a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
index 01a1120f31..4c3501d56f 100644
--- a/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
+++ b/Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
@@ -173,7 +173,9 @@ namespace BrewMonster.Network
// Subscribe to unexpected disconnects
_gameSession.Disconnected += OnUnexpectedDisconnect;
-
+ _gameSession.FriendRequestReceived += OnFriendRequestReceived;
+ _gameSession.AddFriendResultReceived += OnAddFriendResultReceived;
+
_isInitialized = true;
DontDestroyOnLoad(gameObject);
@@ -184,6 +186,8 @@ namespace BrewMonster.Network
// Tell LoginScene what to show next.
LogoutFlowState.NextLoginEntry = entryTarget;
_gameSession.Disconnected -= OnUnexpectedDisconnect;
+ _gameSession.FriendRequestReceived -= OnFriendRequestReceived;
+ _gameSession.AddFriendResultReceived -= OnAddFriendResultReceived;
EC_ManMessageMono.Instance.CECNPCMan.Release();
if (clearSavedCreds)
@@ -619,6 +623,16 @@ namespace BrewMonster.Network
{
Instance._gameSession.c2s_SendCmdDuelReply(accept, idInviter);
}
+ /// Send PROTOCOL_ADDFRIEND(202). Port of CECGameSession::friend_Add.
+ public static void Friend_Add(int idPlayer, string name)
+ {
+ Instance._gameSession.Friend_Add(idPlayer, name ?? "");
+ }
+ /// Send PROTOCOL_GETFRIENDS(206). Port of CECGameSession::friend_GetList().
+ public static void Friend_GetList()
+ {
+ Instance._gameSession.Friend_GetList();
+ }
public static void c2s_CmdTeamKickMember(int idMember)
{
Instance._gameSession.c2s_SendCmdTeamKickMember(idMember);
@@ -694,6 +708,25 @@ namespace BrewMonster.Network
///
/// Handles unexpected server disconnections. Shows a message box and returns to login.
///
+ private void OnFriendRequestReceived(int srcroleid, string askerName)
+ {
+ string name = string.IsNullOrEmpty(askerName) ? ("Player " + srcroleid) : askerName;
+ CECUIManager.Instance?.ShowMessageBox(
+ title: "Friend Request",
+ message: $"{name} wants to add you as a friend.",
+ messageBoxType: MessageBoxType.BothYesNoButton,
+ onClickedYes: () => { /* TODO: accept and call friend_AddResponse */ },
+ onClickedNo: () => { /* TODO: refuse */ });
+ }
+
+ private void OnAddFriendResultReceived(byte retcode, string message)
+ {
+ CECUIManager.Instance?.ShowMessageBox(
+ title: retcode == 0 ? "Friend added" : "Add friend failed",
+ message: message,
+ messageBoxType: MessageBoxType.YesButton);
+ }
+
private void OnUnexpectedDisconnect()
{
// If this was an intentional disconnect (logout), skip UI
diff --git a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPlayerOptions.cs b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPlayerOptions.cs
index 0d341b9901..9c6c348d21 100644
--- a/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPlayerOptions.cs
+++ b/Assets/PerfectWorld/Scripts/UI/Dialogs/DlgPlayerOptions.cs
@@ -78,8 +78,8 @@ namespace BrewMonster.UI
void OnAddFriend(int characterId)
{
- Debug.Log("OnAddFriend: " + characterId);
- // TODO: c2s add friend when available
+ string name = EC_ManMessageMono.Instance?.GetECManPlayer?.GetElsePlayer(characterId)?.GetName() ?? "";
+ UnityGameSession.Friend_Add(characterId, name);
}
void OnDuel(int characterId)
diff --git a/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs b/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
index 0fbd136d8b..85014f61e4 100644
--- a/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
+++ b/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs
@@ -370,6 +370,7 @@ namespace BrewMonster.UI
await Task.Delay(1000);
UnityGameSession.RequestCheckSecurityPassWd("");
await Task.Delay(1000);
+ UnityGameSession.Friend_GetList(); // C++ friend_GetList(); required before Add Friend
}
//private void OnInventoryReceived(List inventoryData)
From b26ca5c56ee9c63edd0a61e62607374cebf9e48a Mon Sep 17 00:00:00 2001
From: Tungdv