From e6d0ada5c3569a7f60d83a9798de5d630dfe302b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 二月 2019 16:36:42 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单(查询封包修改)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index e32b133..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
@@ -340,7 +339,7 @@
     ## 收到子服请求查看跨服地图NPC个数信息
     
     mapID = msgData["MapID"]
-    zoneIpyData = CrossRealmPlayer.GetServerCrossZoneIpyData(mapID, serverGroupID)
+    zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(mapID, serverGroupID)
     if not zoneIpyData:
         return
     realMapID = zoneIpyData.GetMapID()
@@ -509,9 +508,9 @@
         CrossRealmPlayer.SetCrossPlayerAttrValue(eval(resultName), tick)
         return
     
-    if callName == 'MergeWorldNotify':
-        country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo = eval(resultName)
-        PlayerControl.MergeWorldNotify(country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo, 1)
+    if callName == 'CrossNotify':
+        serverGroupIDList, crossNotifyList = eval(resultName)
+        PlayerControl.CrossNotify(serverGroupIDList, crossNotifyList)
         return
     
     if callName == "CommMapServerInitOK":
@@ -541,17 +540,6 @@
     
     if callName == 'UpdateTotalRechargeBillboard':    #地图服务器更新玩家充值总数排行榜
         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': #地图服务器玩家退出答题
@@ -748,8 +736,8 @@
         return
     
     #生成仙盟红包
-    if callName == 'CreatFamilyRedPacket':
-        PlayerFamilyRedPacket.CreatFamilyRedPacket(eval(resultName))
+    if callName == "MapServer_CreatRedPacket":
+        PlayerFamilyRedPacket.MapServer_CreatRedPacket(eval(resultName))
         return
     #发仙盟红包
     if callName == 'SendFamilyRedPacket':
@@ -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