From 2e1b0969fb141b9677230a56f9c29020362a5eab Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 03 九月 2018 15:08:01 +0800
Subject: [PATCH] Fix: 1819 玩家切地图，家族等级数据同步会异常(修复仙盟心法切图后无法升级的bug);
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
index dd7e024..02a3f75 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -36,6 +36,7 @@
import ChPyNetSendPack
import PlayerDBGSEvent
import PlayerUniversalGameRec
+import PlayerCompensation
import IpyGameDataPY
import MergePlayer
import PyGameDataStruct
@@ -44,6 +45,8 @@
import CommFunc
import PyGameData
import PlayerGeTui
+import IPY_GameServer
+
import time
@@ -178,7 +181,7 @@
Sync_BossInfo(None, [bossID])
# 仙盟归属boss的重置
- if bossID in PyGameData.g_familyOwnerBossInfo:
+ if isAlive and bossID in PyGameData.g_familyOwnerBossInfo:
PyGameData.g_familyOwnerBossInfo.pop(bossID)
return
@@ -911,7 +914,7 @@
killBossCntLimitDict = IpyGameDataPY.GetFuncEvalCfg('KillBossCntLimit', 1, {})
canRebornBossIDList = []
for bidlist, bkey in killBossCntLimitDict.items():
- if bkey not in [0, 1]:
+ if bkey not in [ShareDefine.Def_Boss_Func_World, ShareDefine.Def_Boss_Func_Home]:
continue
canRebornBossIDList += list(bidlist)
@@ -1042,6 +1045,38 @@
NetPackCommon.SendFakePack(curPlayer, packData)
return
+## -----------------------------------------------------------------------------------------------
+
+def MapServer_HorsePetRobBossHurtPlayer(msgInfo):
+ ## 骑宠争夺boss伤血玩家同步
+ GameWorld.Log("骑宠争夺boss伤血玩家同步: %s" % str(msgInfo))
+ if not isinstance(msgInfo, list) and len(msgInfo) != 2:
+ return
+
+ bossID, familyHurtPlayerIDListDict = msgInfo
+ PyGameData.g_horsePetRobBossHurtPlayerIDInfo[bossID] = familyHurtPlayerIDListDict
+ GameWorld.Log("伤血玩家汇总: %s" % PyGameData.g_horsePetRobBossHurtPlayerIDInfo)
+
+ # 判断是否都同步上来了
+ horsePetRobBossIDList = IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 1)
+ for needBossID in horsePetRobBossIDList:
+ if needBossID not in PyGameData.g_horsePetRobBossHurtPlayerIDInfo:
+ return
+
+ # 结算活动参与奖励
+ joinAwardItemList = IpyGameDataPY.GetFuncEvalCfg("FairyGrabBossID", 2)
+ joinPlayerIDList = []
+ for familyHurtPlayerIDDict in PyGameData.g_horsePetRobBossHurtPlayerIDInfo.values():
+ for playerIDList in familyHurtPlayerIDDict.values():
+ for playerID in playerIDList:
+ if playerID not in joinPlayerIDList:
+ joinPlayerIDList.append(playerID)
+
+ GameWorld.Log("结算骑宠争夺参与奖玩家: joinPlayerIDList=%s" % joinPlayerIDList)
+ PlayerCompensation.SendMailByKey("FairyGrabBossJoin", joinPlayerIDList, joinAwardItemList)
+ PyGameData.g_horsePetRobBossHurtPlayerIDInfo = {}
+ return
+
def MapServer_FamilyOwnerBossInfo(msgInfo):
## 地图同步仙盟归属boss信息
@@ -1050,6 +1085,7 @@
return
PyGameData.g_familyOwnerBossInfo.update(msgInfo)
+ #GameWorld.DebugLog(" PyGameData.g_familyOwnerBossInfo=%s" % PyGameData.g_familyOwnerBossInfo)
return
#// AC 04 查询仙盟抢Boss所有Boss当前进度 #tagCGQueryAllFamilyBossHurt
@@ -1079,3 +1115,27 @@
NetPackCommon.SendFakePack(curPlayer, hurtPack)
return
+#// AC 05 召集仙盟成员打boss #tagCGCallupFamilyMemberToBoss
+#
+#struct tagCGCallupFamilyMemberToBoss
+#{
+# tagHead Head;
+# DWORD NPCID;
+#};
+def OnCallupFamilyMemberToBoss(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ playerID = curPlayer.GetPlayerID()
+ npcID = clientData.NPCID
+
+ curFamily = curPlayer.GetFamily()
+ if curFamily == None:
+ return
+ curMember = curFamily.FindMember(playerID)
+ if curMember == None:
+ return
+ if curMember.GetFamilyLV() == IPY_GameServer.fmlMember:
+ GameWorld.DebugLog("普通成员无法召集！", playerID)
+ return
+ PlayerControl.FamilyNotify(curFamily.GetID(), "FairyGrabBossHelp", [npcID])
+ return
+
--
Gitblit v1.8.0