From 050d498578914bf03e6e8acec7fd68c29dce79c4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 24 一月 2019 11:59:09 +0800
Subject: [PATCH] 5995 【后端】【1.5.100】诛仙装备合成(不同背包合成支持)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index 72d7a71..d72f77f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -505,9 +505,13 @@
         CrossRealmMsg.SendMsgToClientServer(msgType, dataMsg, serverGroupIDList)
         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 == "SetCrossPlayerAttrValue":
+        CrossRealmPlayer.SetCrossPlayerAttrValue(eval(resultName), tick)
+        return
+    
+    if callName == 'CrossNotify':
+        serverGroupIDList, crossNotifyList = eval(resultName)
+        PlayerControl.CrossNotify(serverGroupIDList, crossNotifyList)
         return
     
     if callName == "CommMapServerInitOK":
@@ -848,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