Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/StoryTask.cs

@@ -133,25 +133,25 @@
            {



                MainTaskButton mainTaskButton = cell.GetComponent<MainTaskButton>();

                TaskListConfig tasklistmodel = ConfigManager.Instance.GetTemplate<TaskListConfig>(taskID);

                TaskListConfig tasklistmodel = Config.Instance.Get<TaskListConfig>(taskID);



                mainTaskButton.LightUpTheState.SetActive(false);//是否选中状态

                if (taskID < mainTaskID)

                {

                    mainTaskButton.Text_RamusName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;

                    mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;

                    mainTaskButton.Text_RamusState.gameObject.SetActive(false);

                    mainTaskButton.m_Img_Finish.SetActive(true);

                }

                else if (taskID == mainTaskID)

                {

                    mainTaskButton.Text_RamusName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;

                    mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;

                    mainTaskButton.Text_RamusState.gameObject.SetActive(true);

                    mainTaskButton.Text_RamusState.text = GegionalTaskStatus(_MainTaskDic[taskID].MissionState);

                    mainTaskButton.m_Img_Finish.SetActive(false);

                }

                else if (taskID > mainTaskID)

                {

                    mainTaskButton.Text_RamusName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;

                    mainTaskButton.Text_RamusName.text = Config.Instance.Get<TASKINFOConfig>(tasklistmodel.TaskName).show_writing;

                    mainTaskButton.Text_RamusState.gameObject.SetActive(true);

                    mainTaskButton.Text_RamusState.text = Language.Get("NotPickedUp_Z");

                    mainTaskButton.m_Img_Finish.SetActive(false);

@@ -200,10 +200,10 @@


        void Information(int taskID)

        {

            _Text_TaskName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_MainTaskDic[taskID].Name).show_writing;//任务名

            _Text_TaskDescribe.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_MainTaskDic[taskID].Desclist).show_writing;//任务描述

            _Text_TaskName.text = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].Name).show_writing;//任务名

            _Text_TaskDescribe.text = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].Desclist).show_writing;//任务描述

            string strINfor = _MainTaskDic[taskID].InforList;

            string str= ConfigManager.Instance.GetTemplate<TASKINFOConfig>(strINfor).show_writing;

            string str= Config.Instance.Get<TASKINFOConfig>(strINfor).show_writing;

            //str= WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);

            //str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);

            _Text_TaskTarget.text = str;//任务目标

@@ -212,27 +212,27 @@
            {

                _Text_TaskTarget.SetReplaceInfo(_DicTaskInforma[taskID]);

            }

            string _RewardStr = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_MainTaskDic[taskID].RewardList).show_writing;

            string _RewardStr = Config.Instance.Get<TASKINFOConfig>(_MainTaskDic[taskID].RewardList).show_writing;

            RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);

            RewardInformationDisplay(rewardList);

        }



        void MissionsTask(int taskID)

        {

            TaskListConfig taskListModel = ConfigManager.Instance.GetTemplate<TaskListConfig>(taskID);

            _Text_TaskName.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskName).show_writing;//任务名

            _Text_TaskDescribe.text = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskDescribe).show_writing;//任务描述

            var taskconfig = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskTarget);

            TaskListConfig taskListModel = Config.Instance.Get<TaskListConfig>(taskID);

            _Text_TaskName.text = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskName).show_writing;//任务名

            _Text_TaskDescribe.text = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskDescribe).show_writing;//任务描述

            var taskconfig = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskTarget);

            if (taskconfig == null)

            {

                DebugEx.LogError("告诉TT任务目标没有这条数据（TASKINFO）" + taskListModel.TaskTarget);

                return;

            }

            string str = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskTarget).show_writing;

            string str = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskTarget).show_writing;

            //str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);

            //str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);

            _Text_TaskTarget.text = str;//任务目标

            string _RewardStr = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskListModel.TaskRewards).show_writing;

            string _RewardStr = Config.Instance.Get<TASKINFOConfig>(taskListModel.TaskRewards).show_writing;

            RewardAnalysis.Inst.GetReward(_RewardStr, ref rewardList);

            RewardInformationDisplay(rewardList);

        }

@@ -306,7 +306,7 @@


        void SaveChapter()//获取主线任务章节

        {

            var configs = ConfigManager.Instance.GetAllValues<TaskListConfig>();

            var configs = Config.Instance.GetAllValues<TaskListConfig>();

            foreach (var value in configs)

            {

                if (!chapterDic.ContainsKey(value.ChapterID))

@@ -325,7 +325,7 @@
                if (_MainTaskDic[key].MissionState != 0 && _MainTaskDic[key].MissionState != 3)

                {

                    mainTaskID = key;

                    mainTaaskChapter = ConfigManager.Instance.GetTemplate<TaskListConfig>(key).ChapterID;

                    mainTaaskChapter = Config.Instance.Get<TaskListConfig>(key).ChapterID;



                }

            }

@@ -335,7 +335,7 @@
        private void ListTask(int ChapterID)

        {

            listTask.Clear();

            var configs = ConfigManager.Instance.GetAllValues<TaskListConfig>();

            var configs = Config.Instance.GetAllValues<TaskListConfig>();

            foreach (var value in configs)

            {

                if (value.ChapterID == ChapterID && value.TaskID<= mainTaskID)