From 669ad215fec240afaf92be612f2b0077731c8e0f Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 26 十二月 2018 10:38:46 +0800 Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(删除旧跨服代码) --- ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 25 +------------------------ 1 files changed, 1 insertions(+), 24 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py index bd2ca70..deb04fc 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py @@ -46,7 +46,6 @@ import ShareDefine import GameDataRecord import GameWorldShopItem -import PlayerMergeRegister import PlayerCompensation import PlayerFB import UpdatePlayerName @@ -55,10 +54,7 @@ import GameWorldBoss import MergeBroadcast import GameWorldFamilyWar -import GameWorldMergeKing -import GameWorldMergePK #import PlayerFamilyTech -import MergeChildMsg import PlayerFamilyRedPacket import PlayerFBHelpBattle import PlayerFamilyStore @@ -537,20 +533,10 @@ operType, mapID, dataDict, isRepeat = eval(resultName) MergeBroadcast.SendBroadcastMerge(operType, mapID, dataDict, isRepeat) return - - #跨服赛报名获得新账号 - #if callName == 'MergeRegister': - # PlayerMergeRegister.MergeWarRegisterNewAcc(srcPlayerID, eval(resultName), tick) - # return - - #跨服王者争霸 - if callName == 'MergeKingFB': - GameWorldMergeKing.MapServer_MergeKingFB(eval(resultName)) - return #跨服匹配PK战斗结算 if callName == "CrossPKOver": - CrossRealmPK.MapServer_MergePKOver(eval(resultName)) + CrossRealmPK.MapServer_CrossPKOver(eval(resultName)) return #跨服匹配房间开启 @@ -852,15 +838,6 @@ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID) resultName = '%s' % GameWorldOpenServerCampaign.CanGiveCampaignAward(curPlayer, eval(resultName)) - # 跨服PK奖励 - if callName == 'MergePKAward': - curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID) - resultName = '%s' % GameWorldMergePK.MapServer_QueryMergePKAward(curPlayer, eval(resultName)) - - # 跨服王者争霸 - if callName == 'MergeKing': - curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID) - resultName = '%s' % GameWorldMergeKing.MapServer_MergeKingQuery(curPlayer, eval(resultName)) # 玩家自身战盟科技等级提升, 改为地图直接处理, 暂屏蔽 # if callName == 'PlayerFamilyTechLVUP': -- Gitblit v1.8.0