hxp
2018-12-26 73df93408d0555e8037e533313af949c5e4a5ff6
5424 【后端】【1.4】跨服竞技场开发(删除旧跨服代码)
37个文件已修改
25个文件已删除
49 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PyNetPack.ini 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/DataRecordPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/EventReport.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/GMShell.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/ShareDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
CoreServerGroup/GameServer/Script/DataRecordPack.pyc
Binary files differ
CoreServerGroup/GameServer/Script/EventReport.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/GMShell.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc
Binary files differ
CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
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
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
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