少年修仙传客户端代码仓库
client_linchunjie
2019-05-17 054e0e2d125b427f3c1ba907af2c5bb9c23950a8
Revert "3335 任务反馈修改"

This reverts commit 0699013457eac5b8a62a152323437d0114c40aad.
4个文件已修改
35 ■■■■■ 已修改文件
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackModel.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Message/RichNormalEvent.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -20,7 +20,7 @@
    public readonly string items;
    public readonly string sideTasks;
    public readonly string reikiRoot;
    public readonly int[] succGuide;
    public readonly int succGuide;
    public readonly int jump;
    public readonly string failFuncs;
    public readonly string[] remind;
@@ -49,12 +49,7 @@
            reikiRoot = tables[6];
            string[] succGuideStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            succGuide = new int[succGuideStringArray.Length];
            for (int i=0;i<succGuideStringArray.Length;i++)
            {
                 int.TryParse(succGuideStringArray[i],out succGuide[i]);
            }
            int.TryParse(tables[7],out succGuide);
            int.TryParse(tables[8],out jump); 
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
timeCreated: 1558093429
timeCreated: 1558075313
licenseType: Pro
MonoImporter:
  serializedVersion: 2
System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -124,7 +124,7 @@
            return m_TaskFeedbacks.TryGetValue(taskId, out feedback);
        }
        public void ExecuteTaskFeedback(int taskId, int step = 0)
        public void ExecuteTaskFeedback(int taskId)
        {
            if (NewBieCenter.Instance.inGuiding || FunctionalGuideCenter.Instance.ExistAnyUnderwayGuide())
            {
@@ -150,11 +150,7 @@
                            int condition = 0;
                            if (IsSatisfyCondition(feedback, out condition))
                            {
                                var guide = 0;
                                if (config.succGuide != null && config.succGuide.Length > 0)
                                {
                                    guide = step < config.succGuide.Length ? config.succGuide[step] : 0;
                                }
                                var guide = config.succGuide;
                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
                                {
                                    ExecuteGuide(guide);
@@ -189,11 +185,7 @@
                            int condition = 0;
                            if (IsSatisfyCondition(feedback, out condition))
                            {
                                var guide = 0;
                                if (config.succGuide != null && config.succGuide.Length > 0)
                                {
                                    guide = step < config.succGuide.Length ? config.succGuide[step] : 0;
                                }
                                var guide = config.succGuide;
                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
                                {
                                    ExecuteGuide(guide);
@@ -229,11 +221,7 @@
                            int condition = 0;
                            if (IsSatisfyCondition(feedback, out condition))
                            {
                                var guide = 0;
                                if (config.succGuide != null && config.succGuide.Length > 0)
                                {
                                    guide = step < config.succGuide.Length ? config.succGuide[step] : 0;
                                }
                                var guide = config.succGuide;
                                if (guide != 0 && !NewBieCenter.Instance.IsGuideCompleted(guide))
                                {
                                    ExecuteGuide(guide);
System/Message/RichNormalEvent.cs
@@ -135,15 +135,13 @@
                    if (href.mSplits.ContainsKey("taskfeedback"))
                    {
                        var taskId = 0;
                        var step = 0;
                        int.TryParse(href.mSplits["taskfeedback"], out taskId);
                        int.TryParse(href.mSplits["feedbackstep"], out step);
                        TaskFeedback feedback;
                        var feedbackModel = ModelCenter.Instance.GetModel<TaskFeedbackModel>();
                        if (feedbackModel.TryGetTaskFeedback(taskId, out feedback))
                        {
                            feedbackModel.ExecuteTaskFeedback(taskId, step);
                            feedbackModel.ExecuteTaskFeedback(taskId);
                            return true;
                        }
                    }