From 589417118d8d9bb2c52ed00cdfeee1b9784ff060 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 28 一月 2019 20:55:47 +0800
Subject: [PATCH] 6118 【后端】【1.5.200】新增技能效果-- 宠物技能-宠物主人受到暴击伤害时触发技能

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index e32b133..d72f77f 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":

--
Gitblit v1.8.0