From 3a4eb38542bf8cc2cdf7f835a559ade8a8457ea3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 29 九月 2018 03:02:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
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