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/WorldBossModel.cs |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/System/FindPrecious/WorldBossModel.cs b/System/FindPrecious/WorldBossModel.cs
index 76ecec8..e3052e0 100644
--- a/System/FindPrecious/WorldBossModel.cs
+++ b/System/FindPrecious/WorldBossModel.cs
@@ -81,12 +81,21 @@
         public List<int> GetWorldBosses()
         {
             var activedBossIds = new List<int>();
+            var lockedCount = 0;
             for (int i = 0; i < sortedBossIds.Count; i++)
             {
                 var bossId = sortedBossIds[i];
-                if (findPreciousModel.IsBossUnlockOrUnlockSoon(bossId))
+                if (findPreciousModel.IsBossUnlock(bossId))
                 {
                     activedBossIds.Add(bossId);
+                }
+                else
+                {
+                    if (lockedCount < 2)
+                    {
+                        activedBossIds.Add(bossId);
+                        lockedCount++;
+                    }
                 }
             }
 
@@ -112,20 +121,30 @@
 
         public int GetRecommendBoss()
         {
-            var playerLevel = PlayerDatas.Instance.baseData.LV;
+            var preferBoss = 0;
             for (int i = sortedBossIds.Count - 1; i >= 0; i--)
             {
                 var bossId = sortedBossIds[i];
-                var npcConfig = NPCConfig.Get(bossId);
-                if (findPreciousModel.IsBossUnlock(bossId) 
-                    && findPreciousModel.IsBossAlive(bossId) 
-                    && playerLevel >= npcConfig.NPCLV)
+                if (findPreciousModel.IsBossUnlock(bossId))
                 {
-                    return bossId;
+                    if (preferBoss == 0)
+                    {
+                        preferBoss = bossId;
+                    }
+
+                    if (findPreciousModel.IsBossAlive(bossId) && findPreciousModel.IsSameBigRealmStageBoss(bossId))
+                    {
+                        return bossId;
+                    }
                 }
             }
 
-            return sortedBossIds[0];
+            if (preferBoss == 0)
+            {
+                preferBoss = sortedBossIds[0];
+            }
+
+            return preferBoss;
         }
 
         private void OnFunctionChange(int id)

--
Gitblit v1.8.0