hxp
2020-01-11 2014b1be37a38d75d8b5f97311f9a0b07e27cfd1
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerAssist.py
@@ -335,13 +335,6 @@
    NetPackCommon.SendFakePack(assistPlayer, assistPack)
    return
def SetPlayerStartAssistTeamFB(curPlayer, queryData):
    ## 开始协助组队副本 - 玩家进入副本后才真正进入协助状态
    #mapID, lineID, tagPlayerID = queryData
    return
def MapServer_PlayerAssistLogic(curPlayer, msgList, tick):
    ## 地图同步的协助信息逻辑处理
    
@@ -403,7 +396,18 @@
    
    # 开始协助组队副本
    elif queryType == "OnStartAssistTeamFB":
        SetPlayerStartAssistTeamFB(curPlayer, queryData)
        mapID, lineID, tagPlayerID = queryData
        GameWorld.DebugLog("    开始协助副本: mapID=%s,lineID=%s,tagPlayerID=%s" % (mapID, lineID, tagPlayerID), playerID)
        # 副本协助暂时只处理设置协助目标ID
        PlayerControl.SetAssistTagPlayerID(curPlayer, tagPlayerID)
        return
    # 取消协助组队副本
    elif queryType == "OnCancelAssistTeamFB":
        mapID, lineID, reason = queryData
        GameWorld.DebugLog("    开始协助副本: mapID=%s,lineID=%s,reason=%s" % (mapID, lineID, reason), playerID)
        # 副本协助暂时只处理设置协助目标ID
        PlayerControl.SetAssistTagPlayerID(curPlayer, 0)
        return
    
    #QueryPlayerResult_PlayerAssist(curPlayer, queryType, queryData, result)
@@ -606,8 +610,6 @@
        if assistObj in playerAssistList:
            playerAssistList.remove(assistObj)
            
    SyncFamilyClearAssist(familyID, assistGUID)
    # 取消boss协助
    if assistType == AssistType_Boss:
        
@@ -628,6 +630,8 @@
        # 暂不需要处理
        pass
    
    # 放最后
    SyncFamilyClearAssist(familyID, assistGUID)
    return
def OnCancelPlayerAssist(cancelPlayer, cancelPlayerID, assistObj, reason, isGameServer, isNotify=True):
@@ -663,7 +667,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: