From 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 13:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan
---
Fight/MapTransferUtility.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index bc08f24..b37f540 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -262,8 +262,6 @@
yield break;
}
- ClientSceneManager.Instance.ExitTransStatus();
-
var sid = data.sid;
NpcID = data.npcID;
MapTransferDoType = E_MapTransferDoType.Npc;
@@ -445,6 +443,7 @@
{
break;
}
+ ClientSceneManager.Instance.ExitTransStatus();
float _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _nextPos);
while (_dis > 0.01f)
{
@@ -477,6 +476,7 @@
Debug.LogErrorFormat("绉诲姩鑷砃PC: {0} 鏃舵壘涓嶅埌浠讳綍璺宠穬鐐�, NextPos: {1}", NpcID, _nextPos);
break;
}
+ ClientSceneManager.Instance.ExitTransStatus();
float _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _nextPos);
while (_dis > 0.01f)
{
@@ -1323,6 +1323,13 @@
{
NPCInteractProcessor.InvokeEvent(E_NpcType.Func, NpcID, _npc.ServerInstID);
}
+ else if (_npc is GA_NpcClientCollect)
+ {
+ if (_npcConfig.NPCID == 10104200)
+ {
+ ClientCollectUtility.HandleCallback(E_NpcType.Collect, _npcConfig.NPCID, _npc.ServerInstID);
+ }
+ }
}
}
Clear();
--
Gitblit v1.8.0