0312 缥缈仙域自动改成等级限制，点击按钮才有效

hch

2019-09-24 7ae53bb5c9f96f8f4f728fe6145d1c21eb6f12bd

0312 缥缈仙域自动改成等级限制，点击按钮才有效

 Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs

@@ -111,7 +111,7 @@
            onStartChangeMap();
        }

        GA_Hero.startAutoHazyRegion = false;
        //GA_Hero.startAutoHazyRegion = false;

    }


 Fight/GameActor/GA_Hero.cs

@@ -471,11 +471,13 @@
#endif

            }

            m_StartAutoHazyRegion = value;

            if (m_StartAutoHazyRegion == false)

                ModelCenter.Instance.GetModel<HazyRegionModel>().auto = false;

        }

    }

    private float m_CalcAutoHazyRegionTime = 0;

    public float LastChkCanAutoHazyRegionTime = 0;

    public float hazyAutoWaitTime = 5;

    public float hazyAutoWaitTime = 1;

    HazyRegionModel m_HazyRegionModel;

    HazyRegionModel hazyRegionModel

    {

@@ -522,7 +524,7 @@
#endif

            }



            if (m_CalcAutoHazyRegionTime > 5)

            if (m_CalcAutoHazyRegionTime > 2)

            {

                startAutoHazyRegion = true;

            }

@@ -546,11 +548,6 @@
        if (AdventureStage.Instance.IsInAdventureStage

         || ClientDungeonStageUtility.isClientDungeon

         || CrossServerUtility.IsCrossServer())

        {

            return;

        }



        if (PlayerDatas.Instance.baseData.VIPLv < 3)

        {

            return;

        }

