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

client_Zxw

2019-01-16 b73ea3db37f14ffb23392cd7a7adbbab9ae69641

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -34,6 +34,8 @@
        ElderGodAreaModel elderGodAreaModel { get { return ModelCenter.Instance.GetModel<ElderGodAreaModel>(); } }

        DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }

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

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



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

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

        FBHelpPointExchageModel exchageModel { get { return ModelCenter.Instance.GetModel<FBHelpPointExchageModel>(); } }

@@ -51,6 +53,7 @@
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }

        InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }



        public void Init()

        {

            CheckBetterEquip();

@@ -275,6 +278,10 @@
                        killable = dogzDungeonModel.wearyValue < GeneralDefine.bossWearyValues[2];

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

                        break;

                    case FindPreciousType.CrossServerBoss:

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

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

                        break;

                }



                if (!killable)