Merge branch 'develop' into feature/hp_pet

# Conflicts:
#	Assets/PerfectWorld/Prefab/UIManager.prefab
#	Assets/PerfectWorld/Resources/UI/DialogScriptTableObject.asset
#	Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
#	Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
#	Assets/PerfectWorld/Scripts/Players/EC_HostMsg.cs
#	Assets/Scripts/CECHostPlayer.cs
This commit is contained in:
Tungdv
2026-02-26 16:39:23 +07:00
8020 changed files with 5298993 additions and 22099 deletions
@@ -599,6 +599,14 @@ namespace BrewMonster.Network
{
Instance._gameSession.c2s_SendCmdTeamInvite(idPlayer);
}
public static void c2s_CmdDuelRequest(int idTarget)
{
Instance._gameSession.c2s_SendCmdDuelRequest(idTarget);
}
public static void c2s_CmdDuelReply(bool accept, int idInviter)
{
Instance._gameSession.c2s_SendCmdDuelReply(accept, idInviter);
}
public static void c2s_CmdTeamKickMember(int idMember)
{
Instance._gameSession.c2s_SendCmdTeamKickMember(idMember);
@@ -763,11 +771,14 @@ namespace BrewMonster.Network
{
Instance._gameSession.c2s_CmdNPCSevClearEmbeddedChip(iEquipIdx, tidEquip);
}
public static void c2s_CmdPetRecall()
{
Instance._gameSession.c2s_SendCmdPetRecall();
}
public static void c2s_CmdDebug(ushort icmd, int param1 = int.MinValue)
{
Instance._gameSession.c2s_CmdDebug(icmd, param1);
}
}
/// <summary>