@@ -612,7 +609,7 @@
            if (_eventID == -1)

            {

                hazyRegionModel.SendBackHazyRegion();

                hazyAutoWaitTime = 2;

                hazyAutoWaitTime = 1;

#if UNITY_EDITOR

                Debug.LogFormat("所有寻访都已经结束了, 这里结束寻访, 设置下次等待时间 2");

#endif

@@ -620,7 +617,7 @@
            else

            {

                hazyRegionModel.SendGotoIncident(_eventID);

                hazyAutoWaitTime = 2;

                hazyAutoWaitTime = 1;

#if UNITY_EDITOR

                Debug.LogFormat("进行 {0} 寻访, 设置下次等待时间 2", _eventID);

#endif


 System/Dungeon/DungeonModel.cs

@@ -1112,7 +1112,7 @@
                            }

                            if (ClientDungeonStageUtility.isClientDungeon)

                            {

                                UpdateCoolDown(DungeonCoolDownType.LeaveMap, 7 * 1000);

                                UpdateCoolDown(DungeonCoolDownType.LeaveMap, 4 * 1000);

                            }

                            WindowCenter.Instance.Open<DungeonGetTreasureVictoryWin>();

                            WindowCenter.Instance.Open<TreasureDungeonVictoryWin>();


 System/HazyRegion/HazyRegionAutoSettingWin.cs

@@ -44,15 +44,15 @@

        private void SetAutoChallenge()
        {
            if (PlayerDatas.Instance.baseData.VIPLv >= 3)
            {
                model.auto = !model.auto;
                LocalSave.SetBool("HazyRegionAutoSetting" + PlayerDatas.Instance.PlayerId, model.auto);
            }
            else
            {
                SysNotifyMgr.Instance.ShowTip("HazyRegionAutoVip", 3);
            }
            //if (PlayerDatas.Instance.baseData.VIPLv >= 3)
            //{
            //    model.auto = !model.auto;
            //    LocalSave.SetBool("HazyRegionAutoSetting" + PlayerDatas.Instance.PlayerId, model.auto);
            //}
            //else
            //{
            //    SysNotifyMgr.Instance.ShowTip("HazyRegionAutoVip", 3);
            //}

            DisplayAutoChallenge();
        }

 System/HazyRegion/HazyRegionDialogueWin.cs

@@ -93,7 +93,7 @@
            if(model.auto)

            {

                m_WaitForCloseTime += Time.deltaTime;

                if(m_WaitForCloseTime > 3)

                if(m_WaitForCloseTime > 1)

                {

                    m_WaitForCloseTime = 0;

                    OnClickEmpty();


 System/HazyRegion/HazyRegionEntrancePanel.cs

@@ -14,6 +14,7 @@


        [SerializeField] Button m_Goto;

        [SerializeField] Text m_GotoLabel;

        [SerializeField] Button m_GotoAuto;



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

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

@@ -22,6 +23,7 @@
        {

            m_GetPath.AddListener(GetPath);

            m_Goto.AddListener(Goto);

            m_GotoAuto.AddListener(GotoEx);

        }



        public void Display()

@@ -32,6 +34,14 @@
            DisplayActivePoint();

            DisplayButtonState();

            TryStartNotEnoughPointGuide();

            if (PlayerDatas.Instance.baseData.LV > model.autoOpenLimitLV)

            {

                Vector3 v = m_Goto.transform.localPosition;

                v.x = -105;

                
                m_Goto.transform.localPosition = v;

                m_GotoAuto.transform.SetActive(true);

            }

        }



        void DisplayActivePoint()

@@ -47,6 +57,7 @@
        void DisplayButtonState()

        {

            m_Goto.SetColorful(m_GotoLabel, true);

            m_GotoAuto.SetColorful(m_GotoLabel, true);

        }



        void TryStartNotEnoughPointGuide()

@@ -58,7 +69,12 @@
                FunctionalGuideCenter.Instance.StartGuide(136);

            }

        }



        private void GotoEx()

        {

            model.auto = true;

            GA_Hero.startAutoHazyRegion = true;

            Goto();

        }

        private void Goto()

        {

            var error = 0;


 System/HazyRegion/HazyRegionIncidentPanel.cs

@@ -12,7 +12,7 @@
        [SerializeField] Transform m_ContainerPoint;

        [SerializeField] Slider m_Slider;

        [SerializeField] Text m_Point;

        [SerializeField] Button m_Back;

        [SerializeField] Button m_GotoAuto;

        [SerializeField] Button m_Goto;

        [SerializeField] Text m_GotoLabel;



@@ -31,7 +31,7 @@


        private void Awake()

        {

            m_Back.AddListener(OnBack);

            m_GotoAuto.AddListener(GotoAuto);

            m_Goto.AddListener(Goto);

        }



@@ -113,7 +113,8 @@


        void DisplayBackButton()

        {

            m_Back.gameObject.SetActive(false);

            if (PlayerDatas.Instance.baseData.LV > model.autoOpenLimitLV)

                m_GotoAuto.gameObject.SetActive(true);

        }



        int Compare(int lhs, int rhs)

@@ -212,6 +213,14 @@
            m_Goto.SetColorful(m_GotoLabel, questState != DailyQuestModel.DailyQuestState.OutTime);

        }





        private void GotoAuto()

        {

            model.auto = true;

            GA_Hero.startAutoHazyRegion = true;

            //Goto();

        }



        private void Goto()

        {

            var error = 0;


 System/HazyRegion/HazyRegionModel.cs

@@ -56,6 +56,7 @@
        public int openActviePoint { get; private set; }

        public int autoOpenLimitLevel { get; private set; }

        int autoOpenLimitTimes = 0;

        public int autoOpenLimitLV = 0;



        int m_SelectIncident;

        public int selectIncident

@@ -125,7 +126,7 @@


        public void OnPlayerLoginOk()

        {

            auto = LocalSave.GetBool("HazyRegionAutoSetting" + PlayerDatas.Instance.PlayerId, false);

            auto = false;//LocalSave.GetBool("HazyRegionAutoSetting" + PlayerDatas.Instance.PlayerId, false);

            isServerPrepare = true;



            if (AdventureStage.Instance.IsInAdventureStage)

@@ -249,6 +250,8 @@
            funcConfig = FuncConfigConfig.Get("HazyRegionAutoOpen");

            autoOpenLimitLevel = int.Parse(funcConfig.Numerical1);

            int.TryParse(funcConfig.Numerical2, out autoOpenLimitTimes);

            int.TryParse(funcConfig.Numerical3, out autoOpenLimitLV);

            


        }




 System/HazyRegion/HazyRegionWin.cs

@@ -16,7 +16,6 @@
    {

        [SerializeField] HazyRegionEntrancePanel m_EntrancePanel;

        [SerializeField] HazyRegionIncidentPanel m_IncidentPanel;

        [SerializeField] Button m_Btn_VipFunc;

        [SerializeField] ScaleTween m_BottomScaleTween;

        [SerializeField] UIAlphaTween m_AlphaTween;



@@ -62,8 +61,6 @@


        protected override void AddListeners()

        {

            m_Btn_VipFunc.onClick.RemoveListener(OnVipFuncClick);

            m_Btn_VipFunc.onClick.AddListener(OnVipFuncClick);

        }



        private void OnVipFuncClick()

@@ -77,7 +74,7 @@
            if (_hero != null)

            {

                _hero.LastChkCanAutoHazyRegionTime = 0;

                _hero.hazyAutoWaitTime = 3;

                _hero.hazyAutoWaitTime = 1;

            }

        }