3335 缥缈仙域

client_linchunjie

2019-04-12 794d442348f0476abdfaf4deb51b186b15cf273c

3335 缥缈仙域

 System/Dungeon/DungeonFightWin.cs

@@ -213,18 +213,6 @@


        private void ExitDungeon()

        {

            if (StageLoad.Instance.currentStage is ClientHazyDemonKingStage)

            {

                ModelCenter.Instance.GetModel<HazyDemonKingModel>().RequestExitClientDungeon();

                return;

            }



            if (StageLoad.Instance.currentStage is ClientHazyGrassStage)

            {

                ModelCenter.Instance.GetModel<HazyGrassModel>().RequestExitClientDungeon();

                return;

            }



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

            var config = DungeonOpenTimeConfig.Get(dataMapId);

            string language = string.Empty;

@@ -273,14 +261,21 @@
                {

                    if (_ok)

                    {

                        if (dataMapId == CrossServerBossModel.DATA_MAPID)

                        switch (dataMapId)

                        {

                            var crossServerBossModel = ModelCenter.Instance.GetModel<CrossServerBossModel>();

                            crossServerBossModel.RequestExit();

                        }

                        else

                        {

                            model.ExitCurrentDungeon();

                            case CrossServerBossModel.DATA_MAPID:

                                var crossServerBossModel = ModelCenter.Instance.GetModel<CrossServerBossModel>();

                                crossServerBossModel.RequestExit();

                                break;

                            case HazyDemonKingModel.Client_MapID:

                                ModelCenter.Instance.GetModel<HazyDemonKingModel>().RequestExitClientDungeon();

                                break;

                            case HazyGrassModel.Client_MapID:

                                ModelCenter.Instance.GetModel<HazyGrassModel>().RequestExitClientDungeon();

                                break;

                            default:

                                model.ExitCurrentDungeon();

                                break;

                        }

                    }

                }


 System/HazyRegion/HazyRegionIncidentPanel.cs

@@ -9,6 +9,7 @@
    public class HazyRegionIncidentPanel : MonoBehaviour

    {

        [SerializeField] HazyRegionCyclicScroll m_CyclicScroll;

        [SerializeField] Transform m_ContainerPoint;

        [SerializeField] Slider m_Slider;

        [SerializeField] Text m_Point;

        [SerializeField] Button m_Back;

@@ -28,6 +29,7 @@
        {

            DisplayPoint();

            DisplayIncidents();

            DisplayBackButton();

        }



        void DisplayIncidents()

@@ -42,9 +44,19 @@


        void DisplayPoint()

        {

            var point = Mathf.Min(model.point, model.limitPoint);

            m_Point.text = StringUtility.Contact(point, "/", model.limitPoint);

            //m_Slider.value = Mathf.Clamp01((float)point / model.limitPoint);

            m_ContainerPoint.gameObject.SetActive(!model.InFakeHazyRegion);



            if (!model.InFakeHazyRegion)

            {

                var point = Mathf.Min(model.point, model.limitPoint);

                m_Point.text = StringUtility.Contact(point, "/", model.limitPoint);

                //m_Slider.value = Mathf.Clamp01((float)point / model.limitPoint);

            }

        }



        void DisplayBackButton()

        {

            m_Back.gameObject.SetActive(!model.InFakeHazyRegion);

        }



        int Compare(int lhs, int rhs)