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

client_Hale

2018-11-14 6444c2ee8ae673029f822a8a9e9e5f641de36af2

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -27,6 +27,8 @@
        [SerializeField] FairyGrabBossHelpBehaviour m_FairyGrabBossHelpBehaviour;

        [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour;

        [SerializeField] InSevenDayBehavior m_InSevenDayBehavior;

        [SerializeField] FBHelpPointExchageNotify m_HelpPointExchangeNotify;



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

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

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

@@ -34,7 +36,7 @@
        DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }

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

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



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

        FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }

        BetterEquipGetModel betterEquipGetModel { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } }

        RealmBetterEquipModel realmEquipModel { get { return ModelCenter.Instance.GetModel<RealmBetterEquipModel>(); } }

@@ -65,6 +67,8 @@
            CheckFairyGrabBossHelp();

            CheckDogzNotify();

            InSevenDayShow();

            CheckHelpPointExchange();

            exchageModel.UpdateHelpPointShopEvent += CheckHelpPointExchange;

            playerPack.RefreshDecomAttrAct += CheckEquipDecompose;

            betterEquipGetModel.showEquipRefreshEvent += CheckBetterEquip;

            realmEquipModel.showEquipRefreshEvent += CheckRealmBetterEquip;

@@ -82,6 +86,7 @@
        public void UnInit()

        {

            fairyGrabBossModel.helpCoolDown = false;

            exchageModel.UpdateHelpPointShopEvent -= CheckHelpPointExchange;

            playerPack.RefreshDecomAttrAct -= CheckEquipDecompose;

            betterEquipGetModel.showEquipRefreshEvent -= CheckBetterEquip;

            preciousItemGetModel.showItemRefreshEvent -= CheckPreciousItem;

@@ -95,6 +100,16 @@
            dogzModel.UpdateDogzPutRedEvent -= CheckDogzNotify;

        }



        private void CheckHelpPointExchange()

        {

            int pushId = exchageModel.currentShopId;

            m_HelpPointExchangeNotify.gameObject.SetActive(pushId != 0);

            if(pushId != 0)

            {

                m_HelpPointExchangeNotify.SetDisplay();

            }

        }



        private void CheckRealmBetterEquip()

        {

            if (string.IsNullOrEmpty(realmEquipModel.currentEquipGuid))