860312 防范加buff后又被删的情况

hch

2019-06-25 4afbcdc6a3c2df57bee6a45bfef5cabecdc859a3

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldFamilyWar.py

@@ -420,7 +420,9 @@
    PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_FamilyWar_AllOver, 0) # 新一轮开始，重置状态

    PlayerFamily.DoFamilySort() # 首轮分组前需要强制刷新一次仙盟排行

    

    lastFamilyWarMemDict = copy.deepcopy(PyGameData.g_familyWarMemDict)

    lastFamilyWarMemDict = {}

    for warPlayerID, recData in PyGameData.g_familyWarMemDict.items():

        lastFamilyWarMemDict[warPlayerID] = GetFWMemFamilyID(recData)

    PyGameData.g_familyWarMemDict = {}

    PyGameData.g_familyWarFamilyIDList = []

    universalRecMgr = GameWorld.GetUniversalRecMgr()

@@ -1032,16 +1034,23 @@
    if not family:

        return

    

    familyAllPlayerIDList = []

    familyPlayerIDList = []

    for i in xrange(family.GetCount()):

        member = family.GetAt(i)

        memPlayerID = member.GetPlayerID()

        if memPlayerID not in PyGameData.g_familyWarMemDict:

            continue

        familyAllPlayerIDList.append(memPlayerID)

        recData = PyGameData.g_familyWarMemDict[memPlayerID]

        if GetFWMemFamilyID(recData) != familyID:

            continue

        if not GetFWMemIsJoin(recData):

            continue

        familyPlayerIDList.append(memPlayerID)

    if not familyPlayerIDList:

        familyPlayerIDList = familyAllPlayerIDList

        GameWorld.Log("连胜没有人参赛，收益算仙盟所有人的！familyID=%s,familyAllPlayerIDList=%s" % (familyID, familyAllPlayerIDList))

        

    familyAuctionItemDict = {} # {仙盟ID:[[享受收益的成员ID, ...], [[拍品ID,个数], [拍品ID,个数,是否拍品], ...]], ...}

    familyAuctionItemDict[familyID] = [familyPlayerIDList, familyAuctionItemList]

@@ -1082,16 +1091,23 @@
            GameWorld.Log("    rank=%s,familyID=%s,仙盟不存在!" % (rank, familyID))

            continue

        

        familyAllPlayerIDList = []

        familyPlayerIDList = []

        for i in xrange(family.GetCount()):

            member = family.GetAt(i)

            memPlayerID = member.GetPlayerID()

            if memPlayerID not in PyGameData.g_familyWarMemDict:

                continue

            familyAllPlayerIDList.append(memPlayerID)

            recData = PyGameData.g_familyWarMemDict[memPlayerID]

            if GetFWMemFamilyID(recData) != familyID:

                continue

            if not GetFWMemIsJoin(recData):

                continue

            familyPlayerIDList.append(memPlayerID)

        if not familyPlayerIDList:

            familyPlayerIDList = familyAllPlayerIDList

            GameWorld.Log("    排名没有人参赛，收益算仙盟所有人的！familyID=%s,familyAllPlayerIDList=%s" % (familyID, familyAllPlayerIDList))

            

        familyAuctionItemList = cfgRankAuctionItemDict[rank]

        familyAuctionItemDict[familyID] = [familyPlayerIDList, familyAuctionItemList]