Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -83,6 +83,8 @@
        [SerializeField] Button m_RedBag;//红包入口按钮

        [SerializeField] UIEffect m_RedpackGetSfx;

        [SerializeField] Button m_SendRedbagBtn;

        [SerializeField] Button WishingAwardImg;

        [SerializeField] Button m_GotoFairyGrabBoss;



        [SerializeField] Transform m_EffectTask;//任务完成特效播放位置

        private int m_CollectNPCID;

@@ -137,7 +139,7 @@
        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }



        WishingPoolModel wishModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } }

        #region Built-in

        protected override void BindController()

        {

@@ -172,6 +174,8 @@
            fairyRequestBtn.onClick.AddListener(OnFairyRequestClick);

            m_RedBag.AddListener(RedPacketButton);

            m_SendRedbagBtn.AddListener(SendRedpacketBtn);

            WishingAwardImg.AddListener(ClickWishAward);

            m_GotoFairyGrabBoss.AddListener(GotoFairyGrabBoss);

        }



        protected override void OnPreOpen()

@@ -198,13 +202,14 @@
            m_TeamInvitationEntrance.Init();

            m_FairyCallBehaviour.Init();

            m_BossBriefInfos.gameObject.SetActive(false);



            UpdateWishAwardImag();

            ArticleExperience();//关于经验条

            FriendQuestBtn();

            UpdateFairyRequest();

            OnRedBagGet();//关于红包入口

            CheckSendRedpackBtn();

            CheckChatTipOpen();

            ShowFairyGrabBoss();

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;

            FunctionUnlockFlyObject.functionUnLockShowBeginEvent += UnFlodFunctionArea;

            fairyModel.UpdateFairyRequestEvent += UpdateFairyRequest;

@@ -223,6 +228,8 @@
            RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;

            NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent;

            fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent;

            wishModel.UpdateWishAwardEvent += UpdateWishAwardImag;

            fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;

        }



        private void CompletionOfTaskEvent(int obj)

@@ -297,7 +304,7 @@
                if (isNeutralMap)

                {

                    m_BossBriefInfos.gameObject.SetActive(true);

                    if (PlayerDatas.Instance.baseData.MapID==DogzDungeonModel.DATA_MAPID)

                    if (PlayerDatas.Instance.baseData.MapID == DogzDungeonModel.DATA_MAPID)

                    {

                        var bosses = ModelCenter.Instance.GetModel<DogzDungeonModel>().GetBosses();

                        m_BossBriefInfos.Display(bosses);

@@ -384,6 +391,7 @@
            PlayerTaskDatas.CompletionOfTaskEvent -= CompletionOfTaskEvent;

            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;

            fairyGrabBossModel.gotoBossStateUpdate -= ShowFairyGrabBoss;

            if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

            {

                WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();

@@ -392,6 +400,7 @@
            GA_NpcCollect.OnArrive -= OnArriveCollectNPC;

            GA_NpcCollect.OnLeave -= OnLeaveCollectNpc;

            fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;

            wishModel.UpdateWishAwardEvent -= UpdateWishAwardImag;

            m_CollectBtn.gameObject.SetActive(false);

        }



@@ -649,6 +658,16 @@
            }

        }



        private void ClickWishAward()

        {

            WindowCenter.Instance.Open<WishingGetItemWin>();

        }



        private void UpdateWishAwardImag()

        {

            WishingAwardImg.gameObject.SetActive(wishModel.wishingAwardDict.Count > 0 ? true : false);

        }



        private void UpdateFairyRequest()

        {

            fairyRequestBtn.gameObject.SetActive(fairyModel.FairyRequestRedPoint.count > 0);

@@ -716,7 +735,7 @@
        void DownButton(GameObject go)

        {

            _ExpRate.gameObject.SetActive(true);

          //  WindowCenter.Instance.Open<WheelOfFortuneWin>();

            //  WindowCenter.Instance.Open<WheelOfFortuneWin>();

        }

        void UpButton(GameObject go)

        {

@@ -1083,6 +1102,33 @@
        private void bossGrabHintEvent()

        {

            IsShowTaskPanel();

            ShowFairyGrabBoss();

        }



        private void ShowFairyGrabBoss()

        {

            m_GotoFairyGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&

                !fairyGrabBossModel.grabBossHintOpen);

        }



        private void GotoFairyGrabBoss()

        {

            if (fairyGrabBossModel.cacheGotoBossId != 0)

            {

                var error = 0;

                if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))

                {

                    if (fairyGrabBossModel.IsBossKilled(fairyGrabBossModel.cacheGotoBossId))

                    {

                        SysNotifyMgr.Instance.ShowTip("FairyGrabBossOver");

                    }

                    MapTransferUtility.Instance.MoveToNPC(fairyGrabBossModel.cacheGotoBossId);

                }

                else

                {

                    fairyGrabBossModel.DisplayErrorTip(error);

                }

            }

        }

    }