From 03f617028885a2e8840500bb520f3418d54eb791 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 30 一月 2019 18:09:20 +0800
Subject: [PATCH] 2968 【1.6】本服打boss,中途传送到跨服,未清空本服归属

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index e32b133..bac4ef9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -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':

--
Gitblit v1.8.0