From 4c1c972db682794e4ee6b1fa9d878ce9566a349f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 19 二月 2025 14:56:41 +0800
Subject: [PATCH] 10385 【越南】【英语】【BT】【砍树】【GM】福地拉取物品触发任务事件;

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py      |    7 +++++++
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py           |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.py |   19 +++++++++++--------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
index 154ba19..cd12da0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
+++ b/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=""):
     ## 取消拉取
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
index 9b14187..a725fce 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
+++ b/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 玩家实例
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.py
index 91620b0..93b6aee 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMineArea.py
+++ b/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):

--
Gitblit v1.8.0