From ffb2b5d1c7246523bb51e75d067c14d7bb8bbdc5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 25 一月 2019 16:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/1.5.200.develop'
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
index 5e00d42..c0902b3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py
@@ -416,7 +416,7 @@
gameFB.SetPlayerGameFBDict(firstPlayerID, FBPlayerDict_Rank, 1)
if not dropPosX or not dropPosY:
dropPosX, dropPosY = firstPlayer.GetPosX(), firstPlayer.GetPosY()
- prizeItemList = GiveZhuXianBossAward(firstPlayer, lineID, dropItemMapInfo=[dropPosX, dropPosY, True])
+ prizeItemList = GiveZhuXianBossAward(firstPlayer, lineID, dropItemMapInfo=[dropPosX, dropPosY, True, True])
if not prizeItemList:
# 没有掉落时直接通知结算，防止卡副本
firstPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
@@ -433,7 +433,6 @@
helpItemList = FBCommon.GetFBLineReward(mapID, lineID)
if helpItemList: #同盟协助奖励
- needSpace = len(helpItemList)
jsonItemList = FBCommon.GetJsonItemList(helpItemList)
for index in range(0 , playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(index)
@@ -442,24 +441,18 @@
continue
if curPlayerID == firstPlayerID:
continue
- if curPlayer.GetFamilyID() != firstPlayerFamilyID:
- continue
- remainCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhuXianBossHelpCnt)
- if not remainCnt:
- continue
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ZhuXianBossHelpCnt, remainCnt-1)
- NotifyZXHelpCnt(curPlayer)
curPlayer.Sync_TimeTick(IPY_GameWorld.tttLeaveMap, 0, leaveTick, True)
- overDict = {FBCommon.Over_rank:0, FBCommon.Over_itemInfo:jsonItemList}
- FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, lineID, isPass, overDict)
-
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
- if needSpace > packSpace:
- PlayerControl.SendMailByKey('ZXBossHelperReward', [curPlayerID], helpItemList)
+ remainCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhuXianBossHelpCnt)
+ if curPlayer.GetFamilyID() == firstPlayerFamilyID and remainCnt:
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_ZhuXianBossHelpCnt, remainCnt-1)
+ NotifyZXHelpCnt(curPlayer)
+ ItemControler.GivePlayerItemOrMail(curPlayer, helpItemList, 'ZXBossHelperReward')
+ overDict = {FBCommon.Over_rank:0, FBCommon.Over_itemInfo:jsonItemList}
+ FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, lineID, isPass, overDict)
else:
- for itemID, itemCount, isBind in helpItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCount, isBind, [IPY_GameWorld.rptItem])
-
+ overDict = {FBCommon.Over_rank:0}
+ FBCommon.NotifyFBOver(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss, lineID, 0, overDict)
+
return
def GiveZhuXianBossAward(curPlayer, lineID, isMail=False, dropItemMapInfo=[]):
--
Gitblit v1.8.0