Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/FindPrecious/ElderGodAreaModel.cs

@@ -99,7 +99,7 @@
            }

        }



        public List<int> GetElderGodBosses()

        public List<int> GetElderGodNpces()

        {

            var bosses = new List<int>();

            bosses.Add(sortedElites[0]);

@@ -107,6 +107,13 @@
            return bosses;

        }



        public List<int> GetElderGodBosses()

        {

            var bosses = new List<int>();

            bosses.AddRange(sortedBossIds);

            return bosses;

        }



        public int GetRecommendNpc()

        {

            foreach (var item in sortedBossIds)