Merge remote-tracking branch 'origin/master' into Equip

client_Wu Xijin

2019-03-08 afb266da01d7fb99af1cee0dd4749ca3a56a3e2f

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -28,6 +28,7 @@
        [SerializeField] DogzNotifyBehaviour m_DogzNotifyBehaviour;

        [SerializeField] InSevenDayBehavior m_InSevenDayBehavior;

        [SerializeField] FBHelpPointExchageNotify m_HelpPointExchangeNotify;

        [SerializeField] MyFocusBehavior m_MyFocusBehavio;



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

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

@@ -72,6 +73,7 @@
            CheckDogzNotify();

            InSevenDayShow();

            CheckHelpPointExchange();

            m_MyFocusBehavio.Init();

            exchageModel.UpdateHelpPointShopEvent += CheckHelpPointExchange;

            playerPack.RefreshDecomAttrAct += CheckEquipDecompose;

            betterEquipGetModel.showEquipRefreshEvent += CheckBetterEquip;

@@ -89,6 +91,7 @@


        public void UnInit()

        {

            m_MyFocusBehavio.Unit();

            fairyGrabBossModel.helpCoolDown = false;

            exchageModel.UpdateHelpPointShopEvent -= CheckHelpPointExchange;

            playerPack.RefreshDecomAttrAct -= CheckEquipDecompose;