3335 缥缈仙域

client_linchunjie

2019-04-09 d29efe9bfbfe8b89a9f7206d2f510de4af2f8e95

3335 缥缈仙域

 System/DailyQuest/DailyQuestWin.cs

@@ -317,6 +317,10 @@
                case DailyQuestType.AllianceBoss2:

                    GotoAllianceBoss(_id, 1);

                    break;

                case DailyQuestType.HazyRegion:

                    WindowCenter.Instance.Close<DailyQuestWin>();

                    WindowCenter.Instance.Open<CrossServerWin>(false, 2);

                    break;

                //case DailyQuestType.JadeDynastyBoss:

                //    WindowCenter.Instance.Close<DailyQuestWin>();

                //    WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 3);


 System/HazyRegion/HazyRegionBuyTimesWin.cs

@@ -24,6 +24,7 @@


        [SerializeField] Button m_Close;



        HazyRegionModel model { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }

        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

        #region Built-in

@@ -110,7 +111,8 @@


        private void DailyQuestProgressUpdateEvent(int id)

        {

            if (id == (int)DailyQuestType.HazyRegion)

            var config = DailyQuestConfig.Get((int)DailyQuestType.HazyRegion);

            if (config != null && id == config.RelatedID)

            {

                DisplayTimes();

            }

@@ -150,6 +152,11 @@
                return;

            }



            if (!model.TryAddTimes())

            {

                return;

            }



            var itemCount = packModel.GetItemCountByID(PackType.Item, dailyQuestOpenTime.DayItemID);

            if (itemCount <= 0)

            {

@@ -181,6 +188,11 @@
                return;

            }



            if (!model.TryAddTimes())

            {

                return;

            }



            if (PlayerDatas.Instance.baseData.diamond < dailyQuestOpenTime.BuyNeedMoney)

            {

                WindowCenter.Instance.Open<RechargeTipWin>();


 System/HazyRegion/HazyRegionEntrancePanel.cs

@@ -32,10 +32,14 @@


        void DisplayTimes()

        {

            var config = DailyQuestConfig.Get((int)DailyQuestType.HazyRegion);

            var dailyQuestOpenTime = DailyQuestOpenTimeConfig.Get(config.RelatedID);

            var limitTimes = dailyQuestOpenTime.DayTimes;



            var totalTimes = dailyQuestModel.GetDailyQuestTotalTimes((int)DailyQuestType.HazyRegion);

            var completedTimes = dailyQuestModel.GetDailyQuestCompletedTimes((int)DailyQuestType.HazyRegion);

            var times = Mathf.Clamp(totalTimes - completedTimes, 0, totalTimes);

            m_Times.text = StringUtility.Contact(times, "/", totalTimes);

            var times = Mathf.Clamp(totalTimes - completedTimes, 0, limitTimes);

            m_Times.text = StringUtility.Contact(times, "/", limitTimes);

        }



        void DisplayOpenTime()

@@ -73,6 +77,12 @@
            {

                return;

            }



            if (!model.TryAddTimes())

            {

                return;

            }



            WindowCenter.Instance.Open<HazyRegionBuyTimesWin>();

        }



