From 51fab14cee367849d673ccf9a0809c68cac843fc Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 30 八月 2018 23:49:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WorldMap/MapModel.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 0a11480..4b5fd2d 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -190,7 +190,7 @@
if (mapLines.ContainsKey(_mapId))
{
sortedMapLines.AddRange(mapLines[_mapId]);
- CheckActivityLine();
+ CheckActivityLine(_mapId);
sortedMapLines.Sort(SortMaplines);
return sortedMapLines;
}
@@ -200,18 +200,25 @@
}
}
- void CheckActivityLine()
+ void CheckActivityLine(int _mapId)
{
var activityLine = 0;
fairyGrabBossModel.TryGetFairyGrabBossLine(out activityLine);
- if (activityLine != 0 && !fairyGrabBossModel.InActivityTime
- && PlayerDatas.Instance.baseData.FBID != activityLine)
+ if (activityLine != 0)
{
var index = sortedMapLines.FindIndex((x) =>
{
return activityLine + 1 == x.lineIndex;
});
- if (index != -1)
+ if (fairyGrabBossModel.InActivityTime ||
+ PlayerDatas.Instance.baseData.FBID == activityLine)
+ {
+ if (index == -1)
+ {
+ sortedMapLines.Add(new MapLine(_mapId, activityLine + 1, 0, 0));
+ }
+ }
+ else if (index != -1)
{
sortedMapLines.RemoveAt(index);
}
--
Gitblit v1.8.0