From a303af4186a3055ac7ca5fbaa7ce00e7be757f42 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 24 一月 2019 16:50:12 +0800
Subject: [PATCH] 2942 【BUG】【1.5.100】诛仙Boss未显示失败界面 2941 【1.5.100】诛仙背包满后,通关诛仙塔获得装备不会发邮件

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.py |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 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 31ae509..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
@@ -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