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 | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 3860e58..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
@@ -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
## 世界广播
@@ -230,6 +229,9 @@
return
def GetLeaveFamilyTime(curPlayer):return curPlayer.GetExAttr12()
+## 玩家所属服务器组ID
+def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()
+
## 是否脱机挂机状态
def GetIsTJG(curPlayer):
if curPlayer.GetDictByKey(ChConfig.Def_OnlineType):
@@ -294,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