From e75e1b9182a6872108a9cf397d4d9c1ed3afda50 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 22 五月 2019 09:31:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into HazyRegion_1
---
System/MainInterfacePanel/MainCollectBehaviour.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/MainCollectBehaviour.cs b/System/MainInterfacePanel/MainCollectBehaviour.cs
index 4b1460f..9c3c849 100644
--- a/System/MainInterfacePanel/MainCollectBehaviour.cs
+++ b/System/MainInterfacePanel/MainCollectBehaviour.cs
@@ -19,7 +19,8 @@
int collectNpcId = 0;
uint serverInstanceId = 0;
- DungeonModel dungeonModel {
+ DungeonModel dungeonModel
+ {
get { return ModelCenter.Instance.GetModel<DungeonModel>(); }
}
@@ -37,7 +38,6 @@
collectNpcId = npcId;
serverInstanceId = sid;
-
var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
m_ContainerNormalCollect.gameObject.SetActive(false);
m_GatherSoulBuild.gameObject.SetActive(false);
@@ -82,7 +82,8 @@
{
if (collectNpcId != 0 && serverInstanceId != 0)
{
- NPCInteractProcessor.InvokeEvent(E_NpcType.Collect, collectNpcId, serverInstanceId);
+ PrepareHandler.Instance.HandleCallback(E_NpcType.Collect, collectNpcId, serverInstanceId);
+ // NPCInteractProcessor.InvokeEvent(E_NpcType.Collect, collectNpcId, serverInstanceId);
}
}
}
--
Gitblit v1.8.0