From 027dccfa5c57091f7d1787af3e6c7b26c8c0f9a3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 23 十二月 2019 15:46:52 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统（玩家看到boss才同步伤血封包；修复玩家PK时buff掉血添加npc伤血列表报错）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
index 5d7ffba..a511d9f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
@@ -463,7 +463,6 @@
invitePack.NameLen = len(invitePack.Name)
invitePack.LV = curPlayer.GetLV()
invitePack.Job = curPlayer.GetJob()
- invitePack.JobLevel = PlayerControl.GetJobRank(curPlayer)
invitePack.RealmLV = curPlayer.GetOfficialRank()
invitePack.TagMapID = tagMapID
invitePack.TagMapEx = tagMapEx
@@ -524,7 +523,6 @@
requestPack.NameLen = len(requestPack.Name)
requestPack.LV = curPlayer.GetLV()
requestPack.Job = curPlayer.GetJob()
- requestPack.JobLevel = PlayerControl.GetJobRank(curPlayer)
requestPack.RealmLV = curPlayer.GetOfficialRank()
NetPackCommon.SendFakePack(tagPlayer, requestPack)
@@ -592,6 +590,11 @@
PlayerControl.NotifyCode(curPlayer, "TeamEnterForbid")
return False
+ if PlayerControl.GetAssistTagPlayerID(curPlayer):
+ #协助中无法执行此操作
+ PlayerControl.NotifyCode(curPlayer, "InAssistForbid")
+ return False
+
if tagPlayer:
tagPlayerID = tagPlayer.GetPlayerID()
#检查ID
@@ -614,6 +617,11 @@
return False
if IsInEnterFBTeamPrepare(tagTeamID):
PlayerControl.NotifyCode(curPlayer, "TeamEnterForbid")
+ return False
+
+ if PlayerControl.GetAssistTagPlayerID(tagPlayer):
+ #对方协助中，无法执行此操作
+ PlayerControl.NotifyCode(curPlayer, "TagInAssistForbid")
return False
return True
@@ -1596,7 +1604,6 @@
nearbyPlayer.NameLen = len(nearbyPlayer.Name)
nearbyPlayer.LV = player.GetLV()
nearbyPlayer.Job = player.GetJob()
- nearbyPlayer.JobLevel = PlayerControl.GetJobRank(player)
nearbyPlayer.RealmLV = player.GetOfficialRank()
nearbyPlayerInfo.PlayerList.append(nearbyPlayer)
@@ -1685,7 +1692,6 @@
sceneTeam.NameLen = len(sceneTeam.PlayerName)
sceneTeam.LV = leader.GetLV()
sceneTeam.Job = leader.GetJob()
- sceneTeam.JobLevel = PlayerControl.GetJobRank(leader)
sceneTeam.RealmLV = leader.GetOfficialRank()
sceneTeam.MemberCount = team.GetTeamPlayerCount()
sceneTeam.TagMapID = team.GetTagMapID()
@@ -2058,7 +2064,6 @@
tagMapTeam.NameLen = len(tagMapTeam.PlayerName)
tagMapTeam.LV = leader.GetLV()
tagMapTeam.Job = leader.GetJob()
- tagMapTeam.JobLevel = PlayerControl.GetJobRank(leader)
tagMapTeam.RealmLV = leader.GetOfficialRank()
tagMapTeam.MemberCount = team.GetTeamPlayerCount()
tagMapTeam.ReqMinLV = team.GetReqMinLV()
@@ -2777,8 +2782,6 @@
["TeamEnterCDMe", "TeamEnterCDAll"], "SingleEnterCD"],
ShareDefine.EntFBAskRet_LVLimit:[["TeamMatchingLVMe", "TeamMatchingLVAll"],
["TeamEnterLVMe", "TeamEnterLVAll"], "FbLV"],
- ShareDefine.EntFBAskRet_JobRankLimit:[["TeamMatchingJobMe", "TeamMatchingJobAll"],
- ["TeamEnterJobMe", "TeamEnterJobAll"], "SingleEnterJob"],
ShareDefine.EntFBAskRet_NoTicket:[["TeamMatchingTicketMe", "TeamMatchingTicketAll"],
["TeamEnterTicketMe", "TeamEnterTicketAll"], "GeRen_chenxin_157069"],
ShareDefine.EntFBAskRet_Dead:[["TeamMatchingDeadMe", "TeamMatchingDeadAll"],
@@ -2795,6 +2798,10 @@
["TeamEnterDefaultMe", "TeamEnterDefaultAll"], "SingleEnterDefaul"],
ShareDefine.EntFBAskRet_Sit:[["TeamMatchingSITMe", "TeamMatchingSITAll"],
["TeamEnterSITMe", "TeamEnterSITAll"], "Carry_lhs_697674"],
+ ShareDefine.EntFBAskRet_CrossPKMatching:[["CrossMatching9", "CrossMatching10"],
+ ["CrossMatching11", "CrossMatching12"], "CrossMatching8"],
+ ShareDefine.EntFBAskRet_InCrossMap:[["CrossMap6", "CrossMap7"],
+ ["CrossMap8", "CrossMap9"], "CrossMap5"],
ShareDefine.EntFBAskRet_Other:[["TeamMatchingDefaultMe", "TeamMatchingDefaultAll"],
["TeamEnterDefaultMe", "TeamEnterDefaultAll"], "SingleEnterDefaul"],
}
--
Gitblit v1.8.0