3335 任务反馈修改

client_linchunjie

2019-06-11 d54db8da2c41dc7d00a567c783698a354c1ffd37

3335 任务反馈修改

 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Friday, May 17, 2019
//    [  Date ]:           Tuesday, June 11, 2019
//--------------------------------------------------------

using System.Collections.Generic;
@@ -22,6 +22,7 @@
    public readonly string reikiRoot;

    public readonly int succGuide;

    public readonly int jump;

    public readonly string[] funcTitles;

    public readonly string failFuncs;

    public readonly string[] remind;

@@ -53,9 +54,11 @@


            int.TryParse(tables[8],out jump); 



            failFuncs = tables[9];

            funcTitles = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);



            remind = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            failFuncs = tables[10];



            remind = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
        }
        catch (Exception ex)
        {
@@ -139,6 +142,7 @@
            path = AssetVersionUtility.GetAssetFilePath("config/TaskFeedback.txt");
        }

        configs.Clear();
        var tempConfig = new TaskFeedbackConfig();
        var preParse = tempConfig is IConfigPostProcess;


 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
timeCreated: 1558075313
timeCreated: 1560244941
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Monday, June 10, 2019
//    [  Date ]:           Tuesday, June 11, 2019
//--------------------------------------------------------

using System.Collections.Generic;
@@ -15,7 +15,6 @@

    public readonly int id;

    public readonly string name;

    public readonly string category;

    public readonly int jump;

    public readonly int guide;

    public readonly int type;

@@ -37,24 +36,22 @@


            name = tables[1];



            category = tables[2];

            int.TryParse(tables[2],out jump); 


            int.TryParse(tables[3],out jump); 
            int.TryParse(tables[3],out guide); 


            int.TryParse(tables[4],out guide); 
            int.TryParse(tables[4],out type); 


            int.TryParse(tables[5],out type); 
            int.TryParse(tables[5],out condition); 


            int.TryParse(tables[6],out condition); 


            string[] itemConditionStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] itemConditionStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            itemCondition = new Int2[itemConditionStringArray.Length];
            for (int i=0;i<itemConditionStringArray.Length;i++)
            {
                 Int2.TryParse(itemConditionStringArray[i],out itemCondition[i]);
            }



            string[] excludeFuncsStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            string[] excludeFuncsStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            excludeFuncs = new int[excludeFuncsStringArray.Length];
            for (int i=0;i<excludeFuncsStringArray.Length;i++)
            {

 Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b2d416872ed7b3048a5b2d4696c3541f
timeCreated: 1560146342
timeCreated: 1560244979
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/MainInterfacePanel/TaskFeedbackFuncWin.cs

@@ -18,6 +18,8 @@
        [SerializeField] Text m_Category;

        [SerializeField] TaskFeedbackFunc[] m_Funcs;



        public static string funcTitle = string.Empty;



        public static event Action<int> onSelectTask;



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

@@ -67,6 +69,7 @@


        void Display()

        {

            m_Category.text = funcTitle;

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

            {

                m_Funcs[i].button.gameObject.SetActive(i < model.taskFeedbackFuncs.Count);

@@ -76,11 +79,6 @@
                    if (config != null)

                    {

                        m_Funcs[i].label.text = config.name;



                        if (i == 0)

                        {

                            m_Category.text = config.category;

                        }

                    }

                }

            }


 System/MainInterfacePanel/TaskFeedbackModel.cs

@@ -174,11 +174,13 @@
                                if (feedback.failFuns != null)

                                {

                                    var index = Mathf.Min(condition, feedback.failFuns.Count - 1);

                                    var funcTitle = index < config.funcTitles.Length ? config.funcTitles[index] : string.Empty;

                                    List<int> succFuncs;

                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

                                }

@@ -204,11 +206,13 @@
                                {

                                    var taskIndex = feedback.IndexOfSideTasks(condition);

                                    var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1);

                                    var funcTitle = index < config.funcTitles.Length ? config.funcTitles[index] : string.Empty;

                                    List<int> succFuncs;

                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

                                }

@@ -235,11 +239,13 @@
                                    IsSatisfySideTask(feedback.sideTasks, out sideTaskId);

                                    var taskIndex = feedback.IndexOfSideTasks(sideTaskId);

                                    var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1);

                                    var funcTitle = index < config.funcTitles.Length ? config.funcTitles[index] : string.Empty;

                                    List<int> succFuncs;

                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

                                }