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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/SideMission.cs

@@ -90,12 +90,12 @@
                    sideMissionTitleBtton.PitchOnImage.SetActive(false);

                }

                var taskname = taskmodel.SideQuestsDic[TaskId].Name;

                if (ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskname) == null)

                if (Config.Instance.Get<TASKINFOConfig>(taskname) == null)

                {

                    DebugEx.LogError("TASKINFO任务表格没有获取到该任务名称"+ taskname);

                    return;

                }

                sideMissionTitleBtton.TitleName.text= ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskname).show_writing;//任务名

                sideMissionTitleBtton.TitleName.text= Config.Instance.Get<TASKINFOConfig>(taskname).show_writing;//任务名

                if (!taskmodel.SideQuestsDic.ContainsKey(TaskId))

                {

                    return;

@@ -119,10 +119,10 @@
            {

                return;

            }

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

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

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

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

            string strINfor = taskmodel.SideQuestsDic[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;//任务目标

@@ -152,7 +152,7 @@
                DebugEx.Log("没有任务奖励");

                return;

            }

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

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

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

            RewardInformationDisplay(rewardList);

        }