From 5685e4d493ef5b7570bc20b6037fc2c8603cab85 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 二月 2019 14:41:57 +0800
Subject: [PATCH] 6211 【后端】【1.6】合服任务单(删除旧合服相关内容)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 9cece86..bf03415 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -42,7 +42,6 @@
 import PlayerUniversalGameRec
 import PlayerFamily
 import GameWorldOpenServerCampaign
-import GameWorldMixServerCampaign
 import ShareDefine
 import GameDataRecord
 import GameWorldShopItem
@@ -543,17 +542,6 @@
         PlayerBillboard.MapServer_UpdateTotalRechargeBillboard(eval(resultName))
         return
     
-    if callName == 'UpdMSRechargeRankBillboard':    #地图服务器更新玩家合服活动充值总数排行榜
-        PlayerBillboard.MapServer_UpdMSRechargeRankBillboard(eval(resultName))
-        return
-    
-    if callName == 'UpdMSFamilyKillBossBillboard':    #地图服务器更新玩家合服活动战盟击杀boss总数排行榜
-        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
-        if not curPlayer:
-            return
-        GameWorldMixServerCampaign.UpdMixCampaignFamiliyBossCnt(curPlayer, eval(resultName))
-        return
-    
     if callName == 'ExitExam': #地图服务器玩家退出答题
         PlayerExam.MapServer_ExitAction(srcPlayerID)
         return
@@ -899,11 +887,6 @@
     if callName == 'SendInviteCode':
         #邀请码验证回复
         resultName = PlayerRecall.PlayerRecall_InviteCode(srcPlayerID, pack.GetQueryID())
-        
-    if callName == 'MixServerCampaignAward':
-        #可否领取合服活动奖励
-        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
-        resultName = '%s' % GameWorldMixServerCampaign.CanGiveMixCampaignAward(curPlayer, eval(resultName))
     
     if callName == 'OpenServerCampaignAward':
         #可否领取开服活动奖励

--
Gitblit v1.8.0