Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-08-23 ddba48b78f2e433ea0365235d13f9c20fc9183a4

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -139,7 +139,7 @@
        #region Built-in

        protected override void BindController()

        {

            switcherTime = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutomaticSwitch").Numerical1);

            switcherTime = int.Parse(Config.Instance.Get<FuncConfigConfig>("AutomaticSwitch").Numerical1);

            recordPositionBool = true;

            m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;

            // m_LowSettingTipGroup.localPosition = m_position2_L.localPosition;

@@ -152,7 +152,7 @@
            LeftImage.SetActive(true);

            RightImg.SetActive(false);

            ListBossMapId.Clear();

            string strBoss = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskRetract").Numerical1;

            string strBoss = Config.Instance.Get<FuncConfigConfig>("TaskRetract").Numerical1;

            string[] bossList = ConfigParse.GetMultipleStr(strBoss);//解析出数组|

            for (int i = 0; i < bossList.Length; i++)

            {

@@ -468,7 +468,7 @@
            {

                WindowCenter.Instance.Open<NeutralMarkWin>();

                int mapID = PlayerDatas.Instance.baseData.MapID;

                var config = ConfigManager.Instance.GetTemplate<MapConfig>(mapID);

                var config = Config.Instance.Get<MapConfig>(mapID);

                int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();

                if (atkInt.Length > 1 && Buffmodel.PkType != 5)

                {

@@ -864,7 +864,7 @@
        void ArticleExperience()//关于经验条

        {

            int NowLv = (int)PlayerDatas.Instance.baseData.LV;

            if (ConfigManager.Instance.GetTemplate<PlayerLVConfig>(NowLv) != null)

            if (Config.Instance.Get<PlayerLVConfig>(NowLv) != null)

            {

                ulong maxValue = (ulong)PlayerLVConfig.GetExpByPlayerLv(NowLv);

                ulong nowVlaue = (ulong)PlayerDatas.Instance.baseData.TotalExp + (ulong)PlayerDatas.Instance.baseData.ExpPoint * 100000000;

@@ -945,7 +945,7 @@
        private bool IsDungeon()

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);

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

            return mapConfig != null && mapConfig.MapFBType != 0;

        }



@@ -1016,7 +1016,7 @@
                    recordPositionBool = true;

                    _MarkRay.gameObject.SetActive(false);

                }

                var _cfg = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);

                var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);

                if (_skillId != 0)

                {