少年修仙传客户端代码仓库
client_linchunjie
2019-05-16 948792469e33e3bda698300b7c55604a5a11268f
3335 任务反馈
4个文件已修改
4个文件已添加
362 ■■■■■ 已修改文件
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackFuncWin.cs 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackFuncWin.cs.meta 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackModel.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/ConfigInitiator.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Wednesday, May 15, 2019
//    [  Date ]:           Thursday, May 16, 2019
//--------------------------------------------------------
using System.Collections.Generic;
@@ -21,6 +21,7 @@
    public readonly string sideTasks;
    public readonly int[] succGuide;
    public readonly int[] failGuide;
    public readonly int[] failFuncs;
    public readonly string remind;
    public TaskFeedbackConfig()
@@ -59,7 +60,14 @@
                 int.TryParse(failGuideStringArray[i],out failGuide[i]);
            }
            remind = tables[8];
            string[] failFuncsStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            failFuncs = new int[failFuncsStringArray.Length];
            for (int i=0;i<failFuncsStringArray.Length;i++)
            {
                 int.TryParse(failFuncsStringArray[i],out failFuncs[i]);
            }
            remind = tables[9];
        }
        catch (Exception ex)
        {
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
timeCreated: 1557911827
timeCreated: 1557990472
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
New file
@@ -0,0 +1,205 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Thursday, May 16, 2019
//--------------------------------------------------------
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System;
using UnityEngine;
[XLua.LuaCallCSharp]
public partial class TaskFeedbackFuncConfig
{
    public readonly int id;
    public readonly string name;
    public readonly int jump;
    public TaskFeedbackFuncConfig()
    {
    }
    public TaskFeedbackFuncConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');
            int.TryParse(tables[0],out id);
            name = tables[1];
            int.TryParse(tables[2],out jump);
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }
    static Dictionary<string, TaskFeedbackFuncConfig> configs = new Dictionary<string, TaskFeedbackFuncConfig>();
    public static TaskFeedbackFuncConfig Get(string id)
    {
        if (!inited)
        {
            Debug.Log("TaskFeedbackFuncConfig 还未完成初始化。");
            return null;
        }
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }
        TaskFeedbackFuncConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new TaskFeedbackFuncConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }
        return config;
    }
    public static TaskFeedbackFuncConfig Get(int id)
    {
        return Get(id.ToString());
    }
    public static List<string> GetKeys()
    {
        var keys = new List<string>();
        keys.AddRange(configs.Keys);
        keys.AddRange(rawDatas.Keys);
        return keys;
    }
    public static List<TaskFeedbackFuncConfig> GetValues()
    {
        var values = new List<TaskFeedbackFuncConfig>();
        values.AddRange(configs.Values);
        var keys = new List<string>(rawDatas.Keys);
        foreach (var key in keys)
        {
            values.Add(Get(key));
        }
        return values;
    }
    public static bool Has(string id)
    {
        return configs.ContainsKey(id) || rawDatas.ContainsKey(id);
    }
    public static bool Has(int id)
    {
        return Has(id.ToString());
    }
    public static bool inited { get; private set; }
    protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();
    public static void Init(bool sync=false)
    {
        inited = false;
        var path = string.Empty;
        if (AssetSource.refdataFromEditor)
        {
            path = ResourcesPath.CONFIG_FODLER +"/TaskFeedbackFunc.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/TaskFeedbackFunc.txt");
        }
        var tempConfig = new TaskFeedbackFuncConfig();
        var preParse = tempConfig is IConfigPostProcess;
        if (sync)
        {
            var lines = File.ReadAllLines(path);
            if (!preParse)
            {
                rawDatas = new Dictionary<string, string>(lines.Length - 3);
            }
            for (int i = 3; i < lines.Length; i++)
            {
                try
                {
                    var line = lines[i];
                    var index = line.IndexOf("\t");
                    if (index == -1)
                    {
                        continue;
                    }
                    var id = line.Substring(0, index);
                    if (preParse)
                    {
                        var config = new TaskFeedbackFuncConfig(line);
                        configs[id] = config;
                        (config as IConfigPostProcess).OnConfigParseCompleted();
                    }
                    else
                    {
                        rawDatas[id] = line;
                    }
                }
                catch (System.Exception ex)
                {
                    Debug.LogError(ex);
                }
            }
            inited = true;
        }
        else
        {
            ThreadPool.QueueUserWorkItem((object _object) =>
            {
                var lines = File.ReadAllLines(path);
                if (!preParse)
                {
                    rawDatas = new Dictionary<string, string>(lines.Length - 3);
                }
                for (int i = 3; i < lines.Length; i++)
                {
                    try
                    {
                       var line = lines[i];
                        var index = line.IndexOf("\t");
                        if (index == -1)
                        {
                            continue;
                        }
                        var id = line.Substring(0, index);
                        if (preParse)
                        {
                            var config = new TaskFeedbackFuncConfig(line);
                            configs[id] = config;
                            (config as IConfigPostProcess).OnConfigParseCompleted();
                        }
                        else
                        {
                            rawDatas[id] = line;
                        }
                    }
                    catch (System.Exception ex)
                    {
                        Debug.LogError(ex);
                    }
                }
                inited = true;
            });
        }
    }
}
Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: b2d416872ed7b3048a5b2d4696c3541f
timeCreated: 1557989767
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
System/MainInterfacePanel/TaskFeedbackFuncWin.cs
New file
@@ -0,0 +1,96 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Thursday, May 16, 2019
//--------------------------------------------------------
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace Snxxz.UI
{
    public class TaskFeedbackFuncWin : Window
    {
        [SerializeField] TaskFeedbackFunc[] m_Funcs;
        TaskFeedbackModel model { get { return ModelCenter.Instance.GetModel<TaskFeedbackModel>(); } }
        #region Built-in
        protected override void BindController()
        {
        }
        protected override void AddListeners()
        {
            for (int i = 0; i < m_Funcs.Length; i++)
            {
                var index = i;
                m_Funcs[i].button.AddListener(() =>
                {
                    OnFunc(index);
                });
            }
        }
        protected override void OnPreOpen()
        {
            Display();
        }
        protected override void OnAfterOpen()
        {
        }
        protected override void OnPreClose()
        {
        }
        protected override void OnAfterClose()
        {
        }
        #endregion
        void Display()
        {
            for (int i = 0; i < m_Funcs.Length; i++)
            {
                m_Funcs[i].button.gameObject.SetActive(i < model.taskFeedbackFuncs.Count);
                if (i < model.taskFeedbackFuncs.Count)
                {
                    var config = TaskFeedbackFuncConfig.Get(model.taskFeedbackFuncs[i]);
                    if (config != null)
                    {
                        m_Funcs[i].label.text = config.name;
                    }
                }
            }
        }
        private void OnFunc(int index)
        {
            CloseImmediately();
            if (index < model.taskFeedbackFuncs.Count)
            {
                var config = TaskFeedbackFuncConfig.Get(model.taskFeedbackFuncs[index]);
                if (config != null)
                {
                    WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump);
                }
            }
        }
        [Serializable]
        public struct TaskFeedbackFunc
        {
            public Button button;
            public Text label;
        }
    }
}
System/MainInterfacePanel/TaskFeedbackFuncWin.cs.meta
New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 4c045d6076e0f1f4abf90ccee2848dc9
timeCreated: 1557989419
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData:
  assetBundleName:
  assetBundleVariant:
