From c591cb6e215ea5e762560afdae059f1d4fd7f4ec Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 28 九月 2018 16:32:37 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
System/FindPrecious/FindPreciousModel.cs | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/System/FindPrecious/FindPreciousModel.cs b/System/FindPrecious/FindPreciousModel.cs
index af799b0..ffd808d 100644
--- a/System/FindPrecious/FindPreciousModel.cs
+++ b/System/FindPrecious/FindPreciousModel.cs
@@ -44,9 +44,9 @@
Dictionary<int, BossSubscribe> bossSubscribes = new Dictionary<int, BossSubscribe>();
bool serverInited = false;
+ public event Action<int> bossInfoUpdateEvent;
public event Action<int> bossSubscribeChangeEvent;
public event Action preciousDropRecordUpdateEvent;
- public event Action<int> bossInfoUpdateEvent;
public event Action bossRebornNotifyChangeEvent;
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
@@ -541,40 +541,37 @@
{
return false;
}
+ else if (BossFakeLineUtility.Instance.HasSawLineBossRecently(bossId, PlayerDatas.Instance.baseData.FBID))
+ {
+ return true;
+ }
+ else if (BossFakeLineUtility.Instance.HasSawLineStoneRecently(bossId, PlayerDatas.Instance.baseData.FBID))
+ {
+ return false;
+ }
else
{
- var isMistakeBoss = BossFakeLineUtility.Instance.lastBossNpcID == bossId
- && Time.realtimeSinceStartup < BossFakeLineUtility.Instance.inMistakeForBossAliveOverTime;
- var isLineBossAlive = IsLineBossAlive(PlayerDatas.Instance.baseData.FBID);
-
- if (isMistakeBoss && isLineBossAlive)
+ var currentNeutralMap = false;
+ if (Config.Instance.ContainKey<WorldBossConfig>(bossId))
{
- return true;
+ var worldBossConfig = Config.Instance.Get<WorldBossConfig>(bossId);
+ currentNeutralMap = worldBossConfig.MapID == PlayerDatas.Instance.baseData.MapID;
+ currentNeutralMap = currentNeutralMap && GeneralConfig.Instance.neutralMaps.Contains(worldBossConfig.MapID);
+ }
+
+ if (currentNeutralMap)
+ {
+ return IsLineBossAlive(PlayerDatas.Instance.baseData.FBID);
}
else
{
- var currentNeutralMap = false;
- if (Config.Instance.ContainKey<WorldBossConfig>(bossId))
+ if (BossFakeLineUtility.Instance.IsBossKilledRecently(bossId))
{
- var worldBossConfig = Config.Instance.Get<WorldBossConfig>(bossId);
- currentNeutralMap = worldBossConfig.MapID == PlayerDatas.Instance.baseData.MapID;
- currentNeutralMap = currentNeutralMap && GeneralConfig.Instance.neutralMaps.Contains(worldBossConfig.MapID);
- }
-
- if (currentNeutralMap)
- {
- return isLineBossAlive;
+ return !IsAnyLineBossDead();
}
else
{
- if (BossFakeLineUtility.Instance.IsBossKilledRecently(bossId))
- {
- return !IsAnyLineBossDead();
- }
- else
- {
- return IsAnyLineBossAlive();
- }
+ return IsAnyLineBossAlive();
}
}
}
@@ -710,7 +707,6 @@
}
}
}
-
public static int Compare2(DropRecord _lhs, DropRecord _rhs)
{
--
Gitblit v1.8.0