From 12392320a13113f580f75c314e74c952b7a9ab7d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 14 十一月 2019 10:31:05 +0800
Subject: [PATCH] 8338 【主干】【后端】女娲的祝福等buff物品的类型分配（新增类型18效果与类型9相同）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 142 +++++++++++++++++++++++++++++++----------------
1 files changed, 94 insertions(+), 48 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 2ae44ba..f700782 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -28,6 +28,7 @@
import NetPackCommon
import IpyGameDataPY
import PyGameData
+import PlayerDBOper
# 获取玩家跨服服务器上的名字
#===============================================================================
@@ -46,7 +47,7 @@
# 获取玩家跨服服务器上的名字
def GetCrossPlayerName(curPlayer):
# 通过游戏账号中的平台标志获取名称，目前为spid
- playerName = curPlayer.GetPlayerName()
+ playerName = curPlayer.GetName()
opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer),
GameWorld.GetPlayerServerSID(curPlayer)))
@@ -56,36 +57,62 @@
return opName.decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
-def GetServerCrossZoneIpyData(mapID, serverGroupID=0):
- ## 获取本服对应跨服玩法分区地图信息
- if mapID not in ChConfig.Def_CrossZoneTableName:
+def GetCrossZoneIpyDataByZoneID(mapID, zoneID):
+ ## 获取跨服分区
+ zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+ crossZoneName = GameWorld.GetCrossZoneName()
+ return IpyGameDataPY.GetIpyGameData(zoneTypeName, crossZoneName, zoneID)
+
+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
- if not serverGroupID:
- serverGroupID = GameWorld.GetServerGroupID()
-
- tableName = ChConfig.Def_CrossZoneTableName[mapID]
- ipyDataMgr = IpyGameDataPY.IPY_Data()
- if not hasattr(ipyDataMgr, "Get%sCount" % tableName):
- return
-
- for i in xrange(getattr(ipyDataMgr, "Get%sCount" % tableName)()):
- ipyData = getattr(ipyDataMgr, "Get%sByIndex" % tableName)(i)
+ 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 GetCrossZoneIpyDataListByServerGroupID(mapID, serverGroupID):
+ ## 获取跨服常规分区列表
+ if serverGroupID:
+ ipyData = GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID)
+ if not ipyData:
+ return
+ ipyDataList = [ipyData]
+ else:
+ crossZoneName = GameWorld.GetCrossZoneName()
+ zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm")
+ ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True)
+ return ipyDataList
+
+def GetServerCrossZoneMapIpyData(zoneID, mapID):
+ ## 获取本服对应跨服玩法分区地图信息 - 仅适用于固定地图及虚拟分线的跨服玩法
+ if mapID not in ChConfig.Def_CrossZoneMapTableName:
+ return
+ tableName = ChConfig.Def_CrossZoneMapTableName[mapID]
+ return IpyGameDataPY.GetIpyGameDataByCondition(tableName, {"ZoneID":zoneID})
def IsCrossServerOpen():
## 跨服服务器是否开放中
return GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
-def ClientServerMsg_ServerInitOK(serverGroupID):
- ## 子服连接成功
+def Sync_CrossCommInitDataToClientServer(serverGroupID=0):
+ ''' 同步跨服常规通用数据到子服务器
+ @param serverGroupID: 为0时同步所有子服
+ '''
+
isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
- GameWorld.Log("子服连接成功，通知当前跨服服务器状态: isOpen=%s" % isOpen)
- CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen}, [serverGroupID])
+ crossZoneName = GameWorld.GetCrossZoneName()
+ GameWorld.Log("通知当前跨服服务器状态: isOpen=%s,crossZoneName=%s,syncServerGroupID=%s" % (isOpen, crossZoneName, serverGroupID))
+ serverGroupIDList = [serverGroupID] if serverGroupID else []
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen, "crossZoneName":crossZoneName}, serverGroupIDList)
return
def DoChangeCrossServerState(isOpen):
@@ -110,6 +137,10 @@
def CrossServerMsg_CrossServerState(msgData):
## 子服收到跨服服务器状态变更，子服不存DB，默认跨服维护中，连接跨服成功后由跨服同步状态直接更新到字典即可，没连上就默认维护中
+ if "crossZoneName" in msgData:
+ PyGameData.g_crossZoneName = msgData["crossZoneName"]
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossZoneName, PyGameData.g_crossZoneName)
+
isOpen = msgData["isOpen"]
isOpen = 1 if isOpen else 0
GameWorld.Log("收到跨服服务器状态变更: 是否正常开放中=%s" % isOpen)
@@ -123,6 +154,7 @@
continue
PlayerControl.SetCrossMapID(curPlayer, 0)
+ GameWorld.GetGameWorld().SendCrossServerStateToLoginServer(isOpen)
# 通知地图
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
return
@@ -151,16 +183,23 @@
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
if not curPlayer:
GameWorld.Log(" 退出跨服时本服玩家不在线!", playerID)
+ DoOfflinePlayerExitCrossServer(playerID)
return
PlayerControl.SetCrossMapID(curPlayer, 0)
return
-def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
+def DoOfflinePlayerExitCrossServer(playerID):
+ ## 处理离线玩家退出跨服服务器更新DB数据逻辑
+
+ PlayerDBOper.UpdateDBOper(PlayerDBOper.Table_DBPlayer, {"PlayerID":playerID}, {"ExAttr5":0})
+ return
+
+def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0, lineID=0):
# 发送跨服账号注册上传数据
# 设置上传数据的活动类型
curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)
- sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY])
+ sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY, lineID])
curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossRealmReg", sysMsg, len(sysMsg))
GameWorld.Log("SendCrossRealmReg registerMap=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s"
% (registerMap, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
@@ -235,6 +274,7 @@
#{
# tagHead Head;
# DWORD PlayerID; // 跨服玩家ID
+# BYTE EquipClassLV; //大于0为查看指定境界阶装备信息, 0为查看默认信息
#};
def OnViewCrossPlayerInfo(index, clientData, tick):
if GameWorld.IsCrossServer():
@@ -243,27 +283,20 @@
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
playerID = curPlayer.GetPlayerID()
tagPlayerID = clientData.PlayerID
- curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID)
+ equipClassLV = clientData.EquipClassLV
+ curCache = PlayerViewCache.FindViewCache(tagPlayerID)
## 本服有，直接回客户端
if curCache:
GameWorld.DebugLog("查看跨服玩家，是本服玩家，直接回复!tagPlayerID=%s" % (tagPlayerID), playerID)
- sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
- sendPack.PlayerID = tagPlayerID
- sendPack.PropData = curCache.GetPropData()
- sendPack.PropDataSize = len(sendPack.PropData)
- sendPack.ItemData = PlayerViewCache.GetItemData(curCache)
- sendPack.ItemDataSize = len(sendPack.ItemData)
- sendPack.PlusData = PlayerViewCache.GetPlusData(curCache)
- sendPack.PlusDataSize = len(sendPack.PlusData)
- NetPackCommon.SendFakePack(curPlayer, sendPack)
+ PlayerViewCache.Sync_PlayerCache(curPlayer, curCache, equipClassLV)
return
if tagPlayerID in PyGameData.g_crossPlayerViewCache:
- validChaheTime = 5 * 60 * 1000
+ validChaheTime = 10 * 60 * 1000
cacheInfo, updTick = PyGameData.g_crossPlayerViewCache[tagPlayerID]
if tick - updTick <= validChaheTime:
GameWorld.DebugLog("查看跨服玩家数据同步CD中，直接用缓存数据回复!tagPlayerID=%s" % (tagPlayerID), playerID)
- SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo)
+ SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, equipClassLV, cacheInfo)
return
for crossPlayerID, cacheInfoList in PyGameData.g_crossPlayerViewCache.items():
@@ -271,52 +304,65 @@
PyGameData.g_crossPlayerViewCache.pop(crossPlayerID)
# 发送跨服服务器查询
- dataMsg = {"tagPlayerID":tagPlayerID, "playerID":playerID}
+ dataMsg = {"tagPlayerID":tagPlayerID, "playerID":playerID, "equipClassLV":equipClassLV}
CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_ViewPlayerCache, dataMsg)
return
def ClientServerMsg_ViewPlayerCache(serverGroupID, msgData):
tagPlayerID = msgData["tagPlayerID"]
playerID = msgData["playerID"]
+ equipClassLV = msgData["equipClassLV"]
GameWorld.Log("收到子服查看跨服玩家信息: serverGroupID=%s,playerID=%s,tagPlayerID=%s" % (serverGroupID, playerID, tagPlayerID))
- cacheInfo = []
- curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID)
+ cacheInfo = {}
+ curCache = PlayerViewCache.FindViewCache(tagPlayerID)
if curCache:
- cacheInfo = [curCache.GetPropData(), PlayerViewCache.GetItemData(curCache), PlayerViewCache.GetPlusData(curCache)]
-
- viewPlayerCacheRet = [playerID, tagPlayerID, cacheInfo]
+ cacheInfo = {"PropData":curCache.PropData, "PlusData":curCache.PlusData}
+ for classLV in xrange(1, 15 + 1):
+ attrName = "ItemData%s" % classLV
+ if hasattr(curCache, attrName):
+ cacheInfo[attrName] = getattr(curCache, attrName)
+
+ viewPlayerCacheRet = [playerID, tagPlayerID, equipClassLV, cacheInfo]
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ViewPlayerCacheRet, viewPlayerCacheRet, [serverGroupID])
return
def CrossServerMsg_ViewPlayerCacheRet(msgData, tick):
- playerID, tagPlayerID, cacheInfo = msgData
+ playerID, tagPlayerID, equipClassLV, cacheInfo = msgData
GameWorld.Log("收到跨服服务器回复的查看玩家信息: playerID=%s,tagPlayerID=%s" % (playerID, tagPlayerID))
PyGameData.g_crossPlayerViewCache[tagPlayerID] = [cacheInfo, tick] # 更新信息
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
if curPlayer:
- SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo)
+ SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, equipClassLV, cacheInfo)
return
-def SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo):
+def SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, equipClassLV, cacheInfo):
if not cacheInfo:
PlayerControl.NotifyCode(curPlayer, "ViewPlayer_OffLine")
return
- PropData, ItemData, PlusData = cacheInfo
+
+ if equipClassLV:
+ itemData = cacheInfo.get("ItemData%s" % equipClassLV, "")
+ sendPack = ChPyNetSendPack.tagSCPlayerEquipCacheResult()
+ sendPack.PlayerID = tagPlayerID
+ sendPack.EquipClassLV = equipClassLV
+ sendPack.ItemData = itemData
+ sendPack.ItemDataSize = len(sendPack.ItemData)
+ NetPackCommon.SendFakePack(curPlayer, sendPack)
+ return
+
+ #回包客户端
sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
sendPack.PlayerID = tagPlayerID
- sendPack.PropData = PropData
+ sendPack.PropData = cacheInfo.get("PropData", "")
sendPack.PropDataSize = len(sendPack.PropData)
- sendPack.ItemData = ItemData
- sendPack.ItemDataSize = len(sendPack.ItemData)
- sendPack.PlusData = PlusData
+ sendPack.PlusData = cacheInfo.get("PlusData", "")
sendPack.PlusDataSize = len(sendPack.PlusData)
- sendPack.CrossPlayer = 1
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
@@ -336,7 +382,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