From 8fd18771e4526d6fe373f354335217b19aa3a6ee Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 11 十二月 2018 15:28:57 +0800
Subject: [PATCH] 2612 【1.3】【1.3.100】上古战场积分足够,退出副本,重新上线后没给奖励

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py |   18 ++++++++++++------
 1 files changed, 12 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 37d76f5..b3c73e9 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
 
 ## 退出家族触发事件
@@ -676,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
@@ -752,6 +755,7 @@
 #  @param awardIndex
 #  @return None
 def GetFamilyActivityAward(curPlayer, awardIndex):
+    return
     familyActiveList = IpyGameDataPY.GetFuncEvalCfg('FamilyActive')
     familyActiveAwardList = IpyGameDataPY.GetFuncEvalCfg('FamilyActive', 2)
     if awardIndex < 0 or awardIndex >= len(familyActiveList):
@@ -787,6 +791,7 @@
     return
 
 def AddFamilyActivity(curPlayer, actionid, addCnt=1):
+    return
     ipyData = IpyGameDataPY.GetIpyGameData('FamilyActivity', actionid)
     if not ipyData:
         return
@@ -814,6 +819,7 @@
     return totalPoint
 
 def SyncFamilyActivityInfo(curPlayer, syncActionid=-1):
+    return
     #通知活跃领取情况
     syncActionIDList = ShareDefine.FamilyActiveIDList if syncActionid==-1 else [syncActionid]
     sendPack = ChPyNetSendPack.tagMCFamilyActivityInfo()

--
Gitblit v1.8.0