From 50a5c9476fc00bb43a5f81f853acaecac71bd3f4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 10 九月 2018 17:43:54 +0800
Subject: [PATCH] 1901 玩家无法退出队伍bug;
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
index 61308d2..0d135e1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
@@ -2487,7 +2487,7 @@
return
# 覆盖添加
- PyGameData.g_teamFBEnterAskDict[teamID] = [askVer, askType, askMapID, askMapEx, askPlayerRetDict]
+ PyGameData.g_teamFBEnterAskDict[teamID] = [askVer, askType, askMapID, askMapEx, askPlayerRetDict, tick]
sendCMD = str([teamID, askVer, askType, askMapID, askMapEx])
for memPlayerID, mapInfo in askPlayerMapDict.items():
@@ -2520,7 +2520,7 @@
if retTeamID not in PyGameData.g_teamFBEnterAskDict:
GameWorld.DebugLog(" 该队伍的请求信息记录已不存在，不处理!retTeamID=%s" % retTeamID, playerID)
return
- askVer, askType, askMapID, askMapEx, askPlayerRetDict = PyGameData.g_teamFBEnterAskDict[retTeamID]
+ askVer, askType, askMapID, askMapEx, askPlayerRetDict = PyGameData.g_teamFBEnterAskDict[retTeamID][:5]
if askVer != retAskVer or askType != retAskType or askMapID != retAskMapID or askMapEx != retAskMapEx:
GameWorld.DebugLog(" 非本队伍请求版本，不处理！askVer=%s, askType=%s, askMapID=%s, askMapEx=%s"
% (askVer, askType, askMapID, askMapEx), playerID)
@@ -2897,6 +2897,17 @@
'''准备队伍异常处理
后端延长15秒，防范前端异常情况导致卡队伍准备界面，超时时强制取消准备队伍
'''
+ if PyGameData.g_teamFBEnterAskDict:
+ for teamID, askInfo in PyGameData.g_teamFBEnterAskDict.items():
+ if askInfo:
+ askVer, askType, askMapID, askMapEx, askPlayerRetDict, askTick = askInfo
+ # 询问的做个10s预防，超时的话移除
+ if tick - askTick <= 10000:
+ continue
+ PyGameData.g_teamFBEnterAskDict.pop(teamID)
+ GameWorld.ErrLog("队伍进入副本询问超时，强制移除询问状态! teamID=%s,askVer=%s,askType=%s,askMapID=%s,askMapEx=%s,askPlayerRetDict=%s,askTick=%s,tick=%s"
+ % (teamID, askVer, askType, askMapID, askMapEx, askPlayerRetDict, askTick, tick))
+
if not PyGameData.g_prepareTeamDict:
return
--
Gitblit v1.8.0