From a15e3af5eb36a3c4eb6016e824faca23d6d6a9dc Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 14 一月 2019 11:06:06 +0800
Subject: [PATCH] 5768 【后端】【1.5】新增8-14天活动功能(通知修改)
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index dbdc17d..821d4e8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
@@ -29,7 +29,6 @@
#---------------------------------------------------------------------
import GameWorld
import IPY_GameServer
-import MergeBroadcast
import IpyGameDataPY
import CrossRealmMsg
import ShareDefine
@@ -53,9 +52,9 @@
curPlayer.NotifyCode(msgMark, __GetNotifyCodeList(msgParamList))
return
-def NotifyCodeToClientServer(serverGroupID, playerID, msgMark, msgParamList=[]):
+def NotifyCodeToClientServer(serverGroupIDList, playerID, msgMark, msgParamList=[]):
dataMsg = {"Type":"Player", "ID":playerID, "Mark":msgMark, "Param":msgParamList}
- CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, dataMsg, [serverGroupID])
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, dataMsg, serverGroupIDList)
return
def CrossServerMsg_Notify(notifyInfoDict):
@@ -82,7 +81,7 @@
GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
notifyDict = {"country":country, "msgMark":msgMark, "msgParamList":msgParamList, "lineID":lineID,
"mergeMinOSD":mergeMinOSD, "mergeMaxOSD":mergeMaxOSD, "mergeMapInfo":mergeMapInfo}
- MergeBroadcast.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)
+ #.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)
return
## 世界广播
@@ -92,7 +91,7 @@
# @return 无返回值
# @remarks
def WorldNotify(country, msgMark, msgParamList=[]):
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
MergeWorldNotify(country, msgMark, msgParamList)
else:
GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
@@ -188,19 +187,6 @@
#------------------------------------------------------------------------------
-## 设置玩家跨服预赛排位
-# @param curPlayer: 玩家实例
-# @param value: 威望值
-# @return:
-def SetMergeWarRank(curPlayer, value):
- return
-
-
-## 获取玩家跨服预赛排位
-# @param curPlayer: 玩家实例
-# @return: 威望值
-def GetMergeWarRank(curPlayer):
- return 0
## 职业阶数
def GetJobRank(curPlayer): return curPlayer.GetExAttr1()
@@ -242,6 +228,9 @@
curPlayer.MapServer_QueryPlayerResult(0, 0, "SetLeaveFamilyTime", sysMsg, len(sysMsg))
return
def GetLeaveFamilyTime(curPlayer):return curPlayer.GetExAttr12()
+
+## 玩家所属服务器组ID
+def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()
## 是否脱机挂机状态
def GetIsTJG(curPlayer):
@@ -307,12 +296,9 @@
SetMapServerPlayerAttrValue(curPlayer, "SetVsRoomId", roomID)
return
-## 跨服状态: 0-非跨服状态，1-跨服状态
-def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()
-def SetCrossRealmState(curPlayer, value):
- ''' 设置玩家跨服状态
- @param isExitCrossRealm: 非跨服状态时是否通知前端退出跨服服务器
- '''
+## 跨服状态所在地图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