From f8cbb085900ff5959d302879b8073e5cf79aa322 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 十二月 2018 22:28:49 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（修复无法领奖bug）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py | 173 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 121 insertions(+), 52 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
index a8b7c46..5c4c4b4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
@@ -41,6 +41,7 @@
import PlayerViewCache
import GameWorldBoss
import PlayerTalk
+import PlayerTeam
import copy
import random
@@ -348,7 +349,9 @@
# 玩家战盟名变更处理
__OnFamilyNameChange(jionPlayer.GetPlayerID(), curFamily.GetName())
-
+ #玩家缓存
+ PlayerViewCache.OnPlayerFamilyChange(jionPlayer.GetPlayerID(), curFamily.GetID(), curFamily.GetName())
+ PlayerTeam.OnTeamMemFamilyRefresh(jionPlayer, curFamily.GetID())
#加入仙盟联赛成员
GameWorldFamilyWar.AddFamilyWarMem(jionPlayer.GetPlayerID(), curFamily.GetID())
GameWorldFamilyWar.CheckPlayerJoinFamilyWarInfo(jionPlayer)
@@ -749,7 +752,7 @@
pack = IPY_GameServer.IPY_CFamilyChangeBroadcast()
#更改家族公告
curFamily.SetBroadcast(pack.GetMsg())
-
+ GameWorld.Log('更改仙盟公告 Family=%s,公告=%s'%(GameWorld.CodeToGBK(curFamily.GetName()), GameWorld.CodeToGBK(pack.GetMsg())), curPlayerID)
#通知客户端家族信息改变
curFamily.Broadcast_FamilyChange()
playerManager = GameWorld.GetPlayerManager()
@@ -1194,10 +1197,11 @@
if pack_FamilyLv not in ChConfig.Def_Family_MemberLVList:
GameWorld.Log("更改家族成员等级->封包异常->等级 = %s不存在" % (pack_FamilyLv), curPlayerID)
return
- if curMember.GetFamilyLV() != IPY_GameServer.fmlLeader:
- if tagMember.GetFamilyLV() >= curMember.GetFamilyLV() or pack_FamilyLv >= curMember.GetFamilyLV():
- GameWorld.Log("更改家族成员等级->目标职位比自己的高或者对方的当前职位比自己高", curPlayerID)
- return
+ if not isGMOP:
+ if curMember.GetFamilyLV() != IPY_GameServer.fmlLeader:
+ if tagMember.GetFamilyLV() >= curMember.GetFamilyLV() or pack_FamilyLv >= curMember.GetFamilyLV():
+ GameWorld.Log("更改家族成员等级->目标职位比自己的高或者对方的当前职位比自己高", curPlayerID)
+ return
familyID = curFamily.GetID() # 家族ID
familyName = curFamily.GetName() # 家族名字
@@ -1246,7 +1250,10 @@
if tagMember.GetFamilyLV() != pack_FamilyLv:
#XW_JZ_AppointFamily <n color="255,255,0">恭喜</n><n color="0,190,255">{%S1%}</n><n color="255,255,0">，被任命为{%S2%}！</n> 25 - -
NotifyAllFamilyMemberMsg(curFamily, curPlayer, "XW_JZ_AppointFamily", [tagMember.GetName(), pack_FamilyLv])
-
+ if tagMember.GetFamilyLV() == IPY_GameServer.fmlViceLeader and tagMember.GetPlayerID() in PyGameData.g_autoViceleaderDict.get(familyID, []):
+ #自动安排的副盟主被撤职则该盟不再自动安排
+ if familyID not in PyGameData.g_forbidAutoViceleaderFamily:
+ PyGameData.g_forbidAutoViceleaderFamily.append(familyID)
#更改家族等级
ChangeFamilyMemberLv(tagMember, pack_FamilyLv)
@@ -1264,7 +1271,8 @@
if GetFamilyMemberHasPow(tagMember, ChConfig.Def_PurviewDictKey_CanCall):
tagPlayer.Sync_FamilyInfo()
PlayerFamilyAction.ViewFamilyRequestInfo(tagPlayer)
-
+ if isGMOP:
+ curFamily.SetBroadcast('')
curFamily.Broadcast_FamilyChange()
return True
#---------------------------------------------------------------------
@@ -1487,6 +1495,20 @@
if GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyRobBoss):
PlayerControl.NotifyCode(curPlayer, "FairyGrabBossExitError")
return
+ #判断退出时间间隔
+ curTime = int(time.time())
+ lastLeaveFamilyTime = PlayerControl.GetLeaveFamilyTime(curPlayer)
+ if lastLeaveFamilyTime > 100:
+ remainTime = IpyGameDataPY.GetFuncCfg('ExitFairyTime', 2) - (curTime - lastLeaveFamilyTime)
+ if remainTime > 0:
+ PlayerControl.NotifyCode(curPlayer, "ExitFairyTime", [remainTime*1000])
+ return
+ updTime = 1 if IpyGameDataPY.GetFuncCfg('ExitFairyTime') > 1 else curTime
+ elif lastLeaveFamilyTime >= IpyGameDataPY.GetFuncCfg('ExitFairyTime')-1:
+ updTime = curTime
+ else:
+ updTime = lastLeaveFamilyTime+1
+ PlayerControl.SetLeaveFamilyTime(curPlayer, updTime)
#XW_JZ_LeaveFamily <n color="0,190,255">{%S1%}</n><n color="255,255,0">退出了家族！</n> 25 - -
NotifyAllFamilyMemberMsg(curFamily, curPlayer, "XW_JZ_LeaveFamily", [curPlayer.GetName()])
@@ -1502,7 +1524,7 @@
__DoPlayerLeaveFamilyByID(curFamily, curPlayerID)
DataRecordPack.DR_PlayerLeaveFamily(curPlayer, curFamily.GetID(), curFamily.GetName(), curFamily.GetCount(),
- familyLV, curPlayer.GetPlayerID(), curPlayer.GetName(), familyLV)
+ familyLV, curPlayer.GetPlayerID(), curPlayer.GetName(), familyLV, updTime)
if curFamily.GetCount() == 0:
#玩家离开后, 家族没有人了 , 删除这个家族
@@ -1522,7 +1544,9 @@
# 玩家战盟名变更处理
__OnFamilyNameChange(leavePlayerID, '')
AddFamilyIDToFightPowerChangeList(curFamily.GetID())
- PlayerViewCache.OnPlayerLeaveFamily(leavePlayerID)
+ PlayerViewCache.OnPlayerFamilyChange(leavePlayerID, 0, "")
+ if leavePlayerID in PyGameData.g_autoViceleaderDict.get(curFamily.GetID(),[]):
+ PyGameData.g_autoViceleaderDict[curFamily.GetID()].remove(leavePlayerID)
return
#//////////////////////////////////////////////////////////////
@@ -1785,7 +1809,6 @@
def PlayerForceLeaveFamily(curPlayer, tick):
if curPlayer == None:
return
-
#设置当天加入家族
GameWorld.GetPlayerManager().SetForbiddenEnterFamily(curPlayer.GetPlayerID(), True)
# 通知map玩家不能参加家族活动
@@ -1800,6 +1823,8 @@
#弹劾信息封包
SendPackClientImpeachMsg(curPlayer, 0, 0)
+ PlayerTeam.OnTeamMemFamilyRefresh(curPlayer, 0)
+
return
#---------------------------------------------------------------------
@@ -2531,8 +2556,6 @@
# if useMoney > 0:
# #帮会日常维持消耗{%S1%}银两帮会资金
# PlayerControl.FamilyNotify(family.GetID(), 'jiazu_lhs_272921', [useMoney])
- #自动传位
- __AutoChangeLeader(family)
#通知客户端刷新
family.Broadcast_FamilyChange()
@@ -2573,6 +2596,12 @@
SetFamilyBroadcastCnt(family, 0)
#清除本周任务已获得资金数量
SetCurWeekMissionMoney(family, 0)
+ for j in xrange(family.GetCount()):
+ member = family.GetAt(j)
+ #原先是地图玩家上线后重置，导致玩家不上线周贡献显示之前的，固在此重置
+ member.SetFamilyActiveValue(0)
+
+
#通知地图服务器刷新家族属性
SendPack_MapServer_PlayerFamilyRefresh(family)
#oss记录上周家族信息
@@ -2583,6 +2612,76 @@
PlayerFamilyBoss.FamilyBossFBOnWeek(familyID)
return
+
+def FamilyOnHour():
+ familyManager = GameWorld.GetFamilyManager()
+ for i in xrange(familyManager.GetCount()):
+ family = familyManager.GetAt(i)
+ #自动传位
+ __AutoChangeLeader(family)
+
+ __AutoChangeFamilyJobLV(family)
+ return
+
+def __AutoChangeFamilyJobLV(family):
+ ##开服2天内新创建的仙盟，系统自动为仙盟安排两位副盟主
+ familyID = family.GetID()
+ openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)
+ if openServerDay >= IpyGameDataPY.GetFuncCfg('FairyFMZ'):
+ #GameWorld.DebugLog('自动为仙盟安排两位副盟主 开服天超过 familyID=%s'%familyID)
+ return
+
+ if familyID in PyGameData.g_forbidAutoViceleaderFamily:
+ #GameWorld.DebugLog('自动为仙盟安排两位副盟主 被禁止 familyID=%s'%familyID)
+ return
+ createTime = family.GetCreateTime()
+ pastHour = GameWorld.GetPastHour(createTime)
+ if pastHour < IpyGameDataPY.GetFuncCfg('FairyFMZ', 2):
+ #GameWorld.DebugLog('自动为仙盟安排两位副盟主 建盟未超过X小时 familyID=%s,pastHour=%s'%(familyID, pastHour))
+ return
+ if (pastHour - IpyGameDataPY.GetFuncCfg('FairyFMZ', 2)) % IpyGameDataPY.GetFuncCfg('FairyFMZ', 3) != 0:
+ GameWorld.DebugLog('自动为仙盟安排两位副盟主 间隔没到 familyID=%s,pastHour=%s'%(familyID, pastHour))
+ return
+
+ tofmlv = IPY_GameServer.fmlViceLeader
+ viceLeaderCnt = 0 #副盟主数量
+ changeMemberList = []
+ for i in xrange(family.GetCount()):
+ familyMember = family.GetAt(i)
+ if familyMember.GetFamilyLV() == tofmlv:
+ viceLeaderCnt += 1
+ continue
+ if familyMember.GetFamilyLV() < tofmlv:
+ changeMemberList.append(familyMember)
+
+ maxCnt = GetFamilySetting(family, ChConfig.Def_FamilyPowLvChangeFamilySettingDict[tofmlv])
+ #GameWorld.DebugLog('自动为仙盟安排两位副盟主 familyID=%s,viceLeaderCnt=%s,changeMemberList=%s'%(familyID, viceLeaderCnt, changeMemberList))
+ if viceLeaderCnt >= maxCnt or not changeMemberList:
+ return
+
+ if familyID not in PyGameData.g_autoViceleaderDict:
+ PyGameData.g_autoViceleaderDict[familyID] = []
+
+ changeMemberList.sort(cmp=CmpAutoMemberSort)
+ for i, member in enumerate(changeMemberList):
+ if viceLeaderCnt + i >= maxCnt:
+ break
+ ChangeFamilyMemberLv(member, tofmlv)
+ playerID = member.GetPlayerID()
+ if playerID not in PyGameData.g_autoViceleaderDict[familyID]:
+ PyGameData.g_autoViceleaderDict[familyID].append(playerID)
+ GameWorld.Log('自动为仙盟安排副盟主 familyID=%s,playerID=%s'%(familyID, playerID))
+
+ return
+
+def CmpAutoMemberSort(member1, member2):
+ ## 排序规则: 等级>战力>入盟先后
+ ret = -cmp(member1.GetLV(), member2.GetLV())
+ if ret == 0:
+ ret = -cmp(GetMemberFightPower(member1), GetMemberFightPower(member2))
+ if ret == 0:
+ return cmp(GetMemberJoinTime(member1), GetMemberJoinTime(member2))
+ return ret
#---------------------------------------------------------------------
##通知地图服务器, 玩家家族属性刷新
@@ -2702,16 +2801,15 @@
return 0
leaderID = curFamily.GetLeaderID()
- # 帮主在线
- if GameWorld.GetPlayerManager().FindPlayerByID(leaderID) != None:
- return 0
curMember = curFamily.FindMember(leaderID)
if curMember == None:
GameWorld.Log("GetLeaderOfflineTime->FindMember, None;%s" % leaderID)
return 0
-
- offLineTime = GameWorld.ChangeTimeNumToStr(curMember.GetExattr2())
+ offLineTimeNum = curMember.GetExattr2()
+ if not offLineTimeNum:
+ return 0
+ offLineTime = GameWorld.ChangeTimeNumToStr(offLineTimeNum)
return GameWorld.GetPastHour(offLineTime)
def GetLastOnlineMemberOfflineTime(family):
@@ -2719,17 +2817,14 @@
offLineTime = 0
for i in range(0, family.GetCount()):
member = family.GetAt(i)
- playerID = member.GetPlayerID()
- tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
- if tagPlayer:
- return 0
- if not member.GetExattr2():
+ offLineTimeNum = member.GetExattr2()
+ if not offLineTimeNum:
#有人在线直接返回
return 0
if not offLineTime:
- offLineTime = member.GetExattr2()
+ offLineTime = offLineTimeNum
else:
- offLineTime = max(offLineTime, member.GetExattr2())
+ offLineTime = max(offLineTime, offLineTimeNum)
if not offLineTime:
return 0
offLineTime = GameWorld.ChangeTimeNumToStr(offLineTime)
@@ -2739,7 +2834,7 @@
'''自动传位'''
# 获得帮主下线了多久(小时)
leaderOffLineTime = GetLeaderOfflineTime(curFamily)
- GameWorld.DebugLog('帮主下线了%s小时'%leaderOffLineTime)
+ GameWorld.DebugLog('帮主下线了%s小时'%leaderOffLineTime, curFamily.GetID())
if leaderOffLineTime < IpyGameDataPY.GetFuncCfg('AutoChangeLeader'):
return
@@ -3342,32 +3437,6 @@
return ret
return 0
-
-def UpdFamilyWarRank():
- '''更新仙盟联赛排名
- 注意：该逻辑在仙盟联赛周期中不可执行，仅在下周分组定级状态下可更新
- 仙盟联赛新一周期开始时、仙盟解散时 会触发该逻辑
- '''
- gameWorld = GameWorld.GetGameWorld()
- state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyWar)
- if state != GameWorldFamilyWar.FamilyWarState_NextWeekGroupRank:
- GameWorld.DebugLog("非下周分组定级阶段不可更新仙盟联赛排名!")
- return
-
- familyMgr = GameWorld.GetFamilyManager()
- sortFamilyIDList = GetSortFamilyIDList()
- for rank, familyID in enumerate(sortFamilyIDList, 1):
- family = familyMgr.FindFamily(familyID)
- if not family:
- continue
- curRank = GetFamilyWarRank(family)
- if not curRank:
- break
- if curRank != rank:
- SetFamilyWarRank(family, rank)
- GameWorld.Log("更新仙盟联赛仙盟排名: familyID=%s,rank=%s" % (family.GetID(), rank))
-
- return
#// A4 11 一键申请入盟 #tagCGOneKeyJoinFamily
#
--
Gitblit v1.8.0