Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Dungeon/DungeonFightWin.cs

@@ -30,7 +30,8 @@
        [SerializeField] DungeonItemCollect m_ItemCollect;

        [SerializeField] DungeonGuardSkyBehaviour m_GuardSky;

        [SerializeField] DungeonBossBriefInfoContainer m_BossInfosContainer;



        [SerializeField] GameObject m_Container_WHYJ;

        [SerializeField] DungenWHYJ m_DungenWHYJ;

        bool excutedAutoExit = false;

        float timer = 0f;

        DateTime endTime = DateTime.Now;

@@ -97,6 +98,15 @@


            model.dungeonCoolDownEvent += OnLeaveMapTimeEvent;

            MainInterfaceWin.Event_Duplicates += OnChangeFuncBtnPosEvent;

            if (WHYJBool())

            {

                m_Container_WHYJ.SetActive(true);

                m_DungenWHYJ.Init();

            }

            else

            {

                m_Container_WHYJ.SetActive(false);

            }

        }



        protected override void OnAfterOpen()

@@ -120,10 +130,10 @@
            MainInterfaceWin.Event_Duplicates -= OnChangeFuncBtnPosEvent;

            model.dungeonCoolDownEvent -= OnLeaveMapTimeEvent;



            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            try

            {

                var mapId = PlayerDatas.Instance.baseData.MapID;

                var mapConfig = Config.Instance.Get<MapConfig>(mapId);

                if (mapConfig != null && mapConfig.MapFBType != (int)MapType.OpenCountry)

                {

                    throw new NullReferenceException();

@@ -131,10 +141,10 @@
            }

            catch (Exception ex)

            {

                Debug.Log(ex.Message);

                ExceptionCatcher.ReportException("副本战斗界面异常关闭", ex.Message);

                Debug.Log(ex);

                var content = StringUtility.Contact("当前地图：", PlayerDatas.Instance.baseData.MapID, ";堆栈信息：", ex.StackTrace);

                ExceptionCatcher.ReportException("副本战斗界面异常关闭", content);

            }



        }



        protected override void OnAfterClose()

@@ -265,7 +275,7 @@
                        var config = Config.Instance.Get<RuneTowerFloorConfig>(runeTowerModel.currentFloor);

                        var lastFloor = (int)ModelCenter.Instance.GetModel<RuneModel>().RuneTowerOpenLV;

                        var lastFloorConfig = Config.Instance.Get<RuneTowerFloorConfig>(lastFloor);

                        if (model.dungeonResult.isPass == 1 && config.TowerId == lastFloorConfig.TowerId)

                        if (model.dungeonResult.isPass == 1 && config.TowerId == lastFloorConfig.TowerId && lastFloorConfig.AutoExit == 0)

                        {

                            var runeTowerStage = StageManager.Instance.CurrentStage as RuneTowerDungeonStage;

                            runeTowerStage.PerformChallengeNextLevel();

@@ -365,6 +375,18 @@


        }



        private bool WHYJBool()//判断是否在娲皇遗迹副本

        {

            var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            if (dataMapId == GeneralConfig.Instance.ruinsTranscriptMapId)

            {

                return true;

            }

            else

            {

                return false;

            }

        }

    }



}