From c9d85bde9ec46becb60b4434ec74fd7e527b885e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 十一月 2024 17:17:01 +0800
Subject: [PATCH] 10302 【越南】【英语】【砍树】【tqxbqy】【btgotq】仙缘-服务端

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
index c647c0e..a96d46f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMineArea.py
@@ -869,7 +869,7 @@
     robPlayerID = mineItemData.RobPlayerID
     # 赶走抢夺者
     if robPlayerID and robPlayerID == tagPlayerID:
-        __DoCancelPull(tagPlayerID, areaPlayerID, itemIndex)
+        __DoCancelPull(tagPlayerID, areaPlayerID, itemIndex, "out")
     
     # 帮助的发奖
     if funcLineID == 0:
@@ -926,7 +926,7 @@
         return
     if workerCount <= 0:
         if not isPreview:
-            __DoCancelPull(playerID, areaPlayerID, itemIndex)
+            __DoCancelPull(playerID, areaPlayerID, itemIndex, "cancel")
         return
     GameWorld.DebugLog("请求福地拉物品! areaPlayerID=%s,itemIndex=%s,workerCount=%s,workerState=%s,workerTotal=%s,isPreview=%s" 
                        % (areaPlayerID, itemIndex, workerCount, workerState, workerTotal, isPreview), playerID)
@@ -1019,7 +1019,7 @@
     SyncMineAreaItemInfo(areaPlayerID, [itemIndex], notifyPlayerIDListEx)
     return True
 
-def __DoCancelPull(playerID, areaPlayerID, itemIndex):
+def __DoCancelPull(playerID, areaPlayerID, itemIndex, reason=""):
     ## 取消拉取
     mineItemMgr = PyDataManager.GetDBPyMineAreaItemManager()
     mineItemData = mineItemMgr.GetMineItem(areaPlayerID, itemIndex)
@@ -1054,6 +1054,9 @@
         __RefreshMineItemSpeed(mineItemData, True)
         
     SyncMineAreaItemInfo(areaPlayerID, [itemIndex], notifyPlayerIDListEx)
+    curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+    if curPlayer:
+        MapServer_QueryPlayerResult(curPlayer, "MineAreaCancelPull", [areaPlayerID, reason])
     return
 
 def __DoMineItemRefresh(areaPlayerID, areaPlayer=None, isSys=False, isSuper=False, isNotify=True, refreshIndexList=None, setPosition=None, setItemLV=None, setMineID=None):

--
Gitblit v1.8.0