From ccaf2f02905ec635332e2d22cb7bd5b77b6a7bbb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 22 十月 2018 21:10:34 +0800
Subject: [PATCH] 4282 【主干】【1.1.0】【后端】新增物品效果:获得X法宝X经验 4280 【主干】【1.1.0】【后端】开服触发成就类型
---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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..7e2b5bd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
@@ -28,6 +28,7 @@
 import GameLogic_FamilyWar
 import ChMapToGamePyPack
 import PlayerFamilyTech
+import PlayerFamilyRedPacket
 import SkillCommon
 import BuffSkill
 import ItemCommon
@@ -108,7 +109,7 @@
     if curPlayer.GetFamilyMemberLV() != refreshPack.GetFamilyMemberLV():
         curPlayer.SetFamilyMemberLV(refreshPack.GetFamilyMemberLV())
         #通知周围玩家家族职位刷新
-        curPlayer.Notify_FamilyMemberLVRefresh()
+        #curPlayer.Notify_FamilyMemberLVRefresh()
         GameLogic_FamilyWar.DoCheckChampionFamilyTitle(curPlayer)
     
     if curPlayer.GetFamilyMoney() != refreshPack.GetFamilyMoney():
@@ -152,6 +153,7 @@
     PlayerFamilyTech.Sync_PlayerFamilyTechLV(curPlayer)
     DelAddFamilyRecord(curPlayer)
     GameLogic_FamilyWar.DoCheckChampionFamilyTitle(curPlayer)
+    PlayerFamilyRedPacket.CreatCacheRedPacktet(curPlayer)
     return
 
 ## 退出家族触发事件
@@ -323,6 +325,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 +678,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