From 0c7d47ae29d60a715b35a281fd8d2d5022567d93 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 27 三月 2019 10:09:22 +0800
Subject: [PATCH] Merge branch 'master' into TreasureMission
---
Fight/Stage/MapEditor/Game/ClientSceneManager.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Fight/Stage/MapEditor/Game/ClientSceneManager.cs b/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
index 3712f2b..9a7555d 100644
--- a/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
+++ b/Fight/Stage/MapEditor/Game/ClientSceneManager.cs
@@ -12,7 +12,7 @@
private Dictionary<int, uint> m_TriggerIDToMissionIDDict = new Dictionary<int, uint>();
private Dictionary<int, TriggerHandler> m_TriggerHandlerDict = new Dictionary<int, TriggerHandler>();
private List<int> m_ReadyRemoveTriggerList = new List<int>();
- private Dictionary<int, List<GActorNpcFight>> m_EventActorDict = new Dictionary<int, List<GActorNpcFight>>();
+ private Dictionary<int, List<GActor>> m_EventActorDict = new Dictionary<int, List<GActor>>();
public bool IsClientFightMode { get; private set; }
private IEnumerator DelayUnTrigger(int id)
@@ -66,11 +66,11 @@
}
}
- public void NpcBorn(int eventID, GActorNpcFight npc)
+ public void NpcBorn(int eventID, GActor npc)
{
if (!m_EventActorDict.ContainsKey(eventID))
{
- m_EventActorDict.Add(eventID, new List<GActorNpcFight>());
+ m_EventActorDict.Add(eventID, new List<GActor>());
}
if (!m_EventActorDict[eventID].Contains(npc))
@@ -80,7 +80,7 @@
}
}
- public void NpcDead(int eventID, GActorNpcFight npc)
+ public void NpcDead(int eventID, GActor npc, int npcID)
{
if (eventID < 0 || npc == null)
{
@@ -90,7 +90,7 @@
var _eventHandler = GetEventHandler(eventID) as EventRefreshNPCHandler;
if (_eventHandler != null)
{
- _eventHandler.NpcDead(npc.NpcConfig.NPCID);
+ _eventHandler.NpcDead(npcID);
}
if (m_EventActorDict.ContainsKey(eventID))
@@ -506,6 +506,11 @@
return _targetPos;
}
+ public void TriggerTest(int triggerID)
+ {
+ SnxxzGame.Instance.StartCoroutine(DelayTrigger(99999999, triggerID));
+ }
+
private IEnumerator DelayTrigger(uint missionID, int triggerID)
{
// ID涓�0, 绾﹀畾涓烘竻绌鸿Е鍙�
--
Gitblit v1.8.0