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

client_Hale

2019-01-21 a56b87458cd32bcea06e3fcc8a2d25e295745f10

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -35,6 +35,7 @@
        DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }

        DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }

        CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }

        JadeDynastyBossModel jadeDynastyBossModel { get { return ModelCenter.Instance.GetModel<JadeDynastyBossModel>(); } }



        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

@@ -269,10 +270,12 @@
                        show = !GeneralDefine.elderGodNoRebornRemindMaps.Contains(mapId);

                        break;

                    case FindPreciousType.DemonJar:

                        {

                        var totalTimes = dungeonModel.GetTotalTimes(DemonJarModel.DEMONJAR_MAPID);

                        var enterTimes = dungeonModel.GetEnterTimes(DemonJarModel.DEMONJAR_MAPID);

                        killable = totalTimes > enterTimes;

                        show = !GeneralDefine.demonJarNoRebornRemindMaps.Contains(mapId);

                        }

                        break;

                    case FindPreciousType.DogzDungeon:

                        killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];

@@ -282,6 +285,14 @@
                        killable = crossServerBossModel.wearyValue < GeneralDefine.bossWearyValues[2];

                        show = !GeneralDefine.dogzNoRebornRemindMaps.Contains(mapId);

                        break;

                    case FindPreciousType.JadeDynastyBoss:

                        {

                            var totalTimes = dungeonModel.GetTotalTimes(JadeDynastyBossModel.JADEDYNASTY_MAP);

                            var enterTimes = dungeonModel.GetEnterTimes(JadeDynastyBossModel.JADEDYNASTY_MAP);

                            killable = totalTimes > enterTimes;

                            show = !GeneralDefine.demonJarNoRebornRemindMaps.Contains(mapId);

                        }

                        break;

                }



                if (!killable)