hxp
2020-01-15 50cabbbc229d1adc0e427df765cab2dc0889cdf1
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py
@@ -229,7 +229,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")
@@ -610,8 +613,6 @@
        if assistObj in playerAssistList:
            playerAssistList.remove(assistObj)
            
    SyncFamilyClearAssist(familyID, assistGUID)
    # 取消boss协助
    if assistType == AssistType_Boss:
        
@@ -632,6 +633,8 @@
        # 暂不需要处理
        pass
    
    # 放最后
    SyncFamilyClearAssist(familyID, assistGUID)
    return
def OnCancelPlayerAssist(cancelPlayer, cancelPlayerID, assistObj, reason, isGameServer, isNotify=True):
@@ -667,7 +670,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: