ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
@@ -790,22 +790,22 @@
def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagPlayerID, valueList):
    
    # 摇人帮助请求
    if funcLineID == 0:
    # 摇人帮助请求、自己驱赶请求
    if funcLineID == 0 or funcLineID == 1:
        return __OnMineHelpRequest(curPlayer, mapID, funcLineID, tagPlayerID, valueList)
    
    return
def OnTurnFightOver(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList):
    
    # 摇人帮助结果
    if funcLineID == 0:
    # 摇人帮助结果、自己驱赶结果
    if funcLineID == 0 or funcLineID == 1:
        return __OnMineHelpOver(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList)
        
    return
def __OnMineHelpRequest(curPlayer, mapID, funcLineID, tagPlayerID, valueList):
    # 摇人帮助请求
    # 摇人帮助请求、自己驱赶请求
    playerID = curPlayer.GetPlayerID()
    if not valueList or len(valueList) < 2:
        GameWorld.DebugLog("没有指定valueList!", playerID)
@@ -813,8 +813,13 @@
    areaPlayerID = valueList[0]
    itemIndex = valueList[1]
    
    if funcLineID == 0:
    if playerID == areaPlayerID:
        GameWorld.DebugLog("不能帮助自己!", playerID)
            GameWorld.DebugLog("不能帮助自己! areaPlayerID=%s" % areaPlayerID, playerID)
            return
    elif funcLineID == 1:
        if playerID != areaPlayerID:
            GameWorld.DebugLog("不是自己的福地,无法自己驱赶! areaPlayerID=%s" % areaPlayerID, playerID)
        return
    
    mineItemMgr = PyDataManager.GetDBPyMineAreaItemManager()
@@ -841,7 +846,7 @@
    return True
def __OnMineHelpOver(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList):
    # 摇人帮助结果
    # 摇人帮助结果、自己驱赶结果
    
    playerID = curPlayer.GetPlayerID()
    helpPlayerName = curPlayer.GetName()
@@ -863,6 +868,8 @@
    if robPlayerID and robPlayerID == tagPlayerID:
        __DoCancelPull(tagPlayerID, areaPlayerID, itemIndex)
    
    # 帮助的发奖
    if funcLineID == 0:
    robCacheDict = PlayerViewCache.GetCachePropDataDict(PlayerViewCache.FindViewCache(tagPlayerID))
    robPlayerName = robCacheDict.get("Name", "")
    
@@ -874,6 +881,12 @@
    
    # 通知福地玩家
    PlayerCompensation.SendMailByKey("MineHelpReqOK", [areaPlayerID], [], [helpPlayerName, robPlayerName])    
    # 自己驱赶的
    elif funcLineID == 1:
        # 自己驱赶的,不用再通知地图,直接return
        return
    return True
def MapServer_MineArea(curPlayer, msgList):