From 1a755c6befb41bfe28d6be740e2b2321f3ab3b5e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 22 五月 2019 10:41:51 +0800
Subject: [PATCH] Merge branch 'master' into HazyRegion_1
---
System/MainInterfacePanel/MainCollectBehaviour.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/MainCollectBehaviour.cs b/System/MainInterfacePanel/MainCollectBehaviour.cs
index 9c3c849..f10cc10 100644
--- a/System/MainInterfacePanel/MainCollectBehaviour.cs
+++ b/System/MainInterfacePanel/MainCollectBehaviour.cs
@@ -82,7 +82,15 @@
{
if (collectNpcId != 0 && serverInstanceId != 0)
{
- PrepareHandler.Instance.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);
+ var _npc = GAMgr.Instance.GetBySID(serverInstanceId);
+ if (_npc is GA_NpcCollect)
+ {
+ PrepareHandler.Instance.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);
+ }
+ else if (_npc is GA_NpcClientCollect)
+ {
+ ClientCollectUtility.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);
+ }
// NPCInteractProcessor.InvokeEvent(E_NpcType.Collect, collectNpcId, serverInstanceId);
}
}
--
Gitblit v1.8.0