Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-06-24 e05fd3239b1d162d0b863abddfe520e0af590b58

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/DienstgradConfig.cs

@@ -1,18 +1,18 @@
//--------------------------------------------------------

//    [Author]:           Fish

//    [  Date ]:           Wednesday, May 15, 2019

//--------------------------------------------------------



using System.Collections.Generic;

using System.IO;

using System.Threading;

using System;

using UnityEngine;



[XLua.LuaCallCSharp]

public partial class DienstgradConfig

{



//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Monday, June 24, 2019
//--------------------------------------------------------

using System.Collections.Generic;
using System.IO;
using System.Threading;
using System;
using UnityEngine;

[XLua.LuaCallCSharp]
public partial class DienstgradConfig
{

    public readonly int ID;

    public readonly string Name;

    public readonly int Type;

@@ -25,17 +25,18 @@
    public readonly int[] Skills;

    public readonly int gotoId;

    public readonly int missionId;



    public DienstgradConfig()

    {

    }



    public DienstgradConfig(string input)

    {

        try

        {

            var tables = input.Split('\t');



    public readonly int order;

    public DienstgradConfig()
    {
    }

    public DienstgradConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');

            int.TryParse(tables[0],out ID); 



            Name = tables[1];

@@ -74,175 +75,177 @@
            int.TryParse(tables[10],out gotoId); 



            int.TryParse(tables[11],out missionId); 

        }

        catch (Exception ex)

        {

            DebugEx.Log(ex);

        }

    }



    static Dictionary<string, DienstgradConfig> configs = new Dictionary<string, DienstgradConfig>();

    public static DienstgradConfig Get(string id)

    {   
        if (!inited)

        {

            Debug.Log("DienstgradConfig 还未完成初始化。");

            return null;

        }

		
        if (configs.ContainsKey(id))

        {

            return configs[id];

        }



        DienstgradConfig config = null;

        if (rawDatas.ContainsKey(id))

        {

            config = configs[id] = new DienstgradConfig(rawDatas[id]);

            rawDatas.Remove(id);

        }



        return config;

    }



    public static DienstgradConfig 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<DienstgradConfig> GetValues()

    {

        var values = new List<DienstgradConfig>();

        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 +"/Dienstgrad.txt";

        }

        else

        {

            path = AssetVersionUtility.GetAssetFilePath("config/Dienstgrad.txt");

        }



        configs.Clear();

        var tempConfig = new DienstgradConfig();

        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 DienstgradConfig(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 DienstgradConfig(line);

                            configs[id] = config;

                            (config as IConfigPostProcess).OnConfigParseCompleted();

                        }

                        else

                        {

                            rawDatas[id] = line;

                        }

                    }

                    catch (System.Exception ex)

                    {

                        Debug.LogError(ex);

                    }

                }



                inited = true;

            });

        }

    }



}









            int.TryParse(tables[12],out order); 
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }

    static Dictionary<string, DienstgradConfig> configs = new Dictionary<string, DienstgradConfig>();
    public static DienstgradConfig Get(string id)
    {   
        if (!inited)
        {
            Debug.Log("DienstgradConfig 还未完成初始化。");
            return null;
        }
		
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }

        DienstgradConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new DienstgradConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }

        return config;
    }

    public static DienstgradConfig 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<DienstgradConfig> GetValues()
    {
        var values = new List<DienstgradConfig>();
        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 +"/Dienstgrad.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/Dienstgrad.txt");
        }

        configs.Clear();
        var tempConfig = new DienstgradConfig();
        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 DienstgradConfig(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 DienstgradConfig(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/DienstgradConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: cf378d806fecb8549bdd3d692675b071
timeCreated: 1557892341
timeCreated: 1561347871
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Role/RoleTitle.cs

@@ -155,11 +155,14 @@
            {

                return -isGetx.CompareTo(isGety);

            }

            else if (x.CompareTo(y) != 0)

            var config_x = DienstgradConfig.Get(x);

            var config_y = DienstgradConfig.Get(y);

            if (config_x != null && config_y != null

                && config_x.order != config_y.order)

            {

                return -x.CompareTo(y);

                return config_x.order.CompareTo(config_y.order);

            }

            else return 1;

            return 0;

        }