10385 【越南】【英语】【BT】【砍树】【GM】福地拉取物品触发任务事件;

# Conflicts:
# ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
3个文件已修改
28 ■■■■■ 已修改文件
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.py 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
@@ -1063,7 +1063,7 @@
    __RefreshMineItemSpeed(mineItemData, True)
    
    SyncMineAreaItemInfo(areaPlayerID, [itemIndex], notifyPlayerIDListEx)
    return True
    return [areaPlayerID]
def __DoCancelPull(playerID, areaPlayerID, itemIndex, reason=""):
    ## 取消拉取
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -1232,6 +1232,13 @@
def EventResponse_BuyVIPItem(curPlayer, vipLV):
    RunQuestEvent(curPlayer, "buyvipitem", "buyvipitem", Def_RunQuestType_Normal)
    return
def EventResponse_MineAreaPull(curPlayer, isRob):
    ## 福地采集物品
    RunQuestEvent(curPlayer, "minearea_pull", "rob" if isRob else "self", Def_RunQuestType_Normal)
    RunQuestEvent(curPlayer, "minearea_pull", 0, Def_RunQuestType_Normal)
    return
#---------------------------------------------------------------------
##任务触发器_Active 已经无使用了
#@param curPlayer 玩家实例
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.py
@@ -26,6 +26,7 @@
import PlayerSuccess
import ShareDefine
import ItemCommon
import EventShell
import GameWorld
import PlayerTask
import time
@@ -224,19 +225,21 @@
    if msgType == "MineAreaAwardGet":
        awardInfoList = dataMsg[0]
        __DoGiveMineAreaAward(curPlayer, awardInfoList)
    elif msgType == "Pull":
        areaPlayerID = dataMsg[0]
        if areaPlayerID == curPlayer.GetPlayerID():
            PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_MineItemSelf, 1)
        else:
            PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_MineItemRob, 1)
    ## 取消拉取 (包含主动 或 被动驱赶)
    elif msgType == "MineAreaCancelPull":
        areaPlayerID, reason =  dataMsg
        __OnMineAreaPullEnd(curPlayer, areaPlayerID, reason)
        
    ## 拉取
    elif msgType == "Pull":
        areaPlayerID = dataMsg[0]
        isRob = (areaPlayerID and curPlayer.GetPlayerID() != areaPlayerID)
        EventShell.EventResponse_MineAreaPull(curPlayer, isRob)
        if areaPlayerID == curPlayer.GetPlayerID():
            PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_MineItemSelf, 1)
        else:
            PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_MineItemRob, 1)
    return
def __DoGiveMineAreaAward(curPlayer, awardInfoList):