From a9066209675d2d3d1104861524cfd10a820072d4 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 26 九月 2018 14:40:18 +0800
Subject: [PATCH] Merge branch 'master' into BossFakeLine
---
System/WorldMap/MapModel.cs | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 4b5d004..c030045 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -584,33 +584,36 @@
foreach (var config in mapNpcConfigs)
{
var mapId = config.MapID;
- if (config.NPCType == (int)E_NpcType.Func)
+ if (config.NPCID != 0)
{
- List<string> npcRefreshIs;
- if (!mapFunctionNPCsToRefreshID.ContainsKey(mapId))
+ if (config.NPCType == (int)E_NpcType.Func)
{
- mapFunctionNPCsToRefreshID[mapId] = npcRefreshIs = new List<string>();
- }
- else
- {
- npcRefreshIs = mapFunctionNPCsToRefreshID[mapId];
- }
+ List<string> npcRefreshIs;
+ if (!mapFunctionNPCsToRefreshID.ContainsKey(mapId))
+ {
+ mapFunctionNPCsToRefreshID[mapId] = npcRefreshIs = new List<string>();
+ }
+ else
+ {
+ npcRefreshIs = mapFunctionNPCsToRefreshID[mapId];
+ }
- npcRefreshIs.Add(config.RefreshID.ToString());
- }
- else if (config.NPCType == (int)E_NpcType.Flag)
- {
- List<string> npcRefreshIs;
- if (!mapCollectNPCsToRefreshID.ContainsKey(mapId))
- {
- mapCollectNPCsToRefreshID[mapId] = npcRefreshIs = new List<string>();
+ npcRefreshIs.Add(config.RefreshID.ToString());
}
- else
+ else if (config.NPCType == (int)E_NpcType.Flag)
{
- npcRefreshIs = mapCollectNPCsToRefreshID[mapId];
- }
+ List<string> npcRefreshIs;
+ if (!mapCollectNPCsToRefreshID.ContainsKey(mapId))
+ {
+ mapCollectNPCsToRefreshID[mapId] = npcRefreshIs = new List<string>();
+ }
+ else
+ {
+ npcRefreshIs = mapCollectNPCsToRefreshID[mapId];
+ }
- npcRefreshIs.Add(config.RefreshID.ToString());
+ npcRefreshIs.Add(config.RefreshID.ToString());
+ }
}
}
--
Gitblit v1.8.0