System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -7,6 +7,8 @@
    {
        Dictionary<int, TaskFeedback> m_TaskFeedbacks = new Dictionary<int, TaskFeedback>();
        public readonly List<int> taskFeedbackFuncs = new List<int>();
        ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
@@ -119,6 +121,12 @@
                                {
                                    SysNotifyMgr.Instance.ShowTip(config.remind);
                                }
                                if (config.failFuncs != null && config.failFuncs.Length > 0)
                                {
                                    taskFeedbackFuncs.Clear();
                                    taskFeedbackFuncs.AddRange(config.failFuncs);
                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
                                }
                                if (config.failGuide != null
                                    && config.failGuide.Length > 0)
                                {
@@ -143,6 +151,12 @@
                                if (!string.IsNullOrEmpty(config.remind))
                                {
                                    SysNotifyMgr.Instance.ShowTip(config.remind);
                                }
                                if (config.failFuncs != null && config.failFuncs.Length > 0)
                                {
                                    taskFeedbackFuncs.Clear();
                                    taskFeedbackFuncs.AddRange(config.failFuncs);
                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
                                }
                                var index = feedback.IndexOfSideTasks(condition);
                                if (config.failGuide != null
@@ -170,6 +184,12 @@
                                {
                                    SysNotifyMgr.Instance.ShowTip(config.remind);
                                }
                                if (config.failFuncs != null && config.failFuncs.Length > 0)
                                {
                                    taskFeedbackFuncs.Clear();
                                    taskFeedbackFuncs.AddRange(config.failFuncs);
                                    WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
                                }
                                if (!IsSatisfySideTask(feedback.sideTasks, out condition))
                                {
                                    var index = feedback.IndexOfSideTasks(condition);
Utility/ConfigInitiator.cs
@@ -292,7 +292,8 @@
        normalTasks.Add(new ConfigInitTask("AlchemyCountConfig", () => { AlchemyCountConfig.Init(); }, () => { return AlchemyCountConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("CollectNpcConfig", () => { CollectNpcConfig.Init(); }, () => { return CollectNpcConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("TreasureChapterConfig", () => { TreasureChapterConfig.Init(); }, () => { return TreasureChapterConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("TaskFeedbackConfig", () => { TaskFeedbackConfig.Init(); }, () => { return TaskFeedbackConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("TaskFeedbackConfig", () => { TaskFeedbackConfig.Init(); }, () => { return TaskFeedbackConfig.inited; }));
        normalTasks.Add(new ConfigInitTask("TaskFeedbackFuncConfig", () => { TaskFeedbackFuncConfig.Init(); }, () => { return TaskFeedbackFuncConfig.inited; }));
    }
    static List<ConfigInitTask> doingTasks = new List<ConfigInitTask>();