From 712c96f16a43ca2ebcf607b384c0e886e3dbd094 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期二, 11 六月 2019 16:55:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FindPrecious/ElderGodAreaModel.cs | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/System/FindPrecious/ElderGodAreaModel.cs b/System/FindPrecious/ElderGodAreaModel.cs
index 22dada0..4de2793 100644
--- a/System/FindPrecious/ElderGodAreaModel.cs
+++ b/System/FindPrecious/ElderGodAreaModel.cs
@@ -84,9 +84,22 @@
{
var bosses = new List<int>();
bosses.Add(sortedElites[0]);
+ var lockedCount = 0;
for (int i = 0; i < sortedBossIds.Count; i++)
{
- bosses.Add(sortedBossIds[i]);
+ var bossId = sortedBossIds[i];
+ if (findPreciousModel.IsBossUnlock(bossId))
+ {
+ bosses.Add(sortedBossIds[i]);
+ }
+ else
+ {
+ if (lockedCount < 2)
+ {
+ lockedCount++;
+ bosses.Add(sortedBossIds[i]);
+ }
+ }
}
return bosses;
@@ -104,16 +117,30 @@
public int GetRecommendNpc()
{
+ var preferBoss = 0;
for (var i = sortedBossIds.Count - 1; i >= 0; i--)
{
var bossId = sortedBossIds[i];
- if (findPreciousModel.IsBossUnlock(bossId) && findPreciousModel.IsBossAlive(bossId))
+ if (findPreciousModel.IsBossUnlock(bossId))
{
- return bossId;
+ if (preferBoss == 0)
+ {
+ preferBoss = bossId;
+ }
+
+ if (findPreciousModel.IsBossAlive(bossId) && findPreciousModel.IsSameBigRealmStageBoss(bossId))
+ {
+ return bossId;
+ }
}
}
- return sortedElites[0];
+ if (preferBoss == 0)
+ {
+ preferBoss = sortedBossIds[0];
+ }
+
+ return preferBoss;
}
public int GetRecommendEliteNpc()
--
Gitblit v1.8.0