From cdb5d93a9fd7b32a2ed178feed4eee20ee6502e5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 11 二月 2019 15:41:24 +0800
Subject: [PATCH] 5940 【后端】【1.6】跨服PK奖励配置规则优化

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 9f9af8b..9cece86 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -340,7 +340,7 @@
     ## 收到子服请求查看跨服地图NPC个数信息
     
     mapID = msgData["MapID"]
-    zoneIpyData = CrossRealmPlayer.GetServerCrossZoneIpyData(mapID, serverGroupID)
+    zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(mapID, serverGroupID)
     if not zoneIpyData:
         return
     realMapID = zoneIpyData.GetMapID()
@@ -509,9 +509,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":
@@ -748,8 +748,8 @@
         return
     
     #生成仙盟红包
-    if callName == 'CreatFamilyRedPacket':
-        PlayerFamilyRedPacket.CreatFamilyRedPacket(eval(resultName))
+    if callName == "MapServer_CreatRedPacket":
+        PlayerFamilyRedPacket.MapServer_CreatRedPacket(eval(resultName))
         return
     #发仙盟红包
     if callName == 'SendFamilyRedPacket':
@@ -852,11 +852,7 @@
     if callName =="AddBossRebornPoint":
         GameWorldBoss.AddBossRebornPoint(eval(resultName))
         return
-    #通知神兽副本NPC刷新时间
-    if callName =="DogzNPCTime":
-        PyGameData.g_dogzNPCRefreshTimeDict = eval(resultName)
-        GameWorldBoss.Sync_DogzNPCRefreshTime()
-        return
+    
 #---return分割线-----------------------------------------------------------------
 
     

--
Gitblit v1.8.0