From 937e159f80f02bff02b218afa6c88438b0343f5f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 15 三月 2019 10:58:13 +0800
Subject: [PATCH] 1111 修改任务接口对bind的判断
---
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 215 insertions(+), 21 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index c8d42a2..5438e00 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -22,25 +22,151 @@
import ChConfig
import PlayerControl
import PlayerViewCache
+import PlayerCompensation
import ChPyNetSendPack
-import IPY_PlayerDefine
+import PlayerDBGSEvent
import NetPackCommon
+import IpyGameDataPY
import PyGameData
+# 获取玩家跨服服务器上的名字
+#===============================================================================
+# def GetCrossPlayerName(curPlayer):
+# # 通过游戏账号中的平台标志获取名称，目前为spid
+# playerName = curPlayer.GetPlayerName()
+# nameFormat = ReadChConfig.GetPyMongoConfig("Merge", "NameFormat", True)
+# if not nameFormat:
+# return playerName
+#
+# opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s" % GameWorld.GetPlayerPlatform(curPlayer))
+#
+# return (nameFormat%{"opname":opName, "sid":GameWorld.GetPlayerServerID(curPlayer)}).decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
+#===============================================================================
# 获取玩家跨服服务器上的名字
def GetCrossPlayerName(curPlayer):
# 通过游戏账号中的平台标志获取名称，目前为spid
- playerName = curPlayer.GetPlayerName()
- nameFormat = ReadChConfig.GetPyMongoConfig("Merge", "NameFormat", True)
- if not nameFormat:
+ playerName = curPlayer.GetName()
+
+ opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer),
+ GameWorld.GetPlayerServerSID(curPlayer)))
+
+ if not opName:
return playerName
- opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s" % GameWorld.GetPlayerPlatform(curPlayer))
+ return opName.decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
- return (nameFormat%{"opname":opName, "sid":GameWorld.GetPlayerServerID(curPlayer)}).decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
+def GetCrossCommZoneIpyDataByZoneID(zoneID):
+ ## 获取跨服常规分区
+ crossZoneName = GameWorld.GetCrossZoneName()
+ ipyData = IpyGameDataPY.GetIpyGameDataNotLog("CrossZoneComm", crossZoneName, zoneID)
+ return ipyData
+
+def GetCrossCommZoneIpyDataByServerGroupID(serverGroupID):
+ ## 获取跨服常规分区
+ crossZoneName = GameWorld.GetCrossZoneName()
+ ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZoneComm", {"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
+ return
+
+def GetCrossCommZoneIpyDataListByServerGroupID(serverGroupID):
+ ## 获取跨服常规分区列表
+ if serverGroupID:
+ ipyData = GetCrossCommZoneIpyDataByServerGroupID(serverGroupID)
+ if not ipyData:
+ return
+ ipyDataList = [ipyData]
+ else:
+ crossZoneName = GameWorld.GetCrossZoneName()
+ ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition("CrossZoneComm", {"CrossZoneName":crossZoneName}, True)
+ return ipyDataList
+
+def GetServerCrossZoneMapIpyData(mapID, serverGroupID=0):
+ ## 获取本服对应跨服玩法分区地图信息
+ if mapID not in ChConfig.Def_CrossZoneMapTableName:
+ return
+ tableName = ChConfig.Def_CrossZoneMapTableName[mapID]
+ if not serverGroupID:
+ if GameWorld.IsCrossServer():
+ return
+ serverGroupID = GameWorld.GetServerGroupID()
+ zoneIpyData = GetCrossCommZoneIpyDataByServerGroupID(serverGroupID)
+ if not zoneIpyData:
+ return
+ commZoneID = zoneIpyData.GetZoneID()
+ return IpyGameDataPY.GetIpyGameDataByCondition(tableName, {"ZoneID":commZoneID})
+
+def IsCrossServerOpen():
+ ## 跨服服务器是否开放中
+ return GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
+
+def Sync_CrossCommInitDataToClientServer(serverGroupID=0):
+ ''' 同步跨服常规通用数据到子服务器
+ @param serverGroupID: 为0时同步所有子服
+ '''
+
+ isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
+ 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):
+ ## 跨服服务器状态变更
+
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_CrossServerClose, 0 if isOpen else 1) # 存DB的反着存
+ GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
+
+ if not isOpen:
+ # 踢掉所有玩家
+ playerManager = GameWorld.GetPlayerManager()
+ for i in xrange(playerManager.GetActivePlayerCount()):
+ curPlayer = playerManager.GetActivePlayerAt(i)
+ if curPlayer == None:
+ continue
+ PlayerControl.SetCrossMapID(curPlayer, 0)
+ curPlayer.Kick(0)
+
+ # 广播所有子服，本服务器进入维护
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen})
+ return
+
+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)
+ GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
+
+ if not isOpen:
+ playerManager = GameWorld.GetPlayerManager()
+ for i in xrange(playerManager.GetActivePlayerCount()):
+ curPlayer = playerManager.GetActivePlayerAt(i)
+ if curPlayer == None:
+ continue
+ PlayerControl.SetCrossMapID(curPlayer, 0)
+
+ GameWorld.GetGameWorld().SendCrossServerStateToLoginServer(isOpen)
+ # 通知地图
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
+ return
def PlayerExitCrossServer(curPlayer):
## 玩家退出跨服服务器
+
+ if not GameWorld.IsCrossServer():
+ return
# 通知子服玩家退出跨服服务器
playerID = curPlayer.GetPlayerID()
@@ -48,7 +174,7 @@
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ExitCrossServer, playerID, [serverGroupID])
# 设置非跨服状态，踢下线
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
curPlayer.Kick(0)
GameWorld.Log("PlayerExitCrossServer...serverGroupID=%s" % serverGroupID, playerID)
return
@@ -61,18 +187,18 @@
if not curPlayer:
GameWorld.Log(" 退出跨服时本服玩家不在线!", playerID)
return
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
return
-def SendCrossRealmReg(curPlayer, actionType, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
+def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
# 发送跨服账号注册上传数据
# 设置上传数据的活动类型
- curPlayer.SetDict(ChConfig.Def_PlayerKey_MergeRegisterType, actionType)
- sysMsg = str([actionType, mapID, dataMapID, copyMapID, posX, posY])
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)
+ sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY])
curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossRealmReg", sysMsg, len(sysMsg))
- GameWorld.Log("SendCrossRealmReg actionType=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s"
- % (actionType, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
+ GameWorld.Log("SendCrossRealmReg registerMap=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s"
+ % (registerMap, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
return
def OnCrossRealmRegOK(playerID, msgList, tick):
@@ -82,13 +208,19 @@
if not curPlayer:
return
- #newAccount, newName = msgList
+ if not IsCrossServerOpen():
+ return
- actionType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterType)
- GameWorld.Log("跨服报名成功 , actionType=%s" % (actionType), playerID)
+ registerMap = msgList[0]
+ playerRegisterMap = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterMap)
+ if playerRegisterMap and registerMap != playerRegisterMap:
+ return
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, 0)
+
+ GameWorld.Log("跨服报名成功 , registerMap=%s" % (registerMap), playerID)
# 跨服PK上传数据完毕，通知跨服服务器，准备完毕
- if actionType == ShareDefine.Def_CrossAction_PK:
+ if registerMap == ChConfig.Def_FBMapID_CrossRealmPK:
regVSRoomID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterRoomID)
vsRoomID = curPlayer.GetVsRoomId()
@@ -107,13 +239,13 @@
# 其他的，在上传数据完毕后，使用通用的通知可进入跨服
else:
- NotifyCanEnterMergeServer(curPlayer, actionType)
+ NotifyCanEnterMergeServer(curPlayer, registerMap)
# hxp 2015.09.10 跨服boss，后面的暂时不需要
return
-def NotifyCanEnterMergeServer(curPlayer, actionType):
+def NotifyCanEnterMergeServer(curPlayer, registerMap):
# 通用包，通知客户端可进入跨服服务器
return
@@ -129,7 +261,7 @@
'''
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
GameWorld.ErrLog("某些异常情况下，前端强制发包退出跨服状态! ", curPlayer.GetPlayerID())
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
return
#// C0 02 查看跨服玩家信息 #tagCGViewCrossPlayerInfo
@@ -222,6 +354,68 @@
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
-
+def CrossServerMsg_PutInItem(itemInfo):
+ ## 跨服获得物品
+ GameWorld.DebugLog("收到跨服服务器获得物品!")
+ playerID = itemInfo["PlayerID"]
+ itemData = itemInfo["ItemData"]
+ event = itemInfo["Event"]
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if curPlayer:
+ # 在线的话推到MapServer处理
+ itemMsg = str(itemInfo)
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossPutInItem", itemMsg, len(itemMsg))
+ return
+ # 离线的话直接发邮件
+ GameWorld.Log("收到跨服获得物品，玩家不在线，直接发邮件! itemInfo=%s" % str(itemInfo), playerID)
+ itemID, itemCount, isBind, itemUserData = itemData
+ addItemList = [{"ItemID":itemID, "Count":itemCount, "IsBind":isBind, "UserData":itemUserData}]
+ PlayerCompensation.SendMailByKey("", [playerID], addItemList, detail={"CrossPutInItem":1, "Event":event})
+ return
+
+def CrossServerMsg_GiveMoney(msgInfo):
+ ## 跨服获得货币
+
+ playerID = msgInfo["PlayerID"]
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if not curPlayer:
+ GameWorld.ErrLog("跨服获得货币时玩家不在线! msgInfo=%s" % str(msgInfo), playerID)
+ return
+ msgInfo = str(msgInfo)
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossGiveMoney", msgInfo, len(msgInfo))
+ return
+
+def SetCrossPlayerAttrValue(msgInfo, tick):
+ ## 设置跨服玩家属性值
+ playerID, setType, setDict, isDelay = msgInfo
+ if not PyGameData.g_crossSetPlayerAttr:
+ GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick)
+ playerSetInfoList = PyGameData.g_crossSetPlayerAttr.get(playerID, [])
+ playerSetInfoList.append([setType, setDict])
+ PyGameData.g_crossSetPlayerAttr[playerID] = playerSetInfoList
+ if not isDelay:
+ __SendCrossServerSetPlayerAttr(0)
+ return
+
+def OnCrossProcess(tick):
+ __SendCrossServerSetPlayerAttr(tick)
+ return
+
+def __SendCrossServerSetPlayerAttr(tick):
+ if not PyGameData.g_crossSetPlayerAttr:
+ return
+
+ if tick:
+ # 延迟10秒一次性同步，主要是比如OnDay的时候当多个玩家同时跨服时，减少同步次数，延迟统一发送
+ if tick - GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick) < 10 * 1000:
+ return
+ GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick)
+
+ CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_SetPlayerAttrValue, PyGameData.g_crossSetPlayerAttr)
+ PyGameData.g_crossSetPlayerAttr = {}
+ return
+
+
+
\ No newline at end of file
--
Gitblit v1.8.0