From 02a9f1326fd99fc60ee14c70bb55d714803607f0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 08 七月 2019 15:25:56 +0800
Subject: [PATCH] 4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服，回来后归属不会清，boss不会回血
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.py | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.py
index e7b0983..b430df7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.py
@@ -197,16 +197,20 @@
if not zoneID:
return
- __SetCrossBossIsAlive(zoneID, bossID, isAlive)
-
- if isAlive:
- # 广播子服跨服boss复活
- zoneIpyData = CrossRealmPlayer.GetCrossZoneIpyDataByZoneID(mapID, zoneID)
- if zoneIpyData != None:
- serverGroupIDList = zoneIpyData.GetServerGroupIDList()
- stateInfo = [zoneID, bossID, isAlive]
- CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossBossState, stateInfo, serverGroupIDList)
-
+ if __GetCrossBossIsAlive(zoneID, bossID) != isAlive:
+ __SetCrossBossIsAlive(zoneID, bossID, isAlive)
+ if isAlive:
+ # 广播子服跨服boss复活
+ SendClientServerCrossBossState(mapID, zoneID, {bossID:isAlive})
+ return
+
+def SendClientServerCrossBossState(mapID, zoneID, bossStateDict={}):
+ # 广播子服跨服boss复活
+ zoneIpyData = CrossRealmPlayer.GetCrossZoneIpyDataByZoneID(mapID, zoneID)
+ if zoneIpyData != None:
+ serverGroupIDList = zoneIpyData.GetServerGroupIDList()
+ stateInfo = [zoneID, bossStateDict]
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossBossState, stateInfo, serverGroupIDList)
return
def __SetKilledRecord(bossRecData, killedTime, playerName):
@@ -272,13 +276,13 @@
bossRecData = __GetCrossBossRecData(zoneID, bossID)
killedTime = GetRecKilledTime(bossRecData)
refreshTime = GetRecRefreshTime(bossRecData)
- PyGameData.g_sortBOSSRefreshList.append([bossID, killedTime, refreshTime, zoneID])
+ PyGameData.g_sortBOSSRefreshList.append([bossID, killedTime, refreshTime, zoneID, mapID])
PyGameData.g_sortBOSSRefreshList.sort(key=lambda asd:max(0, asd[2] - (curTime - asd[1])))
#GameWorld.DebugLog("检查boss复活: PyGameData.g_sortBOSSRefreshList=%s" % PyGameData.g_sortBOSSRefreshList)
- syncBOSSIDList = []
+ zoneMapBossStateDict = {}
for bossInfo in PyGameData.g_sortBOSSRefreshList:
- bossID, killedTime, refreshTime, zoneID = bossInfo
+ bossID, killedTime, refreshTime, zoneID, mapID = bossInfo
isAlive = __GetCrossBossIsAlive(zoneID, bossID)
if isAlive:
#GameWorld.DebugLog(" zoneID=%s,bossID=%s,未被击杀！" % (zoneID, bossID))
@@ -289,12 +293,21 @@
#GameWorld.DebugLog(" zoneID=%s,bossID=%s,refreshTime=%s,curTime=%s,killedTime=%s,重生倒计时秒(%s)！" % (zoneID, bossID, refreshTime, curTime, killedTime, rebornSecond))
break
- __SetCrossBossIsAlive(zoneID, bossID, 1)
- syncBOSSIDList.append(bossID)
+ isAlive = 1
+ __SetCrossBossIsAlive(zoneID, bossID, isAlive)
+
+ key = (mapID, zoneID)
+ if key not in zoneMapBossStateDict:
+ zoneMapBossStateDict[key] = {}
+ bossStateDict = zoneMapBossStateDict[key]
+ bossStateDict[bossID] = isAlive
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_GameWorldBossRebornCross % (zoneID, bossID), 1)
GameWorld.DebugLog(" 通知MapServer重生: zoneID=%s,bossID=%s,killedTime=%s,rebornSecond=%s" % (zoneID, bossID, killedTime, rebornSecond))
+ for key, bossStateDict in zoneMapBossStateDict.items():
+ mapID, zoneID = key
+ SendClientServerCrossBossState(mapID, zoneID, bossStateDict)
return
def GetCrossBossIsAliveOrCanReborn(zoneID, bossID):
@@ -388,13 +401,17 @@
def CrossServerMsg_CrossBossState(msgInfo):
## 收到跨服服务器同步的跨服boss状态
- zoneID, bossID, isAlive = msgInfo
- GameWorld.DebugLog("收到跨服服务器同步的跨服boss状态: zoneID=%s, bossID=%s, isAlive=%s" % (zoneID, bossID, isAlive))
+ zoneID, bossStateDict = msgInfo
+ GameWorld.DebugLog("收到跨服服务器同步的跨服boss状态: zoneID=%s, bossStateDict=%s" % (zoneID, bossStateDict))
- __SetCrossBossIsAlive(zoneID, bossID, isAlive)
+ aliveBossIDList = []
+ for bossID, isAlive in bossStateDict.items():
+ __SetCrossBossIsAlive(zoneID, bossID, isAlive)
+ if isAlive:
+ aliveBossIDList.append(bossID)
- if isAlive:
- Sync_CrossBossInfo(None, [bossID])
+ if aliveBossIDList:
+ Sync_CrossBossInfo(None, aliveBossIDList)
return
--
Gitblit v1.8.0