From ec45b62795c111074562fab788b5cccdea5d1d1d Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 01 九月 2018 11:25:38 +0800
Subject: [PATCH] fix:3124 守卫人皇、仙盟心法增加仙盟等级限制

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
index f67865b..771b91a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
@@ -323,6 +323,8 @@
 
     #curPlayer.GameServer_AddFamilyDetail(addFamilyHornor, addFamilyMoney, addFamilyActiveValue)
     #改为PY包
+    if not curPlayer.GetFamilyID():
+        return
     sendPack = ChMapToGamePyPack.tagMGAddFamilyDetail()
     sendPack.PlayerID = curPlayer.GetPlayerID()
     sendPack.AddFamilyHornor = addFamilyHornor
@@ -674,20 +676,21 @@
         if item.GetType() != ChConfig.Def_ItemType_FamilyBossFood:
             continue
         addActiveValue = item.GetEffectByIndex(0).GetEffectValue(0)
-        if not addActiveValue:
-            continue
+#        if not addActiveValue:
+#            continue
         itemCnt = item.GetCount() 
         totalAddActiveValue += addActiveValue * itemCnt
-        delItemList.append(item, itemCnt)
+        delItemList.append([item, itemCnt])
         totalCnt += itemCnt
-    if not totalAddActiveValue:
+    if not totalCnt:
         GameWorld.DebugLog('背包里没有可捐献的物品')
         return
     for eatItem, delCnt in delItemList:
         ItemCommon.DelItem(curPlayer, eatItem, delCnt, False)
         
     #累加个人活跃度/贡献度
-    AddPlayerFamilyActiveValue(curPlayer, totalAddActiveValue, True, ShareDefine.Def_AddFAVReason_FamilyDonateItem)
+    if totalAddActiveValue:
+        AddPlayerFamilyActiveValue(curPlayer, totalAddActiveValue, True, ShareDefine.Def_AddFAVReason_FamilyDonateItem)
     AddFamilyBossFood(curPlayer, totalCnt, ShareDefine.Def_AddFAVReason_FamilyDonateItem)
     GameWorld.DebugLog('    捐献仙盟兽粮 totalCnt=%s,totalAddActiveValue=%s'%(totalCnt,totalAddActiveValue))
     return

--
Gitblit v1.8.0