8716 【主干】【后端】【BT2】H.活动-节日祈愿（节日登录优化已登录天不限制领取天）；

hxp

2021-02-09 c32b4159c5f33b4badd3d5f2a2c06923dda55ec4

 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) # 是否保存数据库，离线可协助的需要存库，如挖矿类

@@ -229,7 +248,10 @@
    if not playerMap:

        return

    if playerMap.GetMapFBType() != ChConfig.fbtNull:

        playerLineID = curPlayer.GetFBID()

        if mapID == ChConfig.Def_FBMapID_SealDemon:

            playerLineID = PlayerControl.GetFBFuncLineID(curPlayer)

        else:

            playerLineID = curPlayer.GetFBID()

        if playerMapID != mapID or playerLineID != lineID:

            #副本中无法协助

            PlayerControl.NotifyCode(curPlayer, "AssistFBLimit")

@@ -431,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]

@@ -442,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")

    

@@ -475,7 +498,7 @@
    

    playerID = curPlayer.GetPlayerID()

    

    assistObj = None

    reqAssistObj = None

    addNewAssist = False

    assistMgr = PyDataManager.GetPlayerAssistPyManager()

    if playerID in assistMgr.playerNoSaveDBAssistDict:

@@ -485,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")

    # 广播仙盟请求

@@ -555,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

@@ -610,8 +634,6 @@
        if assistObj in playerAssistList:

            playerAssistList.remove(assistObj)

            

    SyncFamilyClearAssist(familyID, assistGUID)

    
    # 取消boss协助

    if assistType == AssistType_Boss:

        

@@ -632,6 +654,8 @@
        # 暂不需要处理

        pass

    

    # 放最后    
    SyncFamilyClearAssist(familyID, assistGUID)

    return



def OnCancelPlayerAssist(cancelPlayer, cancelPlayerID, assistObj, reason, isGameServer, isNotify=True):

@@ -667,7 +691,14 @@
        assistObj.AssistPlayerIDList.remove(cancelPlayerID)

        

    if cancelPlayer:

        isTagPlayerReason = reason.startswith("RequestPlayerCancel_")

        PlayerControl.SetAssistTagPlayerID(cancelPlayer, 0)

        overPack = ChPyNetSendPack.tagGCAssistOver()

        overPack.IsTagPlayerReason = isTagPlayerReason

        overPack.Reason = reason[len("RequestPlayerCancel_"):] if isTagPlayerReason else reason 
        overPack.ReasonLen = len(overPack.Reason)

        overPack.AssistGUID = assistGUID

        NetPackCommon.SendFakePack(cancelPlayer, overPack)

        

    # 取消boss协助

    if assistObj.AssistType == AssistType_Boss: