From 8a0a844c31126b274f268fe5333c19aef50dd0f8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 11 十二月 2024 14:55:42 +0800
Subject: [PATCH] 10297 【越南】【英语】【砍树】【tqxbqy】轮回殿-服务端（轮回殿活动时间表增加配置轮回类型对应的CTGID跟商店类型）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py | 73 +++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
index 920283b..6a4647b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTeam.py
@@ -307,7 +307,8 @@
GameWorld.ErrLog("设置当前创建队伍玩家为队长, 找不到玩家!teamID=%s" % teamID, curPlayerID)
DR_Team("CreateError", teamID, {"Leader":curPlayerID, "tagMapID":tagMapID, "tagMapEx":tagMapEx, "reqMinLV":reqMinLV, "reqMaxLV":reqMaxLV})
return
-
+ curNewTeamMenber.SetFace(curPlayer.GetFace())
+ curNewTeamMenber.SetFacePic(curPlayer.GetFacePic())
__SetTeamLV(curNewTeamMenber, IPY_GameServer.tmlLeader, False)
if isSync:
Sync_TeamMemberInfo(curNewTeam)
@@ -343,9 +344,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:
@@ -408,14 +409,14 @@
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 队伍不存在
@@ -432,6 +433,8 @@
requestPack.LV = curPlayer.GetLV()
requestPack.Job = curPlayer.GetJob()
requestPack.RealmLV = curPlayer.GetOfficialRank()
+ requestPack.Face = curPlayer.GetFace()
+ requestPack.FacePic = curPlayer.GetFacePic()
NetPackCommon.SendFakePack(tagPlayer, requestPack)
#TeamAskSuccess: 已成功发送入队申请
@@ -557,6 +560,8 @@
requestPack.LV = curPlayer.GetLV()
requestPack.Job = curPlayer.GetJob()
requestPack.RealmLV = curPlayer.GetOfficialRank()
+ requestPack.Face = curPlayer.GetFace()
+ requestPack.FacePic = curPlayer.GetFacePic()
NetPackCommon.SendFakePack(tagPlayer, requestPack)
#TeamAskSuccess: 已成功发送入队申请
@@ -587,6 +592,8 @@
member.Job = memberInfo.GetPlayerJob()
member.JobLevel = memberInfo.GetPlayerJobLevel()
member.RealmLV = memberInfo.GetPlayerRealmLV()
+ member.Face = memberInfo.GetFace()
+ member.FacePic = memberInfo.GetFacePic()
memberPlayer = curTeam.GetMemberPlayer(i)
if memberPlayer and memberPlayer.GetPlayerID():
@@ -699,7 +706,7 @@
return
#双方的队伍
- #curPlayerTeam = curPlayer.GetTeam()
+ curPlayerTeam = curPlayer.GetTeam()
tagPlayerTeam = tagPlayer.GetTeam()
if tagPlayerTeam == None:
@@ -707,12 +714,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()
@@ -791,12 +796,13 @@
#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
#===============================================================================================
# #请求检查,是否有这个请求
@@ -864,6 +870,10 @@
GameWorld.Log("%s(%d)加入队伍 %s(%d), teamID=%s!" % (joinPlayer.GetName(), joinPlayer.GetPlayerID(),
teamPlayer.GetName(), teamPlayer.GetPlayerID(), teamID))
tagTeam.AddMember(joinPlayer)
+ tagMember = tagTeam.GetMemberByID(joinPlayer.GetPlayerID())
+ if tagMember:
+ tagMember.SetFace(joinPlayer.GetFace())
+ tagMember.SetFacePic(joinPlayer.GetFacePic())
#UpdSceneTeamVersion(teamPlayer.GetMapID(), tick)
#tagTeam.Sync_TeamState()
@@ -1559,13 +1569,16 @@
return (teamLV == IPY_GameServer.tmlMemberCanCall or
teamLV == IPY_GameServer.tmlLeader)
-def CheckTeamOnLineCount(curTeam):
+def CheckTeamOnLineCount(curTeam, includeTJG=True):
##获得队伍剩余在线人数
-
+ if not curTeam:
+ return 0
count = 0
for i in xrange(curTeam.GetMemberCount()):
curPlayer = curTeam.GetMemberPlayer(i)
if curPlayer == None:
+ continue
+ if not includeTJG and PlayerControl.GetIsTJG(curPlayer):
continue
count += 1
return count
@@ -1641,6 +1654,8 @@
nearbyPlayer.LV = player.GetLV()
nearbyPlayer.Job = player.GetJob()
nearbyPlayer.RealmLV = player.GetOfficialRank()
+ nearbyPlayer.Face = player.GetFace()
+ nearbyPlayer.FacePic = player.GetFacePic()
nearbyPlayerInfo.PlayerList.append(nearbyPlayer)
playerCount = len(nearbyPlayerInfo.PlayerList)
@@ -2035,6 +2050,10 @@
teamMember.SetPlayerJobLevel(value)
elif refreshType == IPY_GameServer.CDBPlayerRefresh_OfficialRank:
teamMember.SetPlayerRealmLV(value)
+ elif refreshType == IPY_GameServer.CDBPlayerRefresh_Face:
+ teamMember.SetFace(value)
+ elif refreshType == IPY_GameServer.CDBPlayerRefresh_HairColor:
+ teamMember.SetFacePic(value)
elif refreshType in [IPY_GameServer.CDBPlayerRefresh_VIPLv, IPY_GameServer.CDBPlayerRefresh_ExAttr9]:
SyncMapServerTeamInfo(curTeam, "Refresh", {"refreshType":refreshType, "value":value})
else:
@@ -3226,8 +3245,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