3335 配置表读取重构。

client_Wu Xijin

2019-02-13 786be46e6e29230779b556dca206f9d3599309ea

3335 配置表读取重构。

 Assets/Editor/Actor/ActorEditor.cs

@@ -19,7 +19,7 @@
    [MenuItem("程序/角色相关/卸载NPC动画状态机")]
    static void RemoveAnimator()
    {
        var _dict = Config.Instance.GetAllValues<NPCConfig>();
        var _dict = NPCConfig.GetValues();
        int i = 0;
        foreach (var _model in _dict)
        {
@@ -135,7 +135,7 @@
        if (GUILayout.Button("所有翅膀", GUILayout.Height(24)))
        {

            var _dict = Config.Instance.GetAllValues<ModelResConfig>();
            var _dict = ModelResConfig.GetValues();
            foreach (var _item in _dict)
            {
                if (_item.Type == (int)E_ModelResType.Wing)
@@ -148,7 +148,7 @@
        if (GUILayout.Button("所有武器", GUILayout.Height(24)))
        {

            var _dict = Config.Instance.GetAllValues<ModelResConfig>();
            var _dict = ModelResConfig.GetValues();
            foreach (var _item in _dict)
            {
                if (_item.Type == (int)E_ModelResType.Weapon)
@@ -161,7 +161,7 @@
        if (GUILayout.Button("所有副手", GUILayout.Height(24)))
        {

            var _dict = Config.Instance.GetAllValues<ModelResConfig>();
            var _dict = ModelResConfig.GetValues();
            foreach (var _item in _dict)
            {
                if (_item.Type == (int)E_ModelResType.Secondary)
@@ -174,7 +174,7 @@
        if (GUILayout.Button("所有衣服", GUILayout.Height(24)))
        {

            var _dict = Config.Instance.GetAllValues<ModelResConfig>();
            var _dict = ModelResConfig.GetValues();
            foreach (var _item in _dict)
            {
                if (_item.Type == (int)E_ModelResType.Suit)
@@ -187,7 +187,7 @@
        if (GUILayout.Button("所有坐骑", GUILayout.Height(24)))
        {

            var _dict = Config.Instance.GetAllValues<ModelResConfig>();
            var _dict = ModelResConfig.GetValues();
            foreach (var _item in _dict)
            {
                if (_item.Type == (int)E_ModelResType.Horse)
@@ -202,7 +202,7 @@
            bool _result = EditorUtility.DisplayDialog("温馨提醒", "生成所有换装资源将会耗费比较长的时间, 请记得几点, 是否是需要生成所有的资源, 如果不是, 记得可以去掉不生成的资源,是不是不需要生成已经存在的资源, 如果不需要, 记得勾选[只生成不存在的]", "确认生成", "我按错了");
            if (_result)
            {
                var _dict = Config.Instance.GetAllValues<ModelResConfig>();
                var _dict = ModelResConfig.GetValues();
                foreach (var _item in _dict)
                {
                    m_ModelResBuilder.BuildModelRes(_item.ID, m_HighMesh);

 Assets/Editor/Actor/NpcResourcesBuilder.cs

@@ -15,7 +15,7 @@
        BuildAnimationClip1(modelName);

        BuildAnimatorController(modelName, outName, type);



        var showConfigs = Config.Instance.GetAllValues<ActorShowConfig>();

        var showConfigs = ActorShowConfig.GetValues();

        NPCConfig _npcModel = null;

        foreach (var _item in showConfigs)

        {

@@ -39,7 +39,7 @@
            }

        }



        var realmConfigs = Config.Instance.GetAllValues<RealmConfig>();

        var realmConfigs = RealmConfig.GetValues();

        foreach (var _realmConfig in realmConfigs)

        {

            _npcModel = NPCConfig.Get(_realmConfig.BossID);


 Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs

@@ -454,7 +454,7 @@
        if (Config.Instance.inited && newbieGuides == null)

        {

            newbieGuides = new List<NewBieGuide>();

            var guides = Config.Instance.GetAllValues<GuideConfig>();

            var guides = GuideConfig.GetValues();

            foreach (var config in guides)

            {

                if (config.Type == 1)

@@ -510,7 +510,7 @@
        if (Config.Instance.inited && functionalGuides == null)

        {

            functionalGuides = new List<FunctionalGuide>();

            var guides = Config.Instance.GetAllValues<GuideConfig>();

            var guides = GuideConfig.GetValues();

            foreach (var config in guides)

            {

                if (config.Type == 2)


 Assets/Editor/ScriptTemplate/ConfigDataTemplate.txt

@@ -14,6 +14,10 @@

    #Field#

    public #ClassName#()
    {
    }

    public #ClassName#(string input)
    {
        try
@@ -90,7 +94,7 @@
    }

    public static bool inited { get; private set; }
    protected static Dictionary<string, string> rawDatas = null;
    protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();
    public static void Init(bool sync=false)
    {
        inited = false;
@@ -104,17 +108,30 @@
            path = AssetVersionUtility.GetAssetFilePath("config/#FileName#.txt");
        }

        var tempConfig = new #ClassName#();
        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++)
            {
                var line = lines[i];
                var index = line.IndexOf("\t");
                var id = line.Substring(0, index);

                if (preParse)
                {
                    configs[id] = new #ClassName#(line);
                }
                else
                {
                rawDatas[id] = line;
                }
            }
            inited = true;
        }
@@ -123,15 +140,25 @@
            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++)
                {
                    var line = lines[i];
                    var index = line.IndexOf("\t");
                    var id = line.Substring(0, index);

                    if (preParse)
                    {
                        configs[id] = new #ClassName#(line);
                    }
                    else
                    {
                    rawDatas[id] = line;
                }
                }

                inited = true;
            });

 Assets/Editor/Tool/ConfigClassGenerate.cs

@@ -257,11 +257,6 @@
        UnityEngine.Object o = CreateScriptAssetFromTemplate(newConfigPath, templatePath);
        AddConfigInit(newConfigPath);
        ProjectWindowUtil.ShowCreatedAsset(o);

        if (FileCreateEvent != null)
        {
            FileCreateEvent();
        }
    }

    internal static UnityEngine.Object CreateScriptAssetFromTemplate(string pathName, string resourceFile)

 Assets/Editor/Tool/ExcelParseTool.cs

@@ -53,9 +53,9 @@
            m_Englishs.Clear();
            Config.Instance.SyncLoadConfigs();
            m_FitterKeys.Clear();
            m_FitterKeys.AddRange(Config.Instance.GetAllKeys<LanguageConfig>());
            m_FitterKeys.AddRange(Config.Instance.GetAllKeys<SysInfoConfig>());
            m_FitterKeys.AddRange(Config.Instance.GetAllKeys<IconConfig>());
            m_FitterKeys.AddRange(LanguageConfig.GetKeys());
            m_FitterKeys.AddRange(SysInfoConfig.GetKeys());
            m_FitterKeys.AddRange(IconConfig.GetKeys());
            FindEnglishLabel();
        }

@@ -86,9 +86,9 @@
            }
            Config.Instance.SyncLoadConfigs();
            m_FitterKeys.Clear();
            m_FitterKeys.AddRange(Config.Instance.GetAllKeys<LanguageConfig>());
            m_FitterKeys.AddRange(Config.Instance.GetAllKeys<SysInfoConfig>());
            m_FitterKeys.AddRange(Config.Instance.GetAllKeys<IconConfig>());
            m_FitterKeys.AddRange(LanguageConfig.GetKeys());
            m_FitterKeys.AddRange(SysInfoConfig.GetKeys());
            m_FitterKeys.AddRange(IconConfig.GetKeys());
            FindEnglishLabel(true);
        }
    }

 Assets/Editor/Tool/SpriteManageTool.cs

@@ -126,7 +126,7 @@
    private void OnEnable()

    {

        Config.Instance.SyncLoadConfigs();

        m_IconCfgs = Config.Instance.GetAllValues<IconConfig>();

        m_IconCfgs = IconConfig.GetValues();

        m_DeleteTexture = EditorGUIUtility.FindTexture("TreeEditor.Trash");

        InitStyle();




 Assets/Scripts

@@ -1 +1 @@
Subproject commit c7f64d977c4e2884d5411a5a2d0f37b6afa52963
Subproject commit 6165d890f1d21e566161cb184b609e19f2662833