From 090d09182710271a2b55ccdb14a7576db09ec912 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 十二月 2018 15:43:19 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发 上次匹配战斗未结算时，不能再发起匹配； 跨服增加验证登录玩家PK房间号合法性； 支持主动退出对战副本直接结算；
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 3860e58..6215b85 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):
--
Gitblit v1.8.0