From ad8dc1743416eea4f9f4ecdaf2f5aaf4a7435ce8 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 12 九月 2018 14:04:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/WorldMap/MapModel.cs |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 87a3f65..4b5d004 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -194,17 +194,21 @@
                     return activityLine + 1 == x.lineIndex;
                 });
 
-                if (fairyGrabBossModel.InActivityTime ||
-                    PlayerDatas.Instance.baseData.FBID == activityLine)
+                bool needDisplayActivityLine = fairyGrabBossModel.InActivityTime ||
+                    PlayerDatas.Instance.baseData.FBID == activityLine;
+                if (index == -1)
                 {
-                    if (index == -1)
+                    if (needDisplayActivityLine)
                     {
                         mapLines.Add(new MapLine(_mapId, activityLine + 1, 0, 0));
                     }
                 }
-                else if (index != -1)
+                else
                 {
-                    mapLines.RemoveAt(index);
+                    if (!needDisplayActivityLine)
+                    {
+                        mapLines.RemoveAt(index);
+                    }
                 }
             }
         }

--
Gitblit v1.8.0