@@ -119,7 +129,8 @@


        private void DailyQuestProgressUpdateEvent(int id)

        {

            if (id == (int)DailyQuestType.HazyRegion)

            var config = DailyQuestConfig.Get((int)DailyQuestType.HazyRegion);

            if (config != null && id == config.RelatedID)

            {

                DisplayTimes();

            }


 System/HazyRegion/HazyRegionIncidentBehaviour.cs

@@ -56,11 +56,11 @@
            var config = HazyRegionConfig.Get(incidentId);

            incidentType = (HazyRegionIncidentType)config.incidentType;



            DisplayBase();

            DisplayItems();

            DisplayState();

            DisplaySelect();

            DisplayBoss();

            //DisplayBase();

            //DisplayItems();

            //DisplayState();

            //DisplaySelect();

            //DisplayBoss();



            model.selectIncidentRefresh -= SelectIncidentRefresh;

            model.selectIncidentRefresh += SelectIncidentRefresh;

@@ -127,12 +127,12 @@


        private void SelectIncidentRefresh()

        {

            DisplaySelect();

            //DisplaySelect();

        }



        private void OnHazyRegionIncidentRefresh()

        {

            DisplayState();

            //DisplayState();

        }



        private void OnSelect()


 System/HazyRegion/HazyRegionIncidentPanel.cs

@@ -26,7 +26,7 @@


        public void Display()

        {

            DisplayPoint();

            //DisplayPoint();

            DisplayIncidents();

        }




 System/HazyRegion/HazyRegionModel.cs

@@ -34,6 +34,9 @@
        public event Action<int> onHazyRegionStateRefresh;  //0-结束拜访 1-开始拜访 2-强制刷新

        public event Action onHazyRegionIncidentRefresh;



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

        DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }



        public override void Init()

        {

            ParseConfig();

@@ -59,6 +62,8 @@


        void ParseConfig()

        {

            var funcConfig = FuncConfigConfig.Get("ImmortalDomainStrength");

            limitPoint = int.Parse(funcConfig.Numerical1);

        }



        public bool TryGetIncident(int id, out Incident incident)

@@ -118,9 +123,40 @@
            return true;

        }



        public bool TryAddTimes()

        {

            var config = DailyQuestConfig.Get((int)DailyQuestType.HazyRegion);

            var dailyQuestOpenTime = DailyQuestOpenTimeConfig.Get(config.RelatedID);

            var limitTimes = dailyQuestOpenTime.DayTimes;



            var totalTimes = dailyQuestModel.GetDailyQuestTotalTimes((int)DailyQuestType.HazyRegion);

            var completedTimes = dailyQuestModel.GetDailyQuestCompletedTimes((int)DailyQuestType.HazyRegion);

            var times = Mathf.Clamp(totalTimes - completedTimes, 0, limitTimes);



            if (times >= limitTimes)

            {

                return false;

            }



            return true;

        }



        public ICollection<int> GetAllIncidents()

        {

            return m_Incidents.Keys;

        }



        public int GetIncidentId(int mapId, int lineId)

        {

            var configs = HazyRegionConfig.GetValues();

            foreach (var config in configs)

            {

                if (config.dungeonId == mapId && config.lineId == lineId)

                {

                    return config.id;

                }

            }

            return 0;

        }



        public void DisplayErrorRemind(int error)

@@ -143,6 +179,7 @@
                case HazyRegionIncidentType.FairyGrass:

                case HazyRegionIncidentType.ReikiGrass:

                case HazyRegionIncidentType.Precious:

                    dungeonModel.SingleChallenge(config.dungeonId, config.lineId);

                    break;

            }

        }


 System/HazyRegion/HazyRegionWin.cs

@@ -126,11 +126,13 @@
        void CloseHazyRegionIncident()

        {

            m_IncidentPanel.Dispose();

            m_IncidentPanel.gameObject.SetActive(false);

        }



        void CloseHazyRegionEntrance()

        {

            m_EntrancePanel.Dispose();

            m_EntrancePanel.gameObject.SetActive(false);

        }



        private void OnHazyRegionStateRefresh(int state)


 Utility/ConfigInitiator.cs

@@ -288,7 +288,8 @@
        normalTasks.Add(new ConfigInitTask("LegendPropertyValueConfig", () => { LegendPropertyValueConfig.Init(); }, () => { return LegendPropertyValueConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("LegendPropertyConfig", () => { LegendPropertyConfig.Init(); }, () => { return LegendPropertyConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("EquipSuitNameConfig", () => { EquipSuitNameConfig.Init(); }, () => { return EquipSuitNameConfig.inited; }));

        normalTasks.Add(new ConfigInitTask("ReikiRootConfig", () => { ReikiRootConfig.Init(); }, () => { return ReikiRootConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("ReikiRootConfig", () => { ReikiRootConfig.Init(); }, () => { return ReikiRootConfig.inited; }));

        normalTasks.Add(new ConfigInitTask("HazyRegionConfig", () => { HazyRegionConfig.Init(); }, () => { return HazyRegionConfig.inited; }));
    }

    static List<ConfigInitTask> doingTasks = new List<ConfigInitTask>();