duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/produce-equipment' of https://git.brew.monster/Unity/perfect-world-unity into feature/produce-equipment

Browse Source
This commit is contained in:
VuNgocHaiC7
2026-01-16 17:29:09 +07:00
parent 2f6e3c751d 3aca254fd4
commit 185cc451e5
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/PerfectWorld/Scripts/Network/CSNetwork/C2SCommand/C2SCommandFactory.cs
+7 -7
View File
@@ -366,7 +366,7 @@ namespace CSNetwork.C2SCommand
};
return SerializeCommand(CommandID.PICKUP, cmd);
}
public static Octets CreateCheckSecurityPassWd(string password)
public static Octets c2s_SendCmdOpenFashionTrash(string password)
{
// Calculate password length (similar to C++ strlen)
uint passwdSize = 0;
@@ -391,11 +391,11 @@ namespace CSNetwork.C2SCommand
return octets;
}
public static Octets CreateQueryPlayerCash()
public static Octets c2s_SendCmdQueryCashInfo()
{
return SerializeCommand(CommandID.QUERY_CASH_INFO);
}
public static Octets CreateEquipItem(byte iIvtrIdx, byte iEquipIdx)
public static Octets c2s_SendCmdEquipItem(byte iIvtrIdx, byte iEquipIdx)
{
var cmd = new CMD_EquipItem
{
@@ -405,7 +405,7 @@ namespace CSNetwork.C2SCommand
return SerializeCommand(CommandID.EQUIP_ITEM, cmd);
}
public static Octets CreateGetInventoryDetail(byte byPackage)
public static Octets c2s_SendCmdGetIvtrDetailData(byte byPackage)
{
var cmd = new CMD_GetInventoryDetail
{
@@ -414,7 +414,7 @@ namespace CSNetwork.C2SCommand
return SerializeCommand(CommandID.GET_IVTR_DETAIL, cmd);
}
public static Octets CreateReviveBase(int param)
public static Octets c2s_SendCmdReviveVillage(int param)
{
var cmd = new cmd_revive
{
@@ -422,7 +422,7 @@ namespace CSNetwork.C2SCommand
};
return SerializeCommand(CommandID.REVIVE_VILLAGE, cmd);
}
public static Octets CreateReviveItem(int param)
public static Octets c2s_SendCmdReviveItem(int param)
{
var cmd = new cmd_revive
{
@@ -763,7 +763,7 @@ namespace CSNetwork.C2SCommand
return SerializeCommand(CommandID.AUTO_TEAM_SET_GOAL, pCmd);
}
public static Octets c2s_CmdGatherMaterial(int idMatter, int iToolPack, int iToolIdx, int idTool, int idTask)
public static Octets c2s_SendCmdGatherMaterial(int idMatter, int iToolPack, int iToolIdx, int idTool, int idTask)
{
var cmd = new cmd_gather_material
{
Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs
+16 -16
View File
@@ -223,64 +223,64 @@ namespace CSNetwork
SendProtocol(gamedatasendRequest);
}
public void RequestInventoryAsync(byte byPackage, Action callback)
public void c2s_SendCmdGetIvtrDetailData(byte byPackage, Action callback)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = CSNetwork.C2SCommand.C2SCommandFactory.CreateGetInventoryDetail(byPackage);
gamedatasendRequest.Data = CSNetwork.C2SCommand.C2SCommandFactory.c2s_SendCmdGetIvtrDetailData(byPackage);
SendProtocol(gamedatasendRequest, callback);
}
public void RequestQueryPlayerCash()
public void c2s_SendCmdQueryCashInfo()
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = C2SCommandFactory.CreateQueryPlayerCash();
gamedatasendRequest.Data = C2SCommandFactory.c2s_SendCmdQueryCashInfo();
SendProtocol(gamedatasendRequest);
}
public void RequestCheckSecurityPassWd(string password)
public void c2s_SendCmdOpenFashionTrash(string password)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = C2SCommandFactory.CreateCheckSecurityPassWd(password);
gamedatasendRequest.Data = C2SCommandFactory.c2s_SendCmdOpenFashionTrash(password);
SendProtocol(gamedatasendRequest);
}
public void RequestEquipItem(byte iIvtrIdx, byte iEquipIdx, Action callback)
public void c2s_SendCmdEquipItem(byte iIvtrIdx, byte iEquipIdx, Action callback)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = CSNetwork.C2SCommand.C2SCommandFactory.CreateEquipItem(iIvtrIdx, iEquipIdx);
gamedatasendRequest.Data = CSNetwork.C2SCommand.C2SCommandFactory.c2s_SendCmdEquipItem(iIvtrIdx, iEquipIdx);
SendProtocol(gamedatasendRequest, callback);
}
public void RequestReviveBase(int param = 0)
public void c2s_SendCmdReviveVillage(int param = 0)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = C2SCommandFactory.CreateReviveBase(param);
gamedatasendRequest.Data = C2SCommandFactory.c2s_SendCmdReviveVillage(param);
SendProtocol(gamedatasendRequest);
}
public void RequestReviveItem(int param = 0)
public void c2s_SendCmdReviveItem(int param = 0)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = C2SCommandFactory.CreateReviveBase(param);
gamedatasendRequest.Data = C2SCommandFactory.c2s_SendCmdReviveVillage(param);
SendProtocol(gamedatasendRequest);
}
public void RequestReviveByPlayer(int param = 0)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = C2SCommandFactory.CreateReviveBase(param);
gamedatasendRequest.Data = C2SCommandFactory.c2s_SendCmdReviveVillage(param);
SendProtocol(gamedatasendRequest);
}
public void RequestMallShopping(uint count, CMD_MallShopping.goods[] goodsArray)
public void c2s_SendCmdMallShopping(uint count, CMD_MallShopping.goods[] goodsArray)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = CSNetwork.C2SCommand.C2SCommandFactory.CreateGetMallShopping(count, goodsArray);
SendProtocol(gamedatasendRequest);
}
public void c2s_CmdGatherMaterial(int idMatter, int iToolPack, int idToolIndex, int idTool, int idTask)
public void c2s_SendCmdGatherMaterial(int idMatter, int iToolPack, int idToolIndex, int idTool, int idTask)
{
gamedatasend gamedatasendRequest = new gamedatasend();
gamedatasendRequest.Data = CSNetwork.C2SCommand.C2SCommandFactory.c2s_CmdGatherMaterial(idMatter, iToolPack, idToolIndex, idTool, idTask);
gamedatasendRequest.Data = CSNetwork.C2SCommand.C2SCommandFactory.c2s_SendCmdGatherMaterial(idMatter, iToolPack, idToolIndex, idTool, idTask);
SendProtocol(gamedatasendRequest);
}
Assets/PerfectWorld/Scripts/Network/UnityGameSession.cs
+8 -8
View File
@@ -180,11 +180,11 @@ namespace BrewMonster.Network
}
public static void RequestInventoryAsync(byte byPackage, Action callback = null)
{
Instance._gameSession.RequestInventoryAsync(byPackage, callback);
Instance._gameSession.c2s_SendCmdGetIvtrDetailData(byPackage, callback);
}
public static void RequesrQueryPlayerCash()
{
Instance._gameSession.RequestQueryPlayerCash();
Instance._gameSession.c2s_SendCmdQueryCashInfo();
}
public static void RequestDropEquipItem(byte index)
{
@@ -192,7 +192,7 @@ namespace BrewMonster.Network
}
public static void RequestEquipItemAsync(byte iIvtrIdx, byte iEquipIdx, Action callback = null)
{
Instance._gameSession.RequestEquipItem(iIvtrIdx, iEquipIdx, callback);
Instance._gameSession.c2s_SendCmdEquipItem(iIvtrIdx, iEquipIdx, callback);
}
public static void RequestPickupItem(int idItem, int tid)
{
@@ -208,7 +208,7 @@ namespace BrewMonster.Network
}
public static void RequestCheckSecurityPassWd(string password)
{
Instance._gameSession.RequestCheckSecurityPassWd(password);
Instance._gameSession.c2s_SendCmdOpenFashionTrash(password);
}
public static void c2s_SendCmdContinueAction()
{
@@ -216,11 +216,11 @@ namespace BrewMonster.Network
}
public static void RequestReviveBase()
{
Instance._gameSession.RequestReviveBase();
Instance._gameSession.c2s_SendCmdReviveVillage();
}
public static void RequestReviveItem()
{
Instance._gameSession.RequestReviveItem();
Instance._gameSession.c2s_SendCmdReviveItem();
}
public static void RequestReviveByPlayer()
{
@@ -238,7 +238,7 @@ namespace BrewMonster.Network
goods_pos = good_pos
}
};
Instance._gameSession.RequestMallShopping(count, goods);
Instance._gameSession.c2s_SendCmdMallShopping(count, goods);
}
public static void RequestAllInventoriesAsync(Action callback = null, params byte[] packages)
{
@@ -367,7 +367,7 @@ namespace BrewMonster.Network
}
public static void c2s_CmdGatherMaterial(int idMatter, int iToolPack, int idToolIndex, int idTool, int idTask)
{
Instance._gameSession.c2s_CmdGatherMaterial(idMatter, iToolPack, idToolIndex, idTool, idTask);
Instance._gameSession.c2s_SendCmdGatherMaterial(idMatter, iToolPack, idToolIndex, idTool, idTask);
}
#endregion