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

client_Wu Xijin

2018-11-08 1c36e698ce2ca2344cbc440b6bf5f598c70339ce

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -26,7 +26,7 @@
        [SerializeField] FirstChargeTrialBehaviour m_FirstChargeTrialBehaviour;

        [SerializeField] FairyGrabBossHelpBehaviour m_FairyGrabBossHelpBehaviour;

        [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour;



        [SerializeField] InSevenDayBehavior m_InSevenDayBehavior;

        WorldBossModel worldBossModel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }

        BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }

        ElderGodAreaModel elderGodAreaModel { get { return ModelCenter.Instance.GetModel<ElderGodAreaModel>(); } }

@@ -48,7 +48,7 @@
        FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }

        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();

@@ -64,6 +64,7 @@
            FirstChargeTrialShow();

            CheckFairyGrabBossHelp();

            CheckDogzNotify();

            InSevenDayShow();

            playerPack.RefreshDecomAttrAct += CheckEquipDecompose;

            betterEquipGetModel.showEquipRefreshEvent += CheckBetterEquip;

            realmEquipModel.showEquipRefreshEvent += CheckRealmBetterEquip;

@@ -357,6 +358,18 @@
                SnxxzGame.Instance.StartCoroutine(Co_DeActiveFairyGrabBoss());

            }

        }

        private void InSevenDayShow()

        {

            if (inSevenDayModel.IsMainGo)

            {

                m_InSevenDayBehavior.gameObject.SetActive(true);

                m_InSevenDayBehavior.GetintDay();

            }

            else

            {

                m_InSevenDayBehavior.gameObject.SetActive(false);

            }

        }



        IEnumerator Co_DeActiveFairyGrabBoss()

        {