From 6f7861376c2fa4b86a1596f82bababf526de5ab3 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 21 十二月 2018 18:10:25 +0800 Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（流程调通版，可匹配、PK、结算，其他功能没有） --- ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini | 6 +++--- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0 CoreServerGroup/GameServer/Script/PyGameData.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc | 0 CoreServerGroup/GameServer/Script/NetPackCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetPlayerAttr.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc | 0 CoreServerGroup/GameServer/ServerCommScript.ini | 10 +++++----- CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKOverInfo.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 40 ++++++++++++++++++++++++++++------------ CoreServerGroup/GameServer/Script/GM/GMShell.pyc | 0 CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0 27 files changed, 36 insertions(+), 20 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc index 67897c7..ac41f35 100644 --- a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc +++ b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc new file mode 100644 index 0000000..e4acd0b --- /dev/null +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc new file mode 100644 index 0000000..63a1540 --- /dev/null +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc index dae89c7..ecec5e0 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc index a7cead8..24a330e 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/NetPackCommon.pyc b/CoreServerGroup/GameServer/Script/NetPackCommon.pyc index efa58df..248b34f 100644 --- a/CoreServerGroup/GameServer/Script/NetPackCommon.pyc +++ b/CoreServerGroup/GameServer/Script/NetPackCommon.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc index 12c8cb3..670ba25 100644 --- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc +++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc new file mode 100644 index 0000000..f3582d9 --- /dev/null +++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc index e200375..d0f950f 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc index 624ee68..84537f9 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc index 20152be..16357d5 100644 --- a/CoreServerGroup/GameServer/Script/PyGameData.pyc +++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/ServerCommScript.ini b/CoreServerGroup/GameServer/ServerCommScript.ini index 9ca368e..dba229f 100644 --- a/CoreServerGroup/GameServer/ServerCommScript.ini +++ b/CoreServerGroup/GameServer/ServerCommScript.ini @@ -114,15 +114,15 @@ PacketSubCMD_1=0x4 PacketCallFunc_1=GetDGDBOperResultInfo -[MergeBroadCast] -ScriptName = Player\MergeBroadCastRecive.py -Writer = wdb -Releaser = wdb +[CrossRealmMsg] +ScriptName = GameWorldLogic\CrossRealmMsg.py +Writer = hxp +Releaser = hxp RegType = 0 RegisterPackCount = 1 PacketCMD_1=0x4 PacketSubCMD_1=0x5 -PacketCallFunc_1=OnMergeBroadCastPack +PacketCallFunc_1=OnClientServerReceiveMsg ;家族 [PlayerFamily] diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini index 8a31ebd..b0859b9 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini @@ -368,9 +368,9 @@ PacketSubCMD_8=0x03 PacketCallFunc_8=PySetAdult -PacketCMD_9=0xC1 -PacketSubCMD_9=0x03 -PacketCallFunc_9=ClientPlayerGetReward +PacketCMD_9= +PacketSubCMD_9= +PacketCallFunc_9= PacketCMD_10=0xB4 PacketSubCMD_10=0x04 @@ -551,21 +551,37 @@ PacketCallFunc_2 = OnGetManorWarDailyAward -;跨服匹配PK -[PlayerMergePK] -ScriptName = Player\PlayerMergePK.py +;跨服PK竞技场 +[PlayerCrossRealmPK] +ScriptName = Player\PlayerCrossRealmPK.py Writer = hxp Releaser = hxp RegType = 0 -RegisterPackCount = 2 +RegisterPackCount = 3 PacketCMD_1=0xC1 -PacketSubCMD_1=0x09 -PacketCallFunc_1=OnRequestMergePK +PacketSubCMD_1=0x01 +PacketCallFunc_1=OnCrossRealmPKMatch -PacketCMD_2=0xC1 -PacketSubCMD_2=0x10 -PacketCallFunc_2=OnRequestRecoverMergePKWin +PacketCMD_1=0xC1 +PacketSubCMD_1=0x02 +PacketCallFunc_1=OnCrossRealmPKBuy + +PacketCMD_1=0xC1 +PacketSubCMD_1=0x03 +PacketCallFunc_1=OnCrossRealmPKGetAward + +;跨服玩家 +[CrossRealmPlayer] +ScriptName = Player\CrossRealmPlayer.py +Writer = hxp +Releaser = hxp +RegType = 0 +RegisterPackCount = 1 + +PacketCMD_1=0xC1 +PacketSubCMD_1=0x04 +PacketCallFunc_1=OnExitCrossRealm ;王者争霸 [PlayerMergeKing] diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 626b6a0..6ab0762 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc index 8aa9a88..1dee0e0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc index 9a3d516..efab8af 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc new file mode 100644 index 0000000..37aa54f --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc index 5cb9653..9a3137a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc index 34ff8a4..f4a93de 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc new file mode 100644 index 0000000..723204f --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index 8e1e756..85b7047 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc new file mode 100644 index 0000000..bbd5554 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc index 0c43ef1..a2266e7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKOverInfo.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKOverInfo.pyc new file mode 100644 index 0000000..65e32a5 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKOverInfo.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc new file mode 100644 index 0000000..807e5a3 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetPlayerAttr.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetPlayerAttr.pyc new file mode 100644 index 0000000..8d2ec63 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetPlayerAttr.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini index 4a60daf..14ded03 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini @@ -174,9 +174,9 @@ PacketCallFunc_1=GameSever_PlayerCountByCountry [PlayerMergeWar] -ScriptName = Player\RemoteQuery\GY_Query_MergeWarRegister.py -Writer = wdb -Releaser = wdb +ScriptName = Player\RemoteQuery\GY_Query_CrossRealmReg.py +Writer = hxp +Releaser = hxp RegType = 0 RegisterPackCount = 1 PacketCMD_1=0x9 -- Gitblit v1.8.0