From 2a41f04515a5cc91e285cf00e9330dc035e26765 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 16 四月 2019 16:09:14 +0800
Subject: [PATCH] 3287 【2.0】娲皇遗迹S通关异常自动退出副本
---
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 11cd5dd..845d9f9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -28,8 +28,6 @@
import NetPackCommon
import IpyGameDataPY
import PyGameData
-import cPickle
-import json
# 获取玩家跨服服务器上的名字
#===============================================================================
# def GetCrossPlayerName(curPlayer):
@@ -62,6 +60,22 @@
crossZoneName = GameWorld.GetCrossZoneName()
ipyData = IpyGameDataPY.GetIpyGameDataNotLog("CrossZoneComm", crossZoneName, zoneID)
return ipyData
+
+def GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID):
+ ## 获取跨服分区
+ zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+ crossZoneName = GameWorld.GetCrossZoneName()
+ ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True)
+ if not ipyDataList:
+ return
+ for ipyData in ipyDataList:
+ serverGroupIDList = ipyData.GetServerGroupIDList()
+ for serverGroupIDInfo in serverGroupIDList:
+ if (isinstance(serverGroupIDInfo, tuple) and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]) \
+ or (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID):
+ return ipyData
+ GameWorld.ErrLog("没有找到跨服玩法对应分区! mapID=%s, serverGroupID=%s, zoneTypeName=%s" % (mapID, serverGroupID, zoneTypeName))
+ return
def GetCrossCommZoneIpyDataByServerGroupID(serverGroupID):
## 获取跨服常规分区
@@ -286,11 +300,11 @@
GameWorld.DebugLog("查看跨服玩家，是本服玩家，直接回复!tagPlayerID=%s" % (tagPlayerID), playerID)
sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
sendPack.PlayerID = tagPlayerID
- sendPack.PropData = json.dumps(cPickle.loads(curCache.GetPropData()), ensure_ascii=False)
+ sendPack.PropData = curCache.GetPropData()
sendPack.PropDataSize = len(sendPack.PropData)
- sendPack.ItemData = json.dumps(cPickle.loads(PlayerViewCache.GetItemData(curCache)), ensure_ascii=False)
+ sendPack.ItemData = PlayerViewCache.GetItemData(curCache)
sendPack.ItemDataSize = len(sendPack.ItemData)
- sendPack.PlusData = json.dumps(cPickle.loads(PlayerViewCache.GetPlusData(curCache)), ensure_ascii=False)
+ sendPack.PlusData = PlayerViewCache.GetPlusData(curCache)
sendPack.PlusDataSize = len(sendPack.PlusData)
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
@@ -347,11 +361,11 @@
PropData, ItemData, PlusData = cacheInfo
sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
sendPack.PlayerID = tagPlayerID
- sendPack.PropData = json.dumps(cPickle.loads(PropData), ensure_ascii=False)
+ sendPack.PropData = PropData
sendPack.PropDataSize = len(sendPack.PropData)
- sendPack.ItemData = json.dumps(cPickle.loads(ItemData), ensure_ascii=False)
+ sendPack.ItemData = ItemData
sendPack.ItemDataSize = len(sendPack.ItemData)
- sendPack.PlusData = json.dumps(cPickle.loads(PlusData), ensure_ascii=False)
+ sendPack.PlusData = PlusData
sendPack.PlusDataSize = len(sendPack.PlusData)
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
@@ -372,7 +386,7 @@
# 离线的话直接发邮件
GameWorld.Log("收到跨服获得物品，玩家不在线，直接发邮件! itemInfo=%s" % str(itemInfo), playerID)
itemID, itemCount, isBind, itemUserData = itemData
- addItemList = [{"ItemID":itemID, "Count":itemCount, "IsBind":isBind, "UserData":itemUserData}]
+ addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":isBind, "UserData":itemUserData}]
PlayerCompensation.SendMailByKey("", [playerID], addItemList, detail={"CrossPutInItem":1, "Event":event})
return
--
Gitblit v1.8.0