From ef4898f247f88410fa8e3316a563cdb1de56c1c7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 21 八月 2024 10:58:33 +0800
Subject: [PATCH] 10229 【越南】【主干】【港台】【砍树】古神战场修改（功能队伍增加队员在线状态同步；相关玩家在线状态管理，支持跨服；优化查找玩家相关联队伍同步玩家所在队伍及已申请的队伍；修复队伍成员找不到缓存时报错；优化玩家缓存判断是否保存统一逻辑，防止过天可能被删除；）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFuncTeam.py | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFuncTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFuncTeam.py
index 5022816..642eea9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFuncTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFuncTeam.py
@@ -485,6 +485,7 @@
return 0
teamIDDict = self.playerFuncTeamIDDict[playerID]
return teamIDDict.get(funcMapID, 0)
+ def GetPlayerTeamIDDict(self, playerID): return self.playerFuncTeamIDDict.get(playerID, {})
def IsTeamPlayer(self, playerID):
if playerID in self.playerFuncTeamIDDict:
@@ -819,15 +820,15 @@
memberList = []
for memberInfo in teamInfo["MemberList"]:
mem = ChPyNetSendPack.tagGCFuncTeamMem()
- mem.ServerID = memberInfo["ServerID"]
+ mem.ServerID = memberInfo.get("ServerID", 0)
mem.PlayerID = memberInfo["PlayerID"]
- mem.Name = memberInfo["Name"]
+ mem.Name = memberInfo.get("Name", "")
mem.NameLen = len(mem.Name)
- mem.LV = memberInfo["LV"]
- mem.Job = memberInfo["Job"]
- mem.RealmLV = memberInfo["RealmLV"]
- mem.FightPower = memberInfo["FightPower"] % ChConfig.Def_PerPointValue
- mem.FightPowerEx = memberInfo["FightPower"] / ChConfig.Def_PerPointValue
+ mem.LV = memberInfo.get("LV", 0)
+ mem.Job = memberInfo.get("Job", 0)
+ mem.RealmLV = memberInfo.get("RealmLV", 0)
+ mem.FightPower = memberInfo.get("FightPower", 0) % ChConfig.Def_PerPointValue
+ mem.FightPowerEx = memberInfo.get("FightPower", 0) / ChConfig.Def_PerPointValue
mem.Value1 = memberInfo["Value1"]
mem.Value2 = memberInfo["Value2"]
memberList.append(mem)
@@ -880,15 +881,16 @@
memberList = []
for memberInfo in memberInfoList:
mem = ChPyNetSendPack.tagGCFuncTeamRefreshMem()
- mem.ServerID = memberInfo["ServerID"]
+ mem.ServerID = memberInfo.get("ServerID", 0)
mem.PlayerID = memberInfo["PlayerID"]
- mem.Name = memberInfo["Name"]
+ mem.Name = memberInfo.get("Name", "")
mem.NameLen = len(mem.Name)
- mem.LV = memberInfo["LV"]
- mem.Job = memberInfo["Job"]
- mem.RealmLV = memberInfo["RealmLV"]
- mem.FightPower = memberInfo["FightPower"] % ChConfig.Def_PerPointValue
- mem.FightPowerEx = memberInfo["FightPower"] / ChConfig.Def_PerPointValue
+ mem.LV = memberInfo.get("LV", 0)
+ mem.Job = memberInfo.get("Job", 0)
+ mem.RealmLV = memberInfo.get("RealmLV", 0)
+ mem.FightPower = memberInfo.get("FightPower", 0) % ChConfig.Def_PerPointValue
+ mem.FightPowerEx = memberInfo.get("FightPower", 0) / ChConfig.Def_PerPointValue
+ mem.OfflineValue = memberInfo.get("OfflineValue", 0)
mem.Value1 = memberInfo["Value1"]
mem.Value2 = memberInfo["Value2"]
memberList.append(mem)
@@ -1494,12 +1496,25 @@
# 非列表查询，返回玩家相关队伍
if "startIndex" not in msgData:
+ syncPlayerIDList = [playerID]
+ serverGroupList = [serverGroupID]
+
funcTeamMgr = PyDataManager.GetDBPyFuncTeamManager()
+ # 申请的队伍
+ funcTeamList = funcTeamMgr.GetFuncTeamList(zoneID, funcMapID)
+ for funcTeam in funcTeamList:
+ if playerID not in funcTeam.GetApplyIDList():
+ continue
+ teamID = funcTeam.GetTeamID()
+ teamInfo = funcTeam.GetSyncDict(False)
+ sendMsg = {"infoType":"QueryPlayerFuncTeam", "zoneID":zoneID, "playerID":playerID, "funcMapID":funcMapID,
+ "teamInfo":teamInfo, "teamID":teamID, "syncPlayerIDList":syncPlayerIDList}
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_FuncTeamInfo, sendMsg, serverGroupList)
+
+ # 玩家所属队伍
teamID = funcTeamMgr.GetPlayerTeamID(playerID, funcMapID)
funcTeam = funcTeamMgr.GetFuncTeam(teamID)
teamInfo = funcTeam.GetSyncDict(True) if funcTeam else {}
- syncPlayerIDList = [playerID]
- serverGroupList = [serverGroupID]
sendMsg = {"infoType":"QueryPlayerFuncTeam", "zoneID":zoneID, "playerID":playerID, "funcMapID":funcMapID,
"teamInfo":teamInfo, "teamID":teamID, "syncPlayerIDList":syncPlayerIDList}
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_FuncTeamInfo, sendMsg, serverGroupList)
--
Gitblit v1.8.0