5274 【BT5】【主干】跨服充值排行榜问题（上榜增加保底限制逻辑默认读排行模板最低额度限制；bt5版本改为真实充值有效）

hxp

2021-11-18 93cf2720f200bf5f5bc6defee600f474fa522590

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py

@@ -145,6 +145,25 @@
        

    return



def OnPlayerTeamChange(curPlayer):

    ## 玩家队伍变更

    
    if curPlayer.GetTeamID():

        return

    playerID = curPlayer.GetPlayerID()

    
    assistMgr = PyDataManager.GetPlayerAssistPyManager()

    if playerID not in assistMgr.playerNoSaveDBAssistDict:

        return

    playerAssistList = assistMgr.playerNoSaveDBAssistDict[playerID]

    
    for assistObj in playerAssistList[::-1]:

        gameMap = GameWorld.GetMap(assistObj.MapID)

        if gameMap and gameMap.GetMapFBType() == ChConfig.fbtTeam:

            OnCancelPlayerRequestAssist(assistObj, "LeaveTeam", True)

            
    return



def OnInitAssistData(dbData, isSaveDB):

    ## 加载协助数据额外处理

    setattr(dbData, "IsSaveDB", isSaveDB) # 是否保存数据库，离线可协助的需要存库，如挖矿类

@@ -434,8 +453,8 @@
    

    playerID = curPlayer.GetPlayerID()

    

    assistObj = None

    addNewAssist = True

    reqAssistObj = None

    addNewAssist = False

    assistMgr = PyDataManager.GetPlayerAssistPyManager()

    if playerID in assistMgr.playerNoSaveDBAssistDict:

        playerAssistList = assistMgr.playerNoSaveDBAssistDict[playerID]

@@ -445,17 +464,18 @@
            if npcID != assistObj.NPCID or lineID != assistObj.LineID or objID != assistObj.ObjID:

                OnCancelPlayerRequestAssist(assistObj, "RequestNewAssistBoss", True)

            else:

                addNewAssist = False

                reqAssistObj = assistObj

            break

        

    if addNewAssist:

        assistObj = __AddNewAssist(assistMgr, curPlayer, mapID, lineID, npcID, objID)

    if not reqAssistObj:

        addNewAssist = True

        reqAssistObj = __AddNewAssist(assistMgr, curPlayer, mapID, lineID, npcID, objID)

        

    if not assistObj:

    if not reqAssistObj:

        return

    

    # 通知本仙盟玩家

    PlayerFamily.SendFamilyFakePack(familyID, GetAssistInfoListPack([assistObj]))

    PlayerFamily.SendFamilyFakePack(familyID, GetAssistInfoListPack([reqAssistObj]))

    # 求助信息已发送，请等待盟友支援

    PlayerControl.NotifyCode(curPlayer, "AssistRequestOK")

    

@@ -478,7 +498,7 @@
    

    playerID = curPlayer.GetPlayerID()

    

    assistObj = None

    reqAssistObj = None

    addNewAssist = False

    assistMgr = PyDataManager.GetPlayerAssistPyManager()

    if playerID in assistMgr.playerNoSaveDBAssistDict:

@@ -488,19 +508,19 @@
                continue

            if mapID != assistObj.MapID or lineID != assistObj.LineID:

                OnCancelPlayerRequestAssist(assistObj, "RequestNewAssistTeamFB", True)

                addNewAssist = True

                break

    else:

            else:

                reqAssistObj = assistObj

            break

        
    if not reqAssistObj:

        addNewAssist = True

        reqAssistObj = __AddNewAssist(assistMgr, curPlayer, mapID, lineID)

        

    if addNewAssist:

        assistObj = __AddNewAssist(assistMgr, curPlayer, mapID, lineID)

        
    if not assistObj:

    if not reqAssistObj:

        return

    

    # 通知本仙盟玩家

    PlayerFamily.SendFamilyFakePack(familyID, GetAssistInfoListPack([assistObj]))

    PlayerFamily.SendFamilyFakePack(familyID, GetAssistInfoListPack([reqAssistObj]))

    # 求助信息已发送，请等待盟友支援

    PlayerControl.NotifyCode(curPlayer, "AssistRequestOK")

    # 广播仙盟请求

@@ -558,6 +578,7 @@
    for assistObj in familyAssistList:

        assistInfo = ChPyNetSendPack.tagGCAssistInfo()

        assistInfo.AssistGUID = assistObj.GUID

        assistInfo.PlayerID = assistObj.PlayerID

        assistInfo.PlayerName = assistObj.PlayerName

        assistInfo.Job = assistObj.Job

        assistInfo.LV = assistObj.LV

@@ -792,23 +813,29 @@
    

    playerID = curPlayer.GetPlayerID()

    assistThanksMgr = PyDataManager.GetPlayerAssistThanksPyManager()

    useThanks = None

    if playerID not in assistThanksMgr.playerThanksDict:

        GameWorld.ErrLog("玩家没有可使用的协助感谢礼盒!", playerID)

        return

    useThanks = None

    playerThanksList = assistThanksMgr.playerThanksDict[playerID]

    for thanks in playerThanksList:

        if itemID == thanks.ItemID:

            useThanks = thanks

            break

    else:

        playerThanksList = assistThanksMgr.playerThanksDict[playerID]

        for thanks in playerThanksList:

            if itemID == thanks.ItemID:

                useThanks = thanks

                break

    if not useThanks:

        GameWorld.ErrLog("玩家没有该协助感谢礼盒!itemID=%s" % (itemID), playerID)

        return

        #20210226 优化为找不到协助信息也可以使用，防止地图扣除物品失败导致协助礼盒一直留着而无法使用

        #return

    

    GameWorld.DebugLog("玩家使用协助感谢礼盒!itemID=%s,isPreview=%s" % (itemID, isPreview), playerID)

    # 预览

    if isPreview:

        previewPack = ChPyNetSendPack.tagGCUseAssistThanksGiftPreview()

        if not useThanks:

            previewPack.ItemID = itemID

            previewPack.MapID = 31140 # 暂随意给一个可协助的地图ID

            NetPackCommon.SendFakePack(curPlayer, previewPack)

            return

        previewPack.ItemID = useThanks.ItemID

        previewPack.MapID = useThanks.MapID

        previewPack.LineID = useThanks.LineID

@@ -833,12 +860,15 @@
    ipyData = IpyGameDataPY.GetIpyGameData("AssistThanksGift", itemID)

    if not ipyData:

        return

    
    useThanks.ThanksState = 1 # 设置为已感谢

    playerThanksList.remove(useThanks) # 移除已感谢

        
    queryData = [itemID]

    QueryPlayerResult_PlayerAssist(curPlayer, "UseAssistThanksGift", queryData)

    

    if not useThanks:

        return

    useThanks.ThanksState = 1 # 设置为已感谢

    playerThanksList.remove(useThanks) # 移除已感谢

    
    # 通知协助玩家可接收的感谢个数

    playerMgr = GameWorld.GetPlayerManager()

    for assistPlayerID in useThanks.AssistPlayerDict.keys():