From 02a9f1326fd99fc60ee14c70bb55d714803607f0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 08 七月 2019 15:25:56 +0800
Subject: [PATCH] 4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服,回来后归属不会清,boss不会回血

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
index e71da50..1d267d8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
@@ -28,7 +28,6 @@
 import CrossRealmMsg
 import ChNetSendPack
 import NetPackCommon
-import cPickle
 import PlayerGeTui
 import re
 
@@ -89,7 +88,7 @@
     curCache = None
     tagPlayerName = ""
     if tagPlayer == None:
-        curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID)
+        curCache = PlayerViewCache.FindViewCache(tagPlayerID)
         if not curCache:
             PlayerControl.NotifyCode(curPlayer, "CanootTalk10")
             return
@@ -101,7 +100,7 @@
         return
     
     if curCache:
-        cacheDict = cPickle.loads(curCache.GetPropData())
+        cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)
         tagPlayerName = cacheDict["Name"]
         
     talkType = sendPack.GetTalkType()
@@ -185,7 +184,7 @@
 
 def ClientServerMsg_ChatCrossWorld(serverGroupID, msgData, tick):
     ## 收到子服跨服世界频道聊天
-    zoneIpyData = CrossRealmPlayer.GetCrossCommZoneIpyDataByServerGroupID(serverGroupID)
+    zoneIpyData = CrossRealmPlayer.GetCrossZoneIpyDataByServerGroupID(0, serverGroupID)
     if not zoneIpyData:
         return
     serverGroupIDList = zoneIpyData.GetServerGroupIDList()

--
Gitblit v1.8.0