Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/FindPrecious/ElderGodAreaWin.cs

@@ -73,7 +73,7 @@
        private void ShowBosses()

        {

            var bosses = new List<int>();

            bosses.AddRange(model.GetElderGodBosses());

            bosses.AddRange(model.GetElderGodNpces());



            model.selectedBoss = model.GetRecommendNpc();

            DisplayNpcBaseInfo(true);