From d66070c362f86a3330a3d10401e7f098e2d97d84 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 13 二月 2019 14:45:06 +0800 Subject: [PATCH] 6211 【后端】【1.6】合服任务单（删除旧合服相关内容） --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 CoreServerGroup/GameServer/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 6 +++--- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0 /dev/null | 0 CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0 CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc | 0 20 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc index 9ddd04e..9c5e73c 100644 --- a/CoreServerGroup/GameServer/Script/ChConfig.pyc +++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc index fa210ec..d79245f 100644 --- a/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc +++ b/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc index 9d557d1..1392e89 100644 --- a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc +++ b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc index ea49f15..f9dced4 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc deleted file mode 100644 index e17db36..0000000 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc index 5efe05d..dfed7ac 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc index a46c42b..164a0a0 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc index 0c91848..56e9b40 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc index c784da3..0415261 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc index 84cb5d7..2ac3c38 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index d7eb147..65c98db 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini index e8a63f4..2346b16 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini @@ -365,9 +365,9 @@ PacketSubCMD_5=0x26 PacketCallFunc_5=QueryFamilyArrestAwardReceiveState -PacketCMD_6 = 0xAF -PacketSubCMD_6 = 0x02 -PacketCallFunc_6 = GiveMixServerCampaignAward +PacketCMD_6= +PacketSubCMD_6= +PacketCallFunc_6= PacketCMD_7=0xA2 PacketSubCMD_7=0x13 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index ad1b44c..2b0d042 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/DataRecordPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc index fef5f03..575987d 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc index 9c23e0b..13c8911 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc index 476834b..be68fe7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.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 9c6059a..d04edf5 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/MixServerCampaign.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/MixServerCampaign.pyc deleted file mode 100644 index df0b586..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/MixServerCampaign.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc index 4b74c00..7b860d8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc index 8470c26..b2e11f3 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMixLoginDayAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMixLoginDayAward.pyc deleted file mode 100644 index 2e90ee1..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMixLoginDayAward.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MixServerCampaignAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MixServerCampaignAward.pyc deleted file mode 100644 index 6350f26..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MixServerCampaignAward.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index 70d2172..ba6767e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ -- Gitblit v1.8.0