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/CrossServerBoss/CrossServerBossModel.cs | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/System/CrossServerBoss/CrossServerBossModel.cs b/System/CrossServerBoss/CrossServerBossModel.cs
index ba71549..77b0b32 100644
--- a/System/CrossServerBoss/CrossServerBossModel.cs
+++ b/System/CrossServerBoss/CrossServerBossModel.cs
@@ -165,7 +165,7 @@
}
var config = CrossServerBossConfig.Get(selectedBoss);
- if (config.MonsterType == 4 && !findPreciousModel.IsRealmEnoughToKillBoss(selectedBoss))
+ if (config.MonsterType == 4 && !findPreciousModel.IsBossUnlock(selectedBoss))
{
error = 6;
return false;
@@ -217,11 +217,20 @@
npcIds.Add(bigBoxNpcId);
npcIds.Add(eliteMonsters[0]);
+ var lockedCount = 0;
foreach (var bossId in bosses.Keys)
{
if (findPreciousModel.IsBossUnlock(bossId))
{
npcIds.Add(bossId);
+ }
+ else
+ {
+ if (lockedCount < 2)
+ {
+ lockedCount++;
+ npcIds.Add(bossId);
+ }
}
}
@@ -230,16 +239,7 @@
public List<int> GetShowBosses()
{
- var showBosses = new List<int>();
- foreach (var bossId in bosses.Keys)
- {
- if (findPreciousModel.IsBossUnlock(bossId))
- {
- showBosses.Add(bossId);
- }
- }
-
- return showBosses;
+ return new List<int>(sortedBossIds);
}
public int GetRecommendNpc()
@@ -251,16 +251,30 @@
if (wearyValue < GeneralDefine.bossWearyValues[2])
{
+ var preferBoss = 0;
for (int i = sortedBossIds.Count - 1; i >= 0; i--)
{
var bossId = sortedBossIds[i];
- if (IsBossUnLocked(bossId) && findPreciousModel.IsBossAlive(bossId))
+ if (IsBossUnLocked(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;
}
return eliteMonsters[0];
--
Gitblit v1.8.0