Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Lhy

2019-06-11 712c96f16a43ca2ebcf607b384c0e886e3dbd094

 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];