From c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 09 十月 2018 10:30:32 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
Fight/BossFakeLineUtility.cs | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/Fight/BossFakeLineUtility.cs b/Fight/BossFakeLineUtility.cs
index 6d67480..357cae1 100644
--- a/Fight/BossFakeLineUtility.cs
+++ b/Fight/BossFakeLineUtility.cs
@@ -15,8 +15,18 @@
bool m_ShowFakeLine = false;
public bool showFakeLine {
- get { return m_ShowFakeLine; }
- set { m_ShowFakeLine = value; }
+ get {
+ if (TimeUtility.OpenDay < GeneralConfig.Instance.bossShuntDays
+ && GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID))
+ {
+ return true;
+ }
+
+ return m_ShowFakeLine;
+ }
+ set {
+ m_ShowFakeLine = value;
+ }
}
public BossFakeLineUtility()
@@ -70,6 +80,15 @@
public void RecordSawStone(int npcId, int lineId)
{
+ var bossInfo = BossInfoConfig.GetBossInfoByStoneId(npcId);
+ if (bossInfo != null)
+ {
+ if (HasSawLineBossRecently(bossInfo.NPCID, lineId))
+ {
+ bossSawRecorder.Clear();
+ }
+ }
+
stoneSawRecorder.Record(npcId, lineId, Time.realtimeSinceStartup);
}
@@ -93,6 +112,11 @@
public void RecordSawBoss(int bossId, int lineId)
{
+ if (HasSawLineStoneRecently(bossId, lineId))
+ {
+ stoneSawRecorder.Clear();
+ }
+
bossSawRecorder.Record(bossId, lineId, Time.realtimeSinceStartup);
}
--
Gitblit v1.8.0