From 55c0dde92cc8e292f9385ee313b515649c6162b4 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 16 二月 2019 11:49:12 +0800
Subject: [PATCH] 6236 【后端】【1.6】合服重新同步下诛仙排行榜
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 70 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 39 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 0b77d1b..d7e90f7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
@@ -52,36 +52,34 @@
curPlayer.NotifyCode(msgMark, __GetNotifyCodeList(msgParamList))
return
-def NotifyCodeToClientServer(serverGroupIDList, playerID, msgMark, msgParamList=[]):
- dataMsg = {"Type":"Player", "ID":playerID, "Mark":msgMark, "Param":msgParamList}
- CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, dataMsg, serverGroupIDList)
+def GetCrossWorldNotifyInfo(country, msgMark, msgParamList=[]):
+ return {"Type":ShareDefine.CrossNotify_World, "Params":[country, msgMark, msgParamList]}
+
+def GetCrossFamilyNotifyInfo(familyID, msgMark, msgParamList=[]):
+ return {"Type":ShareDefine.CrossNotify_Family, "Params":[familyID, msgMark, msgParamList]}
+
+def CrossNotify(serverGroupIDList, crossNotifyList):
+ ''' 跨服广播信息提示，支持同步多条，同时也建议多条一起同步
+ @param serverGroupIDList: 需要同步到的目标服务器组ID列表
+ @param crossNotifyList: 信息提示列表，通过 GetCrossWorldNotifyInfo GetCrossFamilyNotifyInfo 函数获得返回值添加到列表
+ '''
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, crossNotifyList, serverGroupIDList)
return
-def CrossServerMsg_Notify(notifyInfoDict):
- notifyType = notifyInfoDict["Type"]
- notifyID = notifyInfoDict["ID"]
- if notifyType == "Player":
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(notifyID)
- if not curPlayer:
- return
- NotifyCode(curPlayer, notifyInfoDict["Mark"], notifyInfoDict["Param"])
- return
-
-## 跨服世界广播
-# @param country 提示的国家
-# @param msgMark 提示信息Mark
-# @param msgParamList 信息参数列表
-# @param mergeMinOSD 该提示针对跨服子服有效的最小开服天, >=0时有限制
-# @param mergeMaxOSD 该提示针对跨服子服有效的最大开服天, >=0时有限制
-# @param mergeMapInfo 该提示所属的跨服活动地图信息, 主要用于不同子服对应所跨的活动地图ID
-# @remarks
-def MergeWorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[], isMapNotify=0):
- # 非地图同步的广播才进行全服广播
- if not isMapNotify:
- GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
- notifyDict = {"country":country, "msgMark":msgMark, "msgParamList":msgParamList, "lineID":lineID,
- "mergeMinOSD":mergeMinOSD, "mergeMaxOSD":mergeMaxOSD, "mergeMapInfo":mergeMapInfo}
- #.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)
+def CrossServerMsg_Notify(crossNotifyList):
+ GameWorld.DebugLog("收到跨服同步的广播提示内容: count=%s" % len(crossNotifyList))
+ for notifyInfo in crossNotifyList:
+ if "Type" not in notifyInfo or "Params" not in notifyInfo:
+ continue
+ notifyType = notifyInfo["Type"]
+ params = notifyInfo["Params"]
+ if notifyType == ShareDefine.CrossNotify_World:
+ country, msgMark, msgParamList = params
+ WorldNotify(country, msgMark, msgParamList)
+ elif notifyType == ShareDefine.CrossNotify_Family:
+ familyID, msgMark, msgParamList = params
+ FamilyNotify(familyID, msgMark, msgParamList)
+
return
## 世界广播
@@ -91,10 +89,7 @@
# @return 无返回值
# @remarks
def WorldNotify(country, msgMark, msgParamList=[]):
- if GameWorld.IsCrossServer():
- MergeWorldNotify(country, msgMark, msgParamList)
- else:
- GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
+ GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
return
#---------------------------------------------------------------------
@@ -296,13 +291,10 @@
SetMapServerPlayerAttrValue(curPlayer, "SetVsRoomId", roomID)
return
-## 跨服状态: 0-非跨服状态，1-跨服状态
-def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()
-def SetCrossRealmState(curPlayer, value):
- ''' 设置玩家跨服状态
- @param isExitCrossRealm: 非跨服状态时是否通知前端退出跨服服务器
- '''
- curPlayer.SetExAttr5(1 if value else 0)
+## 跨服状态所在地图ID: 0-非跨服状态，非0-跨服状态对应的地图ID
+def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()
+def SetCrossMapID(curPlayer, value):
+ curPlayer.SetExAttr5(value)
SetMapServerPlayerAttrValue(curPlayer, "SetExAttr5", value)
return
--
Gitblit v1.8.0