From 3ddd283d8d8fc305e340c496a5993c3aa0356c17 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 九月 2018 01:05:36 +0800
Subject: [PATCH] 3798 还原（修复活动日期相连时如果都配置了提前显示时间不会取最近的活动时间bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
index c9c2859..a9ab98c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.py
@@ -275,7 +275,7 @@
npcHisHurtPlayerList.sort(cmp=CmpFamilyOwnerBossHurtSort)
# 归属仙盟前x名玩家额外奖励，算历史伤血
- batchPlayerIDList, batchAddItemList, batchParamList = [], [], []
+ batchPlayerIDList, batchAddItemList, batchParamList, batchDetailList = [], [], [], []
ownerFamilyPlayerOrderAwardDict = IpyGameDataPY.GetFuncEvalCfg("FairyGrabBoss", 1, {})
curNPCPlayerOrderAwardDict = ownerFamilyPlayerOrderAwardDict.get(bossID, {})
maxOrder = max(curNPCPlayerOrderAwardDict) if curNPCPlayerOrderAwardDict else 0
@@ -290,12 +290,13 @@
batchPlayerIDList.append([hurtPlayer.objID])
batchAddItemList.append(awardItemList)
batchParamList.append([bossID, curOrder])
+ batchDetailList.append({"BossID":bossID, "Order":curOrder})
orderPlayerNameList.append(hurtPlayer.name)
GameWorld.Log(" 归属仙盟第%s名额外奖励: %s" % (curOrder, awardItemList))
if curOrder >= maxOrder:
break
if batchPlayerIDList:
- PlayerControl.SendMailBatch("FairyGrabBoss2", batchPlayerIDList, batchAddItemList, batchParamList)
+ PlayerControl.SendMailBatch("FairyGrabBoss2", batchPlayerIDList, batchAddItemList, batchParamList, batchDetail=batchDetailList)
orderPlayerName = ShareDefine.Def_Space.join(orderPlayerNameList)
PlayerControl.WorldNotify(0, "FairyGrabBossRank", [orderPlayerName, bossID])
@@ -314,7 +315,7 @@
continue
joinAwardPlayerIDList += familyPlayerIDList
if joinAwardPlayerIDList:
- PlayerControl.SendMailByKey("FairyGrabBoss1", joinAwardPlayerIDList, curNPCJoinFamilyAwardList, [bossID, joinAwardNeedHurtHPPer])
+ PlayerControl.SendMailByKey("FairyGrabBoss1", joinAwardPlayerIDList, curNPCJoinFamilyAwardList, [bossID, joinAwardNeedHurtHPPer], detail={"BossID":bossID})
# 同步最终结果给所有参与过的玩家
hurtPack = __GetFamilyOwnerBossHurtPack(hurtMgr, key, objID, bossID, 0)
--
Gitblit v1.8.0