From 68dd06e06c1a4a155884c31403da1155be6f10e8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 四月 2019 17:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py | 318 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 207 insertions(+), 111 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
index 02a3f75..400fcdd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -38,18 +38,18 @@
import PlayerUniversalGameRec
import PlayerCompensation
import IpyGameDataPY
-import MergePlayer
import PyGameDataStruct
+import CrossRealmPlayer
import PyDataManager
import PlayerControl
+import CrossRealmMsg
import CommFunc
import PyGameData
import PlayerGeTui
import IPY_GameServer
+import CrossBoss
import time
-
-
'''
ShareDefine.Def_UniversalGameRecType_BossInfo
@@ -102,18 +102,19 @@
if bossID <= 0:
return
- # 设置不存活，击杀玩家名
- killPlayerName = msgList[1]
- hurtValue = msgList[2]
- isAddKillCnt = msgList[3]
- isNotify = msgList[4] if len(msgList) > 4 else True
- mapID = msgList[5] if len(msgList) > 5 else None
+ bossID, killPlayerName, hurtValue, isNotify, realMapID, dataMapID, copyMapID, killerIDList = msgList
+ if GameWorld.IsCrossServer():
+ CrossBoss.DoCrossBossOnKilled(bossID, killPlayerName, realMapID, dataMapID, copyMapID, killerIDList)
+ return
+
+ mapID = dataMapID
+ isAddKillCnt = False
isMapNeedShunt = IsMapNeedBossShunt(mapID)
isAlive = __GetIsAlive(bossID)
- GameWorld.DebugLog("击杀世界boss DoGameWorldBossOnKilled...bossID=%s,hurtValue=%s,mapID=%s,tick=%s,isMapNeedShunt=%s,isAlive=%s"
- % (bossID, hurtValue, mapID, tick, isMapNeedShunt, isAlive))
+ GameWorld.Log("击杀世界boss DoGameWorldBossOnKilled...bossID=%s,hurtValue=%s,mapID=%s,tick=%s,isMapNeedShunt=%s,isAlive=%s"
+ % (bossID, hurtValue, mapID, tick, isMapNeedShunt, isAlive))
if isMapNeedShunt and not isAlive:
GameWorld.DebugLog("需要分流的地图boss被击杀，但是当前boss全局状态为死亡状态，不再更新boss击杀信息！")
return
@@ -134,7 +135,10 @@
# 全服广播世界boss变更信息
Sync_BossInfo(None, [bossID])
SendMapServerBossKilledCnt(bossID)
-
+
+ horsePetRobBossIDList = IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 1)
+ if bossID in horsePetRobBossIDList:
+ OnFamilyKillHorsePetRobBoss(killPlayerName)
return
def __UpdateBossRefreshList(bossID, killedTime=0, refreshTime=0):
@@ -150,29 +154,30 @@
GameWorld.DebugLog(' PyGameData.g_sortBOSSRefreshList=%s'%PyGameData.g_sortBOSSRefreshList)
return
-## 世界boss重生
-# @param msgList 信息列表
-# @param tick 时间戳
-# @return None
-def DoGameWorldBossOnReborn(msgList, tick):
+def OnGameWorldBossStateChange(msgList, tick):
+ ## 世界boss状态变更
if len(msgList) <= 0:
return
- bossID = msgList[0]
- isAlive = msgList[1]
- mapID = msgList[2] if len(msgList) > 2 else None
- lineID = msgList[3] if len(msgList) > 3 else None
- GameWorld.DebugLog("世界boss DoGameWorldBossOnReborn...mapID=%s,lineID=%s,bossID=%s,state=%s,tick=%s" % (mapID, lineID, bossID, isAlive, tick))
+ bossID, isAlive, dataMapID, realMapID, copyMapID = msgList
+ if GameWorld.IsCrossServer():
+ CrossBoss.DoCrossBossStateChange(bossID, isAlive, dataMapID, realMapID, copyMapID)
+ return
+
+ mapID, lineID = dataMapID, copyMapID
+ GameWorld.Log("世界boss状态变更: mapID=%s,lineID=%s,bossID=%s,state=%s,tick=%s" % (mapID, lineID, bossID, isAlive, tick))
if bossID <= 0:
return
+ bossShuntMapIDList = IpyGameDataPY.GetFuncEvalCfg("BossShunt")
+ isBossShuntMap = mapID in bossShuntMapIDList
isMapNeedShunt = IsMapNeedBossShunt(mapID)
if not isAlive:
DoRemoveBossShuntPlayerByNPCID(mapID, lineID, bossID)
- if isMapNeedShunt:
- __UpdBossLineState(bossID, lineID, isAlive)
+ if isBossShuntMap:
+ __UpdBossLineState(bossID, lineID, isAlive, isMapNeedShunt)
#__GetBossRecDataByID(bossID) # 检查是否有该boss记录，没有的话创建新纪录
if isAlive != __GetIsAlive(bossID):
@@ -185,26 +190,22 @@
PyGameData.g_familyOwnerBossInfo.pop(bossID)
return
-
-def __UpdBossLineState(bossID, lineID, isAlive):
+def __UpdBossLineState(bossID, lineID, isAlive, isMapNeedShunt):
if lineID == None:
return
- bossDeadLineList = PyGameData.g_bossShuntDeadLine.get(bossID, [])
- if isAlive and lineID in bossDeadLineList:
- bossDeadLineList.remove(lineID)
- elif not isAlive and lineID not in bossDeadLineList:
- bossDeadLineList.append(lineID)
- else:
+ bossLineStateDict = PyGameData.g_bossShuntLineState.get(bossID, {})
+ if bossLineStateDict.get(lineID) == isAlive:
+ return
+ bossLineStateDict[lineID] = isAlive
+ PyGameData.g_bossShuntLineState[bossID] = bossLineStateDict
+ # 为方便内网清除开服天测试，状态都更新
+
+ if not isMapNeedShunt:
return
- PyGameData.g_bossShuntDeadLine[bossID] = bossDeadLineList
- if not bossDeadLineList:
- PyGameData.g_bossShuntDeadLine.pop(bossID)
-
- if bossID not in PyGameData.g_bossShuntDeadLineChangeBoss:
- PyGameData.g_bossShuntDeadLineChangeBoss.append(bossID)
- #GameWorld.SendCommMapServerMsg(ShareDefine.Def_Notify_WorldKey_BossShuntDeadLine, PyGameData.g_bossShuntDeadLine)
- GameWorld.DebugLog(" boss已死亡线路变更: %s" % PyGameData.g_bossShuntDeadLine)
+ if bossID not in PyGameData.g_bossShuntStateChangeBoss:
+ PyGameData.g_bossShuntStateChangeBoss.append(bossID)
+ GameWorld.Log(" 分流Boss线路状态变更: %s" % PyGameData.g_bossShuntLineState)
return
@@ -215,7 +216,7 @@
recTypeListData = __GetBossPrizeRecData()
# 查找是否已有记录
bossRec = None
- for index in range(recTypeListData.Count()):
+ for index in xrange(recTypeListData.Count()):
universalRecData = recTypeListData.At(index)
if universalRecData.GetValue1() == bossID:
bossRec = universalRecData
@@ -308,6 +309,20 @@
#
# return
+#// A9 04 查询boss信息 #tagCGQueryBossInfo
+#
+#
+#struct tagCGQueryBossInfo
+#{
+# tagHead Head;
+# BYTE Count; //数量
+# DWORD BossIDList[Count]; //boosid
+#};
+def OnQueryBossInfo(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ bossIDList = clientData.BossIDList
+ Sync_BossInfo(curPlayer, bossIDList)
+ return
## 同步boss相关信息
@@ -321,12 +336,18 @@
recTypeListData = __GetBossPrizeRecData()
bossInfo.BossInfoList = []
#GameWorld.DebugLog("Sync_BossInfo...count=%s,curTime=%s" % (recTypeListData.Count(), curTime))
- for index in range(recTypeListData.Count()):
+ for index in xrange(recTypeListData.Count()):
universalRecData = recTypeListData.At(index)
bossID = universalRecData.GetValue1()
if not bossID:
continue
if syncBOSSIDList and bossID not in syncBOSSIDList:
+ continue
+ ipyData = IpyGameDataPY.GetIpyGameData('BOSSInfo', bossID)
+ if not ipyData:
+ continue
+ mapID = ipyData.GetMapID()
+ if mapID in ChConfig.Def_CrossMapIDList:
continue
bossInfoObj = ChPyNetSendPack.tagBossInfoObj()
bossInfoObj.BossID = bossID
@@ -336,6 +357,7 @@
killedTime = universalRecData.GetValue2()
refreshTime = __GetBossRefreshTime(bossInfoObj.BossID)
bossInfoObj.RefreshSecond = max(0, refreshTime - (curTime - killedTime))
+ bossInfoObj.RefreshCD = refreshTime
#bossInfoObj.KilledCnt = __GetKilledCnt(universalRecData)
bossInfo.BossInfoList.append(bossInfoObj)
@@ -347,7 +369,7 @@
if not curPlayer:
# 全服广播在线玩家
playerManager = GameWorld.GetPlayerManager()
- for i in range(0, playerManager.GetActivePlayerCount()):
+ for i in xrange(playerManager.GetActivePlayerCount()):
curPlayer = playerManager.GetActivePlayerAt(i)
if curPlayer == None or not curPlayer.GetInitOK():
continue
@@ -367,6 +389,9 @@
if not GameWorld.SetWorldDictKey(ChConfig.TYPE_WorldBossProcessTick, tick):
#间隔未到
return
+ if GameWorld.IsCrossServer():
+ CrossBoss.DoCheckCrossBossReborn(tick)
+ return
curTime = int(time.time())
DoCheckWorldBossShuntInfo(curTime, tick)
BossRebornWorldNotify(curTime)
@@ -374,6 +399,9 @@
for i in xrange(IpyGameDataPY.IPY_Data().GetBOSSInfoCount()):
ipyData = IpyGameDataPY.IPY_Data().GetBOSSInfoByIndex(i)
bossID = ipyData.GetNPCID()
+ mapID = ipyData.GetMapID()
+ if mapID in ChConfig.Def_CrossMapIDList:
+ continue
bossPrizeRec = __GetBossRecDataByID(bossID)
killedTime = bossPrizeRec.GetValue2()
refreshTime = __GetBossRefreshTime(bossID)
@@ -414,7 +442,8 @@
if not GameWorld.SetWorldDictKey(ChConfig.TYPE_WorldBossGeTuiTick, tick):
#间隔未到
return
-
+ if GameWorld.IsCrossServer():
+ return
curTime = int(time.time())
for bossInfo in PyGameData.g_sortBOSSRefreshList:
bossID, killedTime, refreshTime = bossInfo
@@ -447,18 +476,21 @@
for i in xrange(IpyGameDataPY.IPY_Data().GetBOSSInfoCount()):
ipyData = IpyGameDataPY.IPY_Data().GetBOSSInfoByIndex(i)
bossID = ipyData.GetNPCID()
+ mapID = ipyData.GetMapID()
+ if mapID in ChConfig.Def_CrossMapIDList:
+ continue
isAlive = __GetIsAlive(bossID)
if not isAlive:
continue
- mapID = ipyData.GetMapID()
- if mapID != ChConfig.Def_FBMapID_SealDemon:
- GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID, 1)
+ #if mapID not in ChConfig.WorldBossFBMapIDList:
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID, 1)
return
## 玩家登录通知
# @param curPlayer
# @return None
def OnPlayerLogin(curPlayer):
+ CrossBoss.OnPlayerLogin(curPlayer)
Sync_BossInfo(curPlayer)
PyDataManager.GetBossAttentionManager().NotifyBossAttentionInfo(curPlayer)
if IsMapNeedBossShunt(0):
@@ -474,30 +506,54 @@
# @param None
# @return None
def OnMapServerInitOK():
+ if GameWorld.IsCrossServer():
+ CrossBoss.OnCrossMapServerInitOK()
+ return
SendMapServerBossKilledCnt()
__SendMapServerAliveBoss()
if IsMapNeedBossShunt(0):
GameWorld.SendCommMapServerMsg(ShareDefine.Def_Notify_WorldKey_BossShuntPlayer, PyGameData.g_bossShuntPlayerInfo)
- GameWorld.SendCommMapServerMsg(ShareDefine.Def_Notify_WorldKey_BossShuntDeadLine, PyGameData.g_bossShuntDeadLine)
- #通知一个参数
- bossID = IpyGameDataPY.GetFuncCfg('DogzFBRefreshCfg', 2)
- onlineCnt = __GetBossOnlineHeroCnt(bossID)[0]
- GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_BossOnlineHeroCnt % bossID, onlineCnt)
+ GameWorld.SendCommMapServerMsg(ShareDefine.Def_Notify_WorldKey_BossShuntLineState, PyGameData.g_bossShuntLineState)
+
+ #仙盟击杀骑宠boss数
+ if PyGameData.g_familyKillHorsePetRobBossCntDict:
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt, PyGameData.g_familyKillHorsePetRobBossCntDict)
return
##--------------------------------------------------------------------------------------------------
+def CrossServerMsg_DropGoodItem(msgList, tick):
+ ## 收到跨服服务器同步的掉落好物品信息
+ playerID = msgList[0]
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if curPlayer:
+ msgList[1] = curPlayer.GetName() # 本服玩家在线，修改为本服玩家的名字展示
+ OnKillBossDropGoodItem(msgList, tick)
+ return
+
def OnKillBossDropGoodItem(msgList, tick):
# playerName, mapID, npcID, itemID, userData
- if len(msgList) != 7:
+ if len(msgList) != 8:
return
- playerID, killerName, mapID, npcID, itemID, userData, weightValue = msgList
- GameWorld.DebugLog("击杀Boss掉落好物品: mapID=%s,npcID=%s,killerName=%s,itemID=%s, userData=%s, weightValue=%s"
- % (mapID, npcID, killerName, itemID, userData, weightValue))
+ playerID, killerName, mapID, npcID, itemID, userData, weightValue, serverGroupID = msgList
+ GameWorld.DebugLog("击杀Boss掉落好物品: mapID=%s,npcID=%s,killerName=%s,itemID=%s, userData=%s, weightValue=%s, serverGroupID=%s"
+ % (mapID, npcID, killerName, itemID, userData, weightValue, serverGroupID))
maxRecordCnt = IpyGameDataPY.GetFuncCfg('DropRecordNum')
if not maxRecordCnt:
return
+
+ if GameWorld.IsCrossServer():
+ # 同步到玩家对应子服
+ if not serverGroupID:
+ return
+ zoneIpyData = CrossRealmPlayer.GetCrossCommZoneIpyDataByServerGroupID(serverGroupID)
+ if not zoneIpyData:
+ return
+ serverGroupIDList = zoneIpyData.GetServerGroupIDList()
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_DropGoodItem, msgList, serverGroupIDList)
+ return
+
recType = ShareDefine.Def_UniversalGameRecType_BossDropGoodItemInfo
universalRecMgr = GameWorld.GetUniversalRecMgr()
recordList = universalRecMgr.GetTypeList(recType)
@@ -527,6 +583,9 @@
PlayerUniversalGameRec.MapServer_UniversalGameRec(None, recType, [mapID, npcID, itemID, playerID, weightValue],
[killerName, "", userData])
+
+ msgList = [killerName, playerID, mapID, npcID, itemID, userData]
+ PlayerControl.WorldNotify(0, 'DropRecord' , msgList)
return
@@ -538,11 +597,16 @@
if not GameWorld.SetWorldDictKey(ChConfig.TYPE_WorldBossOnlineCntTick, tick):
#间隔未到
return
+ if GameWorld.IsCrossServer():
+ return
GameWorld.DebugLog('世界boss在线人数统计')
bossRebornDict = {}
for i in xrange(IpyGameDataPY.IPY_Data().GetBOSSInfoCount()):
ipyData = IpyGameDataPY.IPY_Data().GetBOSSInfoByIndex(i)
bossID = ipyData.GetNPCID()
+ mapID = ipyData.GetMapID()
+ if mapID in ChConfig.Def_CrossMapIDList:
+ continue
refreshTimeStr = ipyData.GetRefreshTime()
if 'onlineCnt' in refreshTimeStr:
bossRebornDict[bossID] = ipyData.GetLVLimit()
@@ -562,15 +626,6 @@
if lvLimit[0] <= findLV <= lvLimit[1]:
playerCntDict[bossid] = playerCntDict.get(bossid, 0) + 1
GameWorld.DebugLog(' boss等级信息对应本服在线人数 %s' % playerCntDict)
-
- # 此处需要统计累加当前在跨服服务器的玩家
- mergeServerOnlinePlayerDict = MergePlayer.GetMergeServerOnlinePlayerInfo()
- for playerInfo in mergeServerOnlinePlayerDict.values():
- findLV = playerInfo[MergePlayer.Def_MSOLPlayer_LV]
- for bossid, lvLimit in bossRebornDict.items():
- if lvLimit[0] <= findLV <= lvLimit[1]:
- playerCntDict[bossid] = playerCntDict.get(bossid, 0) + 1
- GameWorld.DebugLog(' boss等级信息对应本服及跨服在线人数 %s' % playerCntDict)
for bossid, curOnlineCnt in playerCntDict.items():
SetBossOnlineHeroCnt(bossid, curOnlineCnt)
@@ -597,8 +652,6 @@
newNum = newOnlieCnt * 100 + unUpdataCnt
PlayerDBGSEvent.SetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_GameWorldBossOnlineCnt % bossid, newNum)
- if bossid == IpyGameDataPY.GetFuncCfg('DogzFBRefreshCfg', 2):
- GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_BossOnlineHeroCnt % bossid, newOnlieCnt)
GameWorld.DebugLog("设置计算boss刷新时间用的在线人数 Change:bossid=%s, beforeOnlineCnt = %s, newOnlieCnt = %s, unUpdataCnt=%s" % (bossid, beforeOnlineCnt, newOnlieCnt, unUpdataCnt))
return
@@ -614,10 +667,16 @@
if not ipyData:
return
onlineCnt = __GetBossOnlineHeroCnt(bossid)[0]
+ LVLimit = ipyData.GetLVLimit()
+ openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)
+ if openServerDay != 0 and LVLimit and len(LVLimit) == 2:
+ yesterdayCnt = len([1 for lv in PyGameData.g_yesterdayPlayerLVDict.values() if LVLimit[0]<=lv <= LVLimit[1]]) #参数昨日活跃人数
+ else:
+ yesterdayCnt = IpyGameDataPY.GetFuncCfg('FirstDayActivePlayerCnt')
refreshTime = eval(ipyData.GetRefreshTime())
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_BossRefreshTime % bossid, refreshTime)
__UpdateBossRefreshList(bossid, killedTime, refreshTime)
- GameWorld.DebugLog(' 设置boss刷新时间 BossID=%s,onlineCnt=%s,refreshTime=%s' % (bossid, onlineCnt, refreshTime))
+ GameWorld.DebugLog(' 设置boss刷新时间 BossID=%s,onlineCnt=%s,yesterdayCnt=%s,refreshTime=%s' % (bossid, onlineCnt, yesterdayCnt, refreshTime))
return
@@ -655,6 +714,7 @@
def GetBossAttentionDict(self):
return self.bossAttentionDict
+ # RecordData改json记录 bossid存为字符串
def UpdateBossAttention(self, playerid, bossid, isAdd):
if playerid in self.bossAttentionDict:
bossAttentionData = self.bossAttentionDict[playerid]
@@ -696,7 +756,7 @@
packData.BossList = []
for bossid, addState in bttentionDict.items():
bossInfo = ChPyNetSendPack.tagGCBossAttention()
- bossInfo.BossID=bossid
+ bossInfo.BossID=int(bossid)
bossInfo.AddState=addState
packData.BossList.append(bossInfo)
@@ -728,10 +788,7 @@
data.clear()
pos += data.readData(datas, pos, dataslen)
playerID = data.PlayerID
- if type(eval(data.RecordData)) != list:
- self.bossAttentionDict[playerID] = data
- else:
- data.clear()
+ self.bossAttentionDict[playerID] = data
return pos
@@ -802,10 +859,10 @@
def DoCheckWorldBossShuntInfo(curTime, tick):
## 定时检查boss分流信息数据
- if PyGameData.g_bossShuntDeadLineChangeBoss and curTime % 2 == 0:
- GameWorld.SendCommMapServerMsg(ShareDefine.Def_Notify_WorldKey_BossShuntDeadLine, PyGameData.g_bossShuntDeadLine)
- Sync_BossShuntLineInfo(None, PyGameData.g_bossShuntDeadLineChangeBoss)
- PyGameData.g_bossShuntDeadLineChangeBoss = []
+ if PyGameData.g_bossShuntStateChangeBoss and curTime % 5 == 0:
+ GameWorld.SendCommMapServerMsg(ShareDefine.Def_Notify_WorldKey_BossShuntLineState, PyGameData.g_bossShuntLineState)
+ Sync_BossShuntLineInfo(None, PyGameData.g_bossShuntStateChangeBoss)
+ PyGameData.g_bossShuntStateChangeBoss = []
if curTime % 10 != 0:
return
@@ -860,16 +917,23 @@
def Sync_BossShuntLineInfo(curPlayer=None, syncBOSSIDList=[]):
if not syncBOSSIDList:
- syncBOSSIDList = PyGameData.g_bossShuntDeadLine.keys()
+ syncBOSSIDList = PyGameData.g_bossShuntLineState.keys()
bossShuntLineInfo = ChPyNetSendPack.tagGCBossShuntLineStateInfo()
bossShuntLineInfo.Clear()
bossShuntLineInfo.BossLineStateInfo = []
for bossID in syncBOSSIDList:
+ bossLineStateDict = PyGameData.g_bossShuntLineState.get(bossID, {})
+ lineIDList = []
+ stateList = []
+ for lineID, state in bossLineStateDict.items():
+ lineIDList.append(lineID)
+ stateList.append(state)
bossLineState = ChPyNetSendPack.tagGCBossShuntLineState()
bossLineState.BossID = bossID
- bossLineState.DeadLineList = PyGameData.g_bossShuntDeadLine.get(bossID, [])
- bossLineState.DeadLineCount = len(bossLineState.DeadLineList)
+ bossLineState.LineIDList = lineIDList
+ bossLineState.StateList = stateList
+ bossLineState.LineCount = len(bossLineState.LineIDList)
bossShuntLineInfo.BossLineStateInfo.append(bossLineState)
bossShuntLineInfo.Count = len(bossShuntLineInfo.BossLineStateInfo)
@@ -911,6 +975,9 @@
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_BossRebornPoint, updPoint)
if curPoint+addPoint >= totalPoint:
#重生boss
+ rebornCnt = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_BossRebornCnt)
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_BossRebornCnt, rebornCnt+1)
+
killBossCntLimitDict = IpyGameDataPY.GetFuncEvalCfg('KillBossCntLimit', 1, {})
canRebornBossIDList = []
for bidlist, bkey in killBossCntLimitDict.items():
@@ -930,8 +997,10 @@
refreshTime = 0
PyGameData.g_sortBOSSRefreshList[i] = [bossID, killedTime, refreshTime]
bossIDList.append(bossID)
+ curTime = int(time.time())
+ PyGameData.g_sortBOSSRefreshList.sort(key=lambda asd:max(0, asd[2] - (curTime - asd[1])))
GameWorld.Log(' boss复活活动 重生boss bossIDList=%s'%bossIDList)
- g_lastBossRebornTime = int(time.time())
+ g_lastBossRebornTime = curTime
else:
#广播
needNotifyPointPerList = IpyGameDataPY.GetFuncEvalCfg('BossRebornNotify')
@@ -948,6 +1017,8 @@
def ResetBossRebornPoint():
## 重置boss复活点
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_BossRebornPoint, 0)
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_BossRebornCnt, 0)
+
# 活动开启时设置参数 服务器人数
lvLimit = IpyGameDataPY.GetFuncCfg('ServerActivePlayerCnt')
yesterdayPlayerCnt = len([1 for lv in PyGameData.g_yesterdayPlayerLVDict.values() if lv >= lvLimit]) #参数昨日活跃人数
@@ -999,6 +1070,7 @@
if not totalPoint:
totalPoint = SetBossRebornNeedPoint()
packData.TotalPoint = totalPoint
+ packData.RebornCnt = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_BossRebornCnt)
playerManager = GameWorld.GetPlayerManager()
if not curPlayer:
for i in xrange(playerManager.GetActivePlayerCount()):
@@ -1014,38 +1086,62 @@
NetPackCommon.SendFakePack(curPlayer, packData)
return
-def Sync_DogzNPCRefreshTime(msgList):
- #同步神兽副本NPC刷新时间
- playerID, refreshTimeDict = msgList
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID) if playerID else None
- if playerID and not curPlayer:
+## -----------------------------------------------------------------------------------------------
+
+def OnFamilyKillHorsePetRobBoss(killFamilyName):
+ ## 仙盟击杀骑宠boss
+
+ family = GameWorld.GetFamilyManager().FindFamilyByName(killFamilyName)
+ if not family:
+ GameWorld.ErrLog("找不到该仙盟名: killFamilyName=%s" % killFamilyName)
return
- if not refreshTimeDict:
- return
- packData = ChPyNetSendPack.tagGCDogzNPCRefreshTime()
- packData.InfoList=[]
- for npcid, rTime in refreshTimeDict.items():
- timeInfo = ChPyNetSendPack.tagDogzTimeInfoObj()
- timeInfo.NPCID = npcid
- timeInfo.RefreshSecond = rTime
- packData.InfoList.append(timeInfo)
- packData.Cnt = len(packData.InfoList)
- if not playerID:
- playerManager = GameWorld.GetPlayerManager()
- for i in xrange(playerManager.GetActivePlayerCount()):
- curPlayer = playerManager.GetActivePlayerAt(i)
- if curPlayer == None or not curPlayer.GetInitOK():
- continue
- if PlayerControl.GetIsTJG(curPlayer):
- continue
- NetPackCommon.SendFakePack(curPlayer, packData)
- else:
- if PlayerControl.GetIsTJG(curPlayer):
- return
- NetPackCommon.SendFakePack(curPlayer, packData)
+
+ familyID = family.GetID()
+ PyGameData.g_familyKillHorsePetRobBossCntDict[familyID] = PyGameData.g_familyKillHorsePetRobBossCntDict.get(familyID, 0) + 1
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt, PyGameData.g_familyKillHorsePetRobBossCntDict)
+ GameWorld.Log("骑宠争夺仙盟击杀Boss数统计: %s" % PyGameData.g_familyKillHorsePetRobBossCntDict)
return
-## -----------------------------------------------------------------------------------------------
+def SyncMapServer_HorsePetRobBossPlayerCount():
+ ## 活动开始前，同步有效活动人数到地图，作为Boss属性成长系数用
+
+ diffWorldLV = int(IpyGameDataPY.GetFuncCfg("FairyGrabBossID", 3))
+ funcLimitLV = PlayerControl.GetFuncLimitLV(ShareDefine.GameFuncID_HorsePetRobBoss)
+ curWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)
+ minLV = max(funcLimitLV, curWorldLV + diffWorldLV)
+
+ playerCount = 0
+ playerManager = GameWorld.GetPlayerManager()
+ for i in xrange(playerManager.GetActivePlayerCount()):
+ findPlayer = playerManager.GetActivePlayerAt(i)
+ if findPlayer == None or not findPlayer.GetInitOK():
+ continue
+
+ if PlayerControl.GetIsTJG(findPlayer):
+ continue
+
+ if not findPlayer.GetFamilyID():
+ continue
+
+ if findPlayer.GetLV() < minLV:
+ continue
+
+ playerCount += 1
+
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_HorsePetRobBossPlayerCount, playerCount)
+ GameWorld.Log("同步骑宠争夺有效参与人数: playerCount=%s,minLV=%s,funcLimitLV=%s,curWorldLV=%s,diffWorldLV=%s"
+ % (playerCount, minLV, funcLimitLV, curWorldLV, diffWorldLV))
+ return
+
+def OnHorsePetRobBossActionChange(isOpen):
+ ## 骑宠争夺活动状态变更
+
+ # 无论开关都重置, 服务器活动中维护暂时不处理
+ PyGameData.g_familyKillHorsePetRobBossCntDict = {}
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt, PyGameData.g_familyKillHorsePetRobBossCntDict)
+
+
+ return
def MapServer_HorsePetRobBossHurtPlayer(msgInfo):
## 骑宠争夺boss伤血玩家同步
@@ -1136,6 +1232,6 @@
if curMember.GetFamilyLV() == IPY_GameServer.fmlMember:
GameWorld.DebugLog("普通成员无法召集！", playerID)
return
- PlayerControl.FamilyNotify(curFamily.GetID(), "FairyGrabBossHelp", [npcID])
+ PlayerControl.FamilyNotify(curFamily.GetID(), "FairyGrabBossHelp", [curPlayer.GetName(), npcID])
return
--
Gitblit v1.8.0