From 6834282d0466dc61064a0a08296b239dc266cf71 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 三月 2021 18:14:53 +0800
Subject: [PATCH] 4742 【BT】在跨服购买跨服boss次数后没有生效（购买boss次数立马同步；onday时立马同步）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py | 194 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 157 insertions(+), 37 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
index 2ce78a2..bf88ff0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
@@ -15,6 +15,7 @@
#"""Version = 2015-07-17 13:50"""
#---------------------------------------------------------------------
+import PlayerAssist
#import PlayerRequest
import GameWorldBoss
import IpyGameDataPY
@@ -24,6 +25,7 @@
import ChPyNetSendPack
import DataRecordPack
import PlayerControl
+import PlayerFriend
import ShareDefine
import PyGameData
import GameWorld
@@ -341,9 +343,9 @@
#邀请组队的时候，双方都有队伍不处理
if curPlayerTeam != None and tagPlayerTeam != None:
- #InviteEnterLost02 <n color="255,255,0">`o很抱歉,目标玩家已在他人队伍中,邀请入队失败!</n> 25 - -
- #PlayerControl.NotifyCode(curPlayer, "InviteEnterLost02")
- InvitePlayerJoinTeamReq(curPlayer, tagPlayer, curPlayerTeam, tick)
+ #该玩家已在他人队伍中，邀请入队失败！
+ PlayerControl.NotifyCode(curPlayer, "InviteEnterLost02")
+ #InvitePlayerJoinTeamReq(curPlayer, tagPlayer, curPlayerTeam, tick)
return
if tagPlayerTeam == None:
@@ -357,6 +359,24 @@
else:
GameWorld.Log("OnInvitePlayerJoinTeam ->组队系统异常" , curPlayer.GetPlayerID())
+ return
+
+#// B9 11 请求加入队伍 #tagCGRequestJoinTeam
+#
+#struct tagCGRequestJoinTeam
+#{
+# tagHead Head;
+# DWORD TeamID; // 目标队伍ID
+#};
+def OnRequestJoinTeam(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ teamID = clientData.TeamID
+ tagPlayerTeam = GameWorld.GetTeamManager().FindTeam(teamID)
+ if tagPlayerTeam == None:
+ # TeamNoExist 队伍不存在
+ PlayerControl.NotifyCode(curPlayer, "TeamNoExist")
+ return
+ RequestJoinTeamReq(curPlayer, tagPlayerTeam, tick)
return
#//09 09 请求加入队伍#tagCRequestJoinTeam
@@ -388,20 +408,34 @@
return
#获得双方的队伍
- #curPlayerTeam = curPlayer.GetTeam()
+ curPlayerTeam = curPlayer.GetTeam()
tagPlayerTeam = tagPlayer.GetTeam()
#请求加入的时候，双方都有队伍也可请求加入，支持退出队伍请求加入
-# if curPlayerTeam != None and tagPlayerTeam != None:
-# #InviteEnterLost02 <n color="255,255,0">`o很抱歉,目标玩家已在他人队伍中,邀请入队失败!</n> 25 - -
-# PlayerControl.NotifyCode(curPlayer, "InviteEnterLost02")
-# return
+ if curPlayerTeam != None and tagPlayerTeam != None:
+ #您已有队伍，请先退出再申请
+ PlayerControl.NotifyCode(curPlayer, "Friend_HaveTeam")
+ return
if tagPlayerTeam == None:
# TeamNoExist 队伍不存在
- PlayerControl.NotifyCode(curPlayer, "TeamNoExist")
+ #PlayerControl.NotifyCode(curPlayer, "TeamNoExist")
#目标玩家没有队伍, 邀请玩家加入, 支持无队伍双方无队伍邀请
#InvitePlayerJoinTeamReq(curPlayer, tagPlayer, curPlayerTeam, tick)
+
+ #支持双方无队伍请求加入，直接发送给被请求方确认
+ #通知客户端弹窗口(目标弹框)
+ requestPack = ChPyNetSendPack.tagGCRequestJoinTeam()
+ requestPack.PlayerID = playerID
+ requestPack.Name = curPlayer.GetName()
+ requestPack.NameLen = len(requestPack.Name)
+ requestPack.LV = curPlayer.GetLV()
+ requestPack.Job = curPlayer.GetJob()
+ requestPack.RealmLV = curPlayer.GetOfficialRank()
+ NetPackCommon.SendFakePack(tagPlayer, requestPack)
+
+ #TeamAskSuccess: 已成功发送入队申请
+ PlayerControl.NotifyCode(curPlayer, "TeamAskSuccess")
else:
# 请求加入队伍(#被请求的玩家有队，请求加入其队伍)
RequestJoinTeamReq(curPlayer, tagPlayerTeam, tick)
@@ -462,7 +496,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
@@ -523,7 +556,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)
@@ -591,6 +623,11 @@
PlayerControl.NotifyCode(curPlayer, "TeamEnterForbid")
return False
+ if PlayerControl.GetAssistTagPlayerID(curPlayer):
+ #协助中无法执行此操作
+ PlayerControl.NotifyCode(curPlayer, "InAssistForbid")
+ return False
+
if tagPlayer:
tagPlayerID = tagPlayer.GetPlayerID()
#检查ID
@@ -613,6 +650,11 @@
return False
if IsInEnterFBTeamPrepare(tagTeamID):
PlayerControl.NotifyCode(curPlayer, "TeamEnterForbid")
+ return False
+
+ if PlayerControl.GetAssistTagPlayerID(tagPlayer):
+ #对方协助中，无法执行此操作
+ PlayerControl.NotifyCode(curPlayer, "TagInAssistForbid")
return False
return True
@@ -657,7 +699,7 @@
return
#双方的队伍
- #curPlayerTeam = curPlayer.GetTeam()
+ curPlayerTeam = curPlayer.GetTeam()
tagPlayerTeam = tagPlayer.GetTeam()
if tagPlayerTeam == None:
@@ -665,12 +707,10 @@
PlayerControl.NotifyCode(curPlayer, "TeamNoExist")
return
- #===============================================================================================
- # if curPlayerTeam != None:
- # #InviteEnterLost02 组队失败，双方都有队伍！
- # PlayerControl.NotifyCode(curPlayer, "InviteEnterLost02")
- # return
- #===============================================================================================
+ if curPlayerTeam != None:
+ #您已有队伍，请先退出再申请
+ PlayerControl.NotifyCode(curPlayer, "Friend_HaveTeam")
+ return
#组队类型
#teamType = sendPack.GetTeamType()
@@ -742,17 +782,20 @@
#被邀请的玩家队伍
curPlayerTeam = curPlayer.GetTeam()
if curPlayerTeam == None:
- GameWorld.DebugLog("玩家无队伍，无法审核加入队伍请求!" , playerID)
- PlayerControl.NotifyCode(tagPlayer, "TeamNoExist")
- return
+ pass
+ #屏蔽，修改为支持无队伍被请求加入
+ #GameWorld.DebugLog("玩家无队伍，无法审核加入队伍请求!" , playerID)
+ #PlayerControl.NotifyCode(tagPlayer, "TeamNoExist")
+ #return
#申请入队的允许双方都有队伍
-# #发出申请的玩家的队伍
-# tagPlayerTeam = tagPlayer.GetTeam()
-# if tagPlayerTeam != None:
-# #InviteEnterLost02 组队失败，双方都有队伍！
-# PlayerControl.NotifyCode(tagPlayer, "InviteEnterLost02")
-# return
+ #发出申请的玩家的队伍
+ tagPlayerTeam = tagPlayer.GetTeam()
+ if tagPlayerTeam != None:
+ #该玩家已有队伍，同意时才提示对方有队伍
+ if isAgree == 1:
+ PlayerControl.NotifyCode(curPlayer, "AcceptTeamLost")
+ return
#===============================================================================================
# #请求检查,是否有这个请求
@@ -1391,6 +1434,7 @@
'''
#GameWorld.DebugLog("玩家队伍变更通用处理,curTeamID=%s" % curPlayer.GetTeamID())
GameWorldBoss.OnPlayerTeamChange(curPlayer)
+ PlayerAssist.OnPlayerTeamChange(curPlayer)
return
#---------------------------------------------------------------------
@@ -1595,7 +1639,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)
@@ -1684,7 +1727,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()
@@ -1876,6 +1918,7 @@
#如果队伍正在匹配中，则通知状态
if IsTeamMatchingPlayer(curTeamID):
Sync_TeamMatchState(curPlayer, True)
+ OnTeamMemFamilyRefresh(curPlayer, curPlayer.GetFamilyID())
return True
#---------------------------------------------------------------------
@@ -2056,7 +2099,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()
@@ -2317,7 +2359,8 @@
return
playerLV = curPlayer.GetLV()
- matchMapIDList = [ChConfig.Def_FBMapID_DuJie, ChConfig.Def_FBMapID_MunekadoTrial, ChConfig.Def_FBMapID_QueenRelics, ChConfig.Def_FBMapID_ChaosDemon]
+ matchMapIDList = [ChConfig.Def_FBMapID_DuJie, ChConfig.Def_FBMapID_MunekadoTrial, ChConfig.Def_FBMapID_QueenRelics, ChConfig.Def_FBMapID_ChaosDemon,
+ ChConfig.Def_FBMapID_KillDevil]
teamMgr = GameWorld.GetTeamManager()
for matchMapID in matchMapIDList:
@@ -2775,8 +2818,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"],
@@ -2793,6 +2834,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"],
}
@@ -2905,6 +2950,23 @@
askMapID, askMapEx, memStateDict = PyGameData.g_prepareTeamDict[teamID][:3]
enterInfo = GetTeamFBEnterInfo(leader, curTeam, askMapID, askMapEx)
+ leaderID = leader.GetPlayerID()
+ friendList = []
+ memFamilyIDDict = {}
+ memNameDict = {}
+ #队长与队员的关系
+ for index in xrange(curTeam.GetMemberCount()):
+ memPlayer = curTeam.GetMemberPlayer(index)
+ if not memPlayer or not memPlayer.GetPlayerID():
+ continue
+ memPlayerID = memPlayer.GetPlayerID()
+ if memPlayerID not in memStateDict:
+ continue
+ memFamilyIDDict[memPlayerID] = memPlayer.GetFamilyID() # 存储各队员的家族ID
+ memNameDict[memPlayerID] = memPlayer.GetName()
+ if leaderID != memPlayerID and PlayerFriend.IsFriend(leaderID, memPlayerID):
+ friendList.append([leaderID, memPlayerID])
+
#踢出所有在此类副本，但不同线路的玩家
for index in xrange(curTeam.GetMemberCount()):
memPlayer = curTeam.GetMemberPlayer(index)
@@ -2926,8 +2988,66 @@
resultName = str([askMapID, askMapEx] + enterInfo)
memPlayer.MapServer_QueryPlayerResult(0, 0, "EnterFBTeamAsk", resultName, len(resultName))
GameWorld.Log("队长成功进入组队副本, 队员开始进入副本: teamID=%s,memPlayerID=%s" % (teamID, memPlayerID), leader.GetPlayerID())
-
+ for preMemPlayerID in memStateDict.keys():
+ if memPlayerID == preMemPlayerID:
+ continue
+ if PlayerFriend.IsFriend(memPlayerID, preMemPlayerID) and [memPlayerID, preMemPlayerID] not in friendList:
+ friendList.append([memPlayerID, preMemPlayerID])
+
PyGameData.g_prepareTeamDict.pop(teamID)
+
+ # 同步进入组队副本的队员关系到目标地图
+ relationInfo = str(["InitRelation", teamID, friendList, memFamilyIDDict, memNameDict])
+ leader.MapServer_QueryPlayerResult(0, 0, "EnterFBTeamRelation", relationInfo, len(relationInfo))
+ return
+
+def OnTeamMemFriendChange(curPlayer, tagPlayerID, isFriend):
+ ## 队员好友关系变更，离线也同步
+ teamID = curPlayer.GetTeamID()
+ if not teamID:
+ GameWorld.DebugLog("好友变更，无队伍不管！")
+ return
+ curMapData = GameWorld.GetMap(curPlayer.GetMapID())
+ if not curMapData or curMapData.GetMapFBType() != ChConfig.fbtTeam:
+ GameWorld.DebugLog("好友变更，不在组队副本不管！")
+ return
+
+ isSameTeam = False
+ playerID = curPlayer.GetPlayerID()
+ curTeam = curPlayer.GetTeam()
+ for index in xrange(curTeam.GetMemberCount()):
+ memberInfo = curTeam.GetMemberInfo(index)
+ if not memberInfo:
+ continue
+ memPlayerID = memberInfo.GetPlayerID()
+ if tagPlayerID == memPlayerID:
+ isSameTeam = True
+ break
+
+ if not isSameTeam:
+ GameWorld.DebugLog("好友关系变更，不是同队伍不管！")
+ return
+
+ relationInfo = str(["FriendChange", teamID, playerID, tagPlayerID, isFriend])
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "EnterFBTeamRelation", relationInfo, len(relationInfo))
+ return
+
+def OnTeamMemFamilyRefresh(curPlayer, familyID):
+ ## 队员仙盟变更，仅在线同步，上线同步
+ if not curPlayer:
+ return
+ teamID = curPlayer.GetTeamID()
+ if not teamID:
+ GameWorld.DebugLog("家族变更，无队伍不管！")
+ return
+ curMapData = GameWorld.GetMap(curPlayer.GetMapID())
+ if not curMapData or curMapData.GetMapFBType() != ChConfig.fbtTeam:
+ GameWorld.DebugLog("家族变更，不在组队副本不管！")
+ return
+ playerID = curPlayer.GetPlayerID()
+ familyID = curPlayer.GetFamilyID()
+ relationInfo = str(["FamilyChange", teamID, playerID, familyID])
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "EnterFBTeamRelation", relationInfo, len(relationInfo))
return
def __CheckTeamFBPlayerExist(curTeam):
@@ -3105,8 +3225,8 @@
return
def DR_Team(eventName, teamID, dataDict):
- drDict = {"EventName":eventName, "TeamID":teamID}
- drDict.update(dataDict)
- DataRecordPack.SendEventPack("Team_GameServer", drDict)
+ #drDict = {"EventName":eventName, "TeamID":teamID}
+ #drDict.update(dataDict)
+ #DataRecordPack.SendEventPack("Team_GameServer", drDict)
return
--
Gitblit v1.8.0