From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py | 79 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 25 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
index cfcf366..2ce78a2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
@@ -913,6 +913,26 @@
DR_Team(eventName, teamID, drDict)
return
+def SyncMapServerPlayerNoTeam(curPlayer):
+ ## 同步地图玩家没有队伍，切图时调用
+ teamInfo = ChGameToMapPyPack.tagGMTeamInfo()
+ teamInfo.PlayerID = curPlayer.GetPlayerID()
+ teamInfo.TeamID = 0
+ teamInfo.TeamLV = 0
+ teamInfo.MemInfoList = []
+ teamInfo.MemCnt = len(teamInfo.MemInfoList)
+ NetPackCommon.SendPyPackToMapServer(curPlayer.GetLineNO(), curPlayer.GetRealMapID(), teamInfo)
+ return
+
+def SyncMapServerPlayerLeaveTeam(curPlayer, teamID):
+ ## 同步地图玩家离开队伍
+ leavePack = ChGameToMapPyPack.tagGMPlayerLeaveTeam()
+ leavePack.PlayerID = curPlayer.GetPlayerID()
+ leavePack.CopyMapID = curPlayer.GetFBID()
+ leavePack.TeamID = teamID
+ NetPackCommon.SendPyPackToMapServer(curPlayer.GetLineNO(), curPlayer.GetRealMapID(), leavePack)
+ return
+
#---------------------------------------------------------------------
#// B9 03 修改队伍信息 #tagCGChangeTeamInfo
@@ -1339,7 +1359,8 @@
#GameServer清除玩家队伍ID为空
delPlayer.SetTeam(None)
#通知MapServerd队伍变更, 在mapserver构建目前队伍
- delPlayer.MapServer_Sync_Team(0)
+ #delPlayer.MapServer_Sync_Team(0)
+ SyncMapServerPlayerLeaveTeam(delPlayer, curTeam.GetTeamID())
#玩家离开副本
delPlayer.MapServer_LeaveFB()
if IsTeamMatchingPlayer(curTeam.GetTeamID()):
@@ -1393,7 +1414,8 @@
#GameServer玩家队伍为空
curPlayer.SetTeam(None)
#通知MapServerd队伍变更
- curPlayer.MapServer_Sync_Team(0)
+ #curPlayer.MapServer_Sync_Team(0)
+ SyncMapServerPlayerLeaveTeam(curPlayer, curTeam.GetTeamID())
__DoLogic_PlayerTeamChange(curPlayer)
if curMember.GetTeamLV() != IPY_GameServer.tmlLeader:
@@ -1793,11 +1815,12 @@
if curTeam == None:
return
- if curTeam.GetTeamPlayerCount() <= 1:
- #补救完毕, 队伍中只有一个人, 删除这个队伍
- GameWorld.Log('玩家(%s)仍然有队伍(%s), 补救完毕, 队伍中只有一个人, 删除这个队伍' % (playerID, curTeamID))
- DeleteTeam(curTeam, tick)
- return
+ #允许存在单人队伍，暂屏蔽该逻辑
+# if curTeam.GetTeamPlayerCount() <= 1:
+# #补救完毕, 队伍中只有一个人, 删除这个队伍
+# GameWorld.Log('玩家(%s)仍然有队伍(%s), 补救完毕, 队伍中只有一个人, 删除这个队伍' % (playerID, curTeamID))
+# DeleteTeam(curTeam, tick)
+# return
GameWorld.Log('玩家(%s)仍然有队伍(%s), 补救' % (playerID, curTeamID))
curPlayer.SetTeamID(curTeamID)
@@ -1808,7 +1831,8 @@
curPlayer.SetTeam(None)
curPlayer.Sync_LeaveTeam(1)
#通知MapServer, 玩家已经队伍了, 刷新玩家的TeamID
- curPlayer.MapServer_Sync_Team(0)
+ #curPlayer.MapServer_Sync_Team(0)
+ SyncMapServerPlayerLeaveTeam(curPlayer, curTeamID)
gameMap = GameWorld.GetMap(curPlayer.GetMapID())
if gameMap and gameMap.GetMapFBType() == ChConfig.fbtTeam:
curPlayer.MapServer_LeaveFB()
@@ -1862,22 +1886,26 @@
GameWorld.DebugLog("Team.OnPlayerReadMapOK", curPlayer.GetPlayerID())
- # 登录逻辑已处理，这里不重复处理
- #===============================================================================================
- # if curPlayer.GetTeamID() == 0:
- # return
- #
- # curTeam = GameWorld.GetTeamManager().FindTeam(curPlayer.GetTeamID())
- # if curTeam == None:
- # #通知MapServer, 玩家已经队伍了, 刷新玩家的TeamID
- # curPlayer.MapServer_Sync_Team(0)
- # return
- #
- # SyncMapServerTeamInfo(curTeam)
- # #curTeamMember = curTeam.GetMemberByID(curPlayer.GetPlayerID())
- # ##通知MapServerd队伍变更
- # #curPlayer.MapServer_Sync_Team(curTeamMember.GetTeamLV())
- #===============================================================================================
+ if curPlayer.GetTeamID() == 0:
+ return
+
+ curTeam = GameWorld.GetTeamManager().FindTeam(curPlayer.GetTeamID())
+ if curTeam == None:
+ #通知MapServer, 玩家已经队伍了, 刷新玩家的TeamID
+ #curPlayer.MapServer_Sync_Team(0)
+ return
+
+ mapID = curPlayer.GetMapID()
+ loginMapID = curPlayer.GetDictByKey(ChConfig.Def_PDict_LoginMapID)
+ if loginMapID and mapID != loginMapID:
+ GameWorld.Log("Team.OnPlayerReadMapOK 地图与登录时地图不一致，重新同步一次!loginMapID=%s,mapID=%s"
+ % (loginMapID, mapID), curPlayer.GetPlayerID())
+ Sync_TeamMemberInfo(curTeam)
+ SyncMapServerTeamInfo(curTeam, "ReadMapOK", {"playerID":curPlayer.GetPlayerID()})
+
+ #curTeamMember = curTeam.GetMemberByID(curPlayer.GetPlayerID())
+ ##通知MapServerd队伍变更
+ #curPlayer.MapServer_Sync_Team(curTeamMember.GetTeamLV())
return True
#---------------------------------------------------------------------
##组队玩家切换地图
@@ -1929,7 +1957,8 @@
# 玩家进入组队副本，则停止匹配
if gameMap.GetMapFBType() == ChConfig.fbtTeam:
DelPlayerIDFromMatchingList(curPlayer)
-
+ SyncMapServerPlayerNoTeam(curPlayer) # 没有队伍的时候切图也通知地图
+
return
def PlayerTeamMemberRefresh(curPlayer, refreshType, value, tick):
--
Gitblit v1.8.0