Merge commit '72e9f78c364db3173ec1d5e0a37092d42de32a34'

MacBuilder

2018-08-23 9f1102900faf6adf5994cf6e870ce0716a06a09c

 System/FindPrecious/FindPreciousModel.cs

@@ -452,14 +452,9 @@
            foreach (var boss in bossInfos.Values)

            {

                var bossId = boss.bossId;



                if (!IsBossAlive(bossId))

                {

                    RemoveOneBossRebornNotify(bossId);

                }

                else

                {

                    if (Config.Instance.ContainKey<DemonJarConfig>(bossId))

                {

                    if (IsBossAlive(bossId))

                    {

                        var config = Config.Instance.Get<DemonJarConfig>(bossId);

                        var grade = dungeonModel.GetDungeonGrade(new Dungeon(DemonJarModel.DEMONJAR_MAPID, config.LineID));

@@ -470,7 +465,12 @@
                    }

                    else

                    {

                        if ((bossInfos[bossId].refreshTime - DateTime.Now).TotalSeconds < PREPOSE_SECONDS)

                        RemoveOneBossRebornNotify(bossId);

                    }

                }

                else

                {

                    if (IsBossAlive(bossId) || (bossInfos[bossId].refreshTime - DateTime.Now).TotalSeconds < PREPOSE_SECONDS)

                        {

                            AddOneBossRebornNotify(bossId);

                        }

@@ -479,7 +479,7 @@
                            FindPreciousTimer.Instance.AddClock(bossId, bossInfos[bossId].refreshTime);

                        }

                    }

                }



            }

        }