From 73df93408d0555e8037e533313af949c5e4a5ff6 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 26 十二月 2018 10:45:19 +0800 Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（删除旧跨服代码） --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 CoreServerGroup/GameServer/Script/DataRecordPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini | 2 +- CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 17 ----------------- CoreServerGroup/GameServer/Script/GM/GMShell.pyc | 0 CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc | 0 /dev/null | 0 CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc | 0 CoreServerGroup/GameServer/Script/EventReport.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc | 0 CoreServerGroup/GameServer/PyNetPack.ini | 30 ------------------------------ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.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/PlayerWing.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc | 0 38 files changed, 1 insertions(+), 48 deletions(-) diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini index fb7b0d9..2e4db7a 100644 --- a/CoreServerGroup/GameServer/PyNetPack.ini +++ b/CoreServerGroup/GameServer/PyNetPack.ini @@ -148,36 +148,6 @@ PacketSubCMD_2=0x08 PacketCallFunc_2=QueryFamilyActionInfo - -;跨服报名(上传数据) -[MergeRegister] -ScriptName = Player\PlayerMergeRegister.py -Writer = hxp -Releaser = hxp -RegType = 0 -RegisterPackCount = 2 - -PacketCMD_1=0xC0 -PacketSubCMD_1=0x11 -PacketCallFunc_1=MergeWarRegisterPack - -PacketCMD_2=0xC0 -PacketSubCMD_2=0x12 -PacketCallFunc_2=MergeWarAccQueryPack - -;跨服玩家 -[MergePlayer] -ScriptName = Player\MergePlayer.py -Writer = hxp -Releaser = hxp -RegType = 0 -RegisterPackCount = 1 - -PacketCMD_1=0xC0 -PacketSubCMD_1=0x15 -PacketCallFunc_1=OnGotoMergeServer - - ;排行榜 [PlayerBillboard] ScriptName = Player\PlayerBillboard.py diff --git a/CoreServerGroup/GameServer/Script/DataRecordPack.pyc b/CoreServerGroup/GameServer/Script/DataRecordPack.pyc index 2d651fc..d5be322 100644 --- a/CoreServerGroup/GameServer/Script/DataRecordPack.pyc +++ b/CoreServerGroup/GameServer/Script/DataRecordPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/EventReport.pyc b/CoreServerGroup/GameServer/Script/EventReport.pyc index f66b8a8..44da1a4 100644 --- a/CoreServerGroup/GameServer/Script/EventReport.pyc +++ b/CoreServerGroup/GameServer/Script/EventReport.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc deleted file mode 100644 index 39ffc9e..0000000 --- a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc deleted file mode 100644 index 2e63c1e..0000000 --- a/CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc deleted file mode 100644 index d81c3f5..0000000 --- a/CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc index ac41f35..d718aeb 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/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc index 3bb30d6..417edc0 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc index 64c16d4..c5dafe7 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/GameWorldAverageLv.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc index ced0c46..8f3fe59 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc deleted file mode 100644 index 69330a5..0000000 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc deleted file mode 100644 index ecec5e0..0000000 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc deleted file mode 100644 index 59641d7..0000000 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc index 2970bd3..e17db36 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc index 71f43c3..c5b0102 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/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc index 670ba25..b96a95e 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/MergeBroadCastRecive.pyc b/CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc deleted file mode 100644 index 990ac9e..0000000 --- a/CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc b/CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc deleted file mode 100644 index 80dbc5f..0000000 --- a/CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc index 5320a60..cd021e8 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc index 7d51837..11bd1aa 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/PlayerExam.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc index 6560caf..d4b47bb 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc index dd20299..8787b6b 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc deleted file mode 100644 index 20f99ef..0000000 --- a/CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc deleted file mode 100644 index ed6cd8d..0000000 --- a/CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc +++ /dev/null Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc index cc3b0e3..3c7e97d 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc index 495e6c8..734242b 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index 1be9eb4..51cb02d 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 387a425..9f1aafe 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini @@ -583,23 +583,6 @@ PacketSubCMD_1=0x04 PacketCallFunc_1=OnExitCrossRealm -;王者争霸 -[PlayerMergeKing] -ScriptName = Player\PlayerMergeKing.py -Writer = hxp -Releaser = hxp -RegType = 0 -RegisterPackCount = 2 - -PacketCMD_1=0xC1 -PacketSubCMD_1=0x11 -PacketCallFunc_1=Client_MergeKingSupport - -PacketCMD_2=0xC1 -PacketSubCMD_2=0x08 -PacketCallFunc_2=Client_MergeKingWorship - - ;改名功能 [UpdatePlayerName] ScriptName = Player\UpdatePlayerName.py diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc index 02b127b..375fa70 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc deleted file mode 100644 index 8d1e014..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc deleted file mode 100644 index 36c9713..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc +++ /dev/null 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 1dee0e0..e258fab 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/GameLogic_MergeBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc deleted file mode 100644 index 1702fb5..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc deleted file mode 100644 index 946d016..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc deleted file mode 100644 index e8f9216..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc index b837115..a8725da 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc index 7e736ef..866d730 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.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 bea416b..10597b5 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/PlayerArrestTask.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc index e6c4c70..df920c1 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.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 85b7047..40590ad 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 index 93d80ca..adc70d1 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc +++ 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 5f856d4..6e5c93f 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/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc index 4b6b228..496a903 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc deleted file mode 100644 index 055399d..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc deleted file mode 100644 index 976a24d..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc deleted file mode 100644 index 9640c01..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc index ab01aa9..29bc1c7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc index 138091c..7eebbf3 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc index fc82515..7f60061 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc index a3063aa..3392ab9 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc deleted file mode 100644 index 17142eb..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc deleted file mode 100644 index f686b34..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc deleted file mode 100644 index eb682e0..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc deleted file mode 100644 index b2ab1e5..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc deleted file mode 100644 index ebd70a0..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc deleted file mode 100644 index e5a2d8b..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc deleted file mode 100644 index dc70245..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc index 805cd5f..c98b65e 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc index cd277ed..42927dc 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index 4305bca..64f4e72 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc index f4d8e1f..e9d6207 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini index 14ded03..35cf95a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini @@ -173,7 +173,7 @@ PacketSubCMD_1=0x6 PacketCallFunc_1=GameSever_PlayerCountByCountry -[PlayerMergeWar] +[GY_Query_CrossRealmReg] ScriptName = Player\RemoteQuery\GY_Query_CrossRealmReg.py Writer = hxp Releaser = hxp -- Gitblit v1.8.0