From cdfc7aec8358ac3c90eca6b4f530b7aef23f245e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 29 八月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch '2960仙盟抢Boss活动' of http://192.168.0.87:10010/r/snxxz_scripts into 2960仙盟抢Boss活动
---
System/WorldMap/MapModel.cs | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 55db212..4d9e41b 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -53,6 +53,7 @@
int mapUnLockIndex = 0;
PlayerTaskDatas taskModel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } }
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
public event Action<int> selectLocalMapEventPointEvent;
public event Action<int> mapLinesUpdateEvent;
@@ -186,6 +187,8 @@
{
if (mapLines.ContainsKey(_mapId))
{
+ //List<MapLine> _mapLines = new List<MapLine>(mapLines[_mapId]);
+ //CheckSpecialLines(_mapLines);
return mapLines[_mapId];
}
else
@@ -194,6 +197,22 @@
}
}
+ void CheckSpecialLines(List<MapLine> list)
+ {
+ var lineId = 0;
+ if (fairyGrabBossModel.TryGetFairyGrabBossLine(out lineId) && !fairyGrabBossModel.InActivityTime)
+ {
+ var index = list.FindIndex((x) =>
+ {
+ return x.lineIndex == lineId;
+ });
+ if (index != -1)
+ {
+ list.RemoveAt(index);
+ }
+ }
+ }
+
public void UpdateMapLines(HA006_tagGCPyServerMapState _serverInfo)
{
for (int i = 0; i < _serverInfo.MapCount; i++)
--
Gitblit v1.